Repository: logging-log4j2 Updated Branches: refs/heads/master 34ca03cab -> b0d97ac86
LOG4J2-435 make unit test more robust Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b0d97ac8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b0d97ac8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b0d97ac8 Branch: refs/heads/master Commit: b0d97ac86bef7b55cdb1b437b626e9c3a8f470aa Parents: 34ca03c Author: rpopma <[email protected]> Authored: Sat Dec 5 23:49:22 2015 +0900 Committer: rpopma <[email protected]> Committed: Sat Dec 5 23:49:22 2015 +0900 ---------------------------------------------------------------------- .../RollingAppenderDeleteScriptFri13thTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0d97ac8/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java index 2cd218e..8bb3f7e 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java @@ -57,14 +57,11 @@ public class RollingAppenderDeleteScriptFri13thTest { final Logger logger = ctx.getLogger(); // Trigger the rollover - for (int i = 0; i < 2; ++i) { - // 30 chars per message: each message triggers a rollover - logger.debug("This is a test message number " + i); // 30 chars: + while (dir.listFiles().length < 32) { + // 60+ chars per message: each message should trigger a rollover + logger.debug("This is a very, very, very, very long test message............."); // 60+ chars: + Thread.sleep(100); // Allow time for rollover to complete } - Thread.sleep(100); // Allow time for rollover to complete - - assertTrue("Dir " + DIR + " should exist", dir.exists()); - assertTrue("Dir " + DIR + " filecount=" + dir.listFiles().length, dir.listFiles().length >= 30); final File[] files = dir.listFiles(); for (File file : files) { @@ -74,7 +71,7 @@ public class RollingAppenderDeleteScriptFri13thTest { assertTrue(file.getName() + " starts with 'test-'", file.getName().startsWith("test-")); assertTrue(file.getName() + " ends with '.log'", file.getName().endsWith(".log")); String strDate = file.getName().substring(5, 13); - assertFalse(file + " is not Fri 13th", strDate.endsWith("13")); + assertFalse(file + " is not Fri 13th", strDate.endsWith("20151113")); } }
