LOG4J2-435 small test improvements Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/40d5cc05 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/40d5cc05 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/40d5cc05
Branch: refs/heads/master Commit: 40d5cc0511ce10ee3f5eba4c8ff3d562035c99af Parents: 1f4698b Author: rpopma <[email protected]> Authored: Fri Nov 27 15:09:44 2015 +0900 Committer: rpopma <[email protected]> Committed: Fri Nov 27 15:09:44 2015 +0900 ---------------------------------------------------------------------- .../rolling/RollingAppenderDeleteAccumulatedSizeTest.java | 7 ++++++- .../appender/rolling/RollingAppenderDeleteMaxDepthTest.java | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40d5cc05/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java index 922980e..3dffed4 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java @@ -20,6 +20,8 @@ import java.io.File; import java.util.Arrays; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.util.datetime.FixedDateFormat; +import org.apache.logging.log4j.core.util.datetime.FixedDateFormat.FixedFormat; import org.apache.logging.log4j.junit.LoggerContextRule; import org.junit.Rule; import org.junit.Test; @@ -60,7 +62,10 @@ public class RollingAppenderDeleteAccumulatedSizeTest { assertTrue("Dir " + DIR + " should contain files", dir.listFiles().length > 0); final File[] files = dir.listFiles(); - // for (File file : files) { System.out.println(file); } + for (File file : files) { + System.out.println(file + " (" + file.length() + "B) " + + FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified())); + } assertEquals(Arrays.toString(files), 4, files.length); long total = 0; for (File file : files) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40d5cc05/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteMaxDepthTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteMaxDepthTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteMaxDepthTest.java index 62ff7ba..9c11416 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteMaxDepthTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteMaxDepthTest.java @@ -24,6 +24,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import java.util.List; import java.util.regex.Pattern; import org.apache.logging.log4j.Logger; @@ -73,10 +74,11 @@ public class RollingAppenderDeleteMaxDepthTest { assertTrue("Dir " + DIR + " should contain files", dir.listFiles().length > 0); final File[] files = dir.listFiles(); - assertEquals(Arrays.toString(files), 5, files.length); + List<String> expected = Arrays.asList("1", "2", "test-1.log", "test-2.log", "test-3.log"); + assertEquals(Arrays.toString(files), expected.size(), files.length); for (File file : files) { assertTrue("test-4.log should have been deleted", - Arrays.asList("1", "2", "test-1.log", "test-2.log", "test-3.log").contains(file.getName())); + expected.contains(file.getName())); } assertTrue(p1 + " should not have been deleted", Files.exists(p1));
