LOG4J2-435 number of rollovers varies, tests cannot accurately predict which files will remain; assert more generally on number of remaining files
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a11b2d53 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a11b2d53 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a11b2d53 Branch: refs/heads/LOG4J-1181 Commit: a11b2d53e2dec8577b85e4c8acb211434b8f4aea Parents: cae75bc Author: rpopma <[email protected]> Authored: Sun Nov 29 17:34:06 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Nov 29 17:34:06 2015 +0900 ---------------------------------------------------------------------- .../RollingAppenderDeleteAccumulatedCount1Test.java | 10 +++++----- .../RollingAppenderDeleteAccumulatedCount2Test.java | 9 +++++---- .../appender/rolling/RollingAppenderDeleteNestedTest.java | 9 +++++---- 3 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a11b2d53/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java index ee08d9d..17686a7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java @@ -82,12 +82,12 @@ public class RollingAppenderDeleteAccumulatedCount1Test { System.out.println(file + " (" + file.length() + "B) " + FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified())); } - // sometimes "test-4.log" remains - List<String> expected = Arrays.asList("test-4.log", "test-5.log", "test-6.log", "test-7.log", "test-8.log", - "test-9.log", "test-10.log", "my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log"); - assertEquals(Arrays.toString(files), expected.size() - 1, files.length); + List<String> expected = Arrays.asList("my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log"); + assertEquals(Arrays.toString(files), expected.size() + 6, files.length); for (File file : files) { - assertTrue("unexpected file " + file, expected.contains(file.getName())); + if (!expected.contains(file.getName()) && !file.getName().startsWith("test-")) { + fail("unexpected file" + file); + } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a11b2d53/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java index c387803..d2e471a 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java @@ -83,11 +83,12 @@ public class RollingAppenderDeleteAccumulatedCount2Test { + FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified())); } // sometimes "test-9.log", sometimes "test-10.log" remains - List<String> expected = Arrays.asList("test-9.log", "test-10.log", - "my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log"); - assertEquals(Arrays.toString(files), expected.size() - 1, files.length); + List<String> expected = Arrays.asList("my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log"); + assertEquals(Arrays.toString(files), expected.size() + 1, files.length); for (File file : files) { - assertTrue("unexpected file " + file, expected.contains(file.getName())); + if (!expected.contains(file.getName()) && !file.getName().startsWith("test-")) { + fail("unexpected file" + file); + } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a11b2d53/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java index bb2c82c..7156abc 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java @@ -82,11 +82,12 @@ public class RollingAppenderDeleteNestedTest { + FixedDateFormat.create(FixedFormat.ABSOLUTE).format(file.lastModified())); } - List<String> expected = Arrays.asList("test-7.log", "test-8.log", "test-9.log", "test-10.log", - "my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log"); - assertEquals(Arrays.toString(files), expected.size() - 1, files.length); + List<String> expected = Arrays.asList("my-1.log", "my-2.log", "my-3.log", "my-4.log", "my-5.log"); + assertEquals(Arrays.toString(files), expected.size() + 3, files.length); for (File file : files) { - assertTrue("unexpected file " + file, expected.contains(file.getName())); + if (!expected.contains(file.getName()) && !file.getName().startsWith("test-")) { + fail("unexpected file" + file); + } } }
