You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2020/02/20 03:22:47 UTC
[logging-log4j2] branch master updated: Fix unit tests
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 71181f5 Fix unit tests
71181f5 is described below
commit 71181f5dd99910959737875a336f65642e9bbfc0
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Wed Feb 19 20:22:12 2020 -0700
Fix unit tests
---
.../log4j/core/appender/OutputStreamManager.java | 1 +
.../rolling/RollingAppenderOnStartupTest.java | 49 +++++++++++++---------
.../rolling/RollingAppenderRestartTest.java | 10 ++---
.../src/test/resources/__files/onStartup.log | 16 +++++++
4 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
index e063efe..8d5b43f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
@@ -301,6 +301,7 @@ public class OutputStreamManager extends AbstractManager implements ByteBufferDe
}
try {
stream.close();
+ LOGGER.debug("OutputStream closed");
} catch (final IOException ex) {
logError("Unable to close stream", ex);
return false;
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
index aed2d19..5b5a683 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
@@ -16,12 +16,22 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
+import java.io.File;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.AfterClass;
@@ -37,27 +47,20 @@ import static org.junit.Assert.assertTrue;
/**
*
*/
-@RunWith(Parameterized.class)
public class RollingAppenderOnStartupTest {
+ private static final String SOURCE = "src/test/resources/__files";
private static final String DIR = "target/onStartup";
+ private static final String CONFIG = "log4j-test4.xml";
+ private static final String FILENAME = "onStartup.log";
private Logger logger;
- @Parameterized.Parameters(name = "{0} \u2192 {1}")
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { //
- // @formatter:off
- {"log4j-test4.xml"},
- {"log4j-test4.xml"},});
- // @formatter:on
- }
-
@Rule
public LoggerContextRule loggerContextRule;
- public RollingAppenderOnStartupTest(final String configFile) {
- this.loggerContextRule = LoggerContextRule.createShutdownTimeoutLoggerContextRule(configFile);
+ public RollingAppenderOnStartupTest() {
+ this.loggerContextRule = LoggerContextRule.createShutdownTimeoutLoggerContextRule(CONFIG);
}
@Before
@@ -75,24 +78,30 @@ public class RollingAppenderOnStartupTest {
Files.delete(Paths.get(DIR));
}
}
+ Files.createDirectory(new File(DIR).toPath());
+ Path target = Paths.get(DIR, FILENAME);
+ Files.copy(Paths.get(SOURCE, FILENAME), target, StandardCopyOption.COPY_ATTRIBUTES);
+ FileTime newTime = FileTime.from(Instant.now().minus(1, ChronoUnit.DAYS));
+ Files.getFileAttributeView(target, BasicFileAttributeView.class).setTimes(newTime, newTime, newTime);
}
@AfterClass
public static void afterClass() throws Exception {
- long size = 0;
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
+ boolean rolled = false;
for (final Path path : directoryStream) {
- if (size == 0) {
- size = Files.size(path);
- } else {
- final long fileSize = Files.size(path);
- assertTrue("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize,
- size == fileSize);
+ if (!path.toFile().getName().endsWith(FILENAME)) {
+ rolled = true;
+ }
+ try (Stream<String> stream = Files.lines(path)) {
+ List<String> lines = stream.collect(Collectors.toList());
+ assertTrue("No header present for " + path.toFile().getName(), lines.get(0).startsWith("<!DOCTYPE HTML"));
}
Files.delete(path);
}
- Files.delete(Paths.get("target/onStartup"));
+ assertTrue("File did not roll", rolled);
}
+ Files.delete(Paths.get("target/onStartup"));
}
@Test
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderRestartTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderRestartTest.java
index ec8a32c..80474b6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderRestartTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderRestartTest.java
@@ -27,10 +27,9 @@ import org.junit.rules.RuleChain;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.FileTime;
import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.Month;
import java.time.temporal.ChronoUnit;
import static org.apache.logging.log4j.hamcrest.Descriptors.that;
@@ -38,7 +37,6 @@ import static org.apache.logging.log4j.hamcrest.FileMatchers.hasName;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.hasItemInArray;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
/**
*
@@ -58,8 +56,8 @@ public class RollingAppenderRestartTest {
File file = new File("target/rolling-restart/test.log");
Files.createDirectories(file.toPath().getParent());
Files.write(file.toPath(), "Hello, world".getBytes(), StandardOpenOption.CREATE);
- long old = Instant.now().minus(2, ChronoUnit.DAYS).toEpochMilli();
- assertTrue("Unable to set last modified time", file.setLastModified(old));
+ FileTime newTime = FileTime.from(Instant.now().minus(2, ChronoUnit.DAYS));
+ Files.getFileAttributeView(file.toPath(), BasicFileAttributeView.class).setTimes(newTime, newTime, newTime);
}
@Test
diff --git a/log4j-core/src/test/resources/__files/onStartup.log b/log4j-core/src/test/resources/__files/onStartup.log
new file mode 100644
index 0000000..036b721
--- /dev/null
+++ b/log4j-core/src/test/resources/__files/onStartup.log
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta charset="UTF-8"/>
+<title>Log4j Log Messages</title>
+<style type="text/css">
+<!--
+body, table {font-family:arial,sans-serif; font-size: medium
+;}th {background: #336699; color: #FFFFFF; text-align: left;}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF" topmargin="6" leftmargin="6">
+
+<br>
+</body></html>
\ No newline at end of file