Author: seb Date: Tue Oct 17 16:19:31 2006 New Revision: 700 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Log: another correction, testing again on the unix machine. Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Tue Oct 17 16:19:31 2006 @@ -105,17 +105,14 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - long now = System.currentTimeMillis(); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } - long newNow = System.currentTimeMillis(); - System.out.println("Done waiting. Waited: " + (newNow - now)); - for (int i = 0; i < 3; i++) { - System.out.println(i + " expected filename [" + filenames[i] + "]."); - } +// for (int i = 0; i < 3; i++) { +// System.out.println(i + " expected filename [" + filenames[i] + "]."); +// } for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX @@ -152,9 +149,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 10; i++) { + for (int i = 0; i <= 2; i++) { rfa1.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } rfa1.stop(); @@ -169,9 +166,9 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 3; i <= 10; i++) { + for (int i = 0; i <= 2; i++) { rfa2.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(100); } for (int i = 0; i < 3; i++) { @@ -211,9 +208,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } // for (int i = 0; i < 3; i++) { @@ -260,9 +257,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 20; i++) { + for (int i = 0; i <= 2; i++) { rfa1.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } rfa1.stop(); @@ -278,9 +275,9 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 1; i <= 5; i++) { + for (int i = 0; i <= 2; i++) { rfa2.doAppend("Hello---" + i); - Thread.sleep(20); + Thread.sleep(100); } for (int i = 0; i < 3; i++) { @@ -321,9 +318,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } for (int i = 0; i < 3; i++) { @@ -364,14 +361,14 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < 3; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(50); + Thread.sleep(500); } - for (int i = 0; i < 4; i++) { - // System.out.println(i + " expected filename [" + filenames[i] + "]."); - } +// for (int i = 0; i < 4; i++) { +// System.out.println(i + " expected filename [" + filenames[i] + "]."); +// } for (int i = 0; i < 2; i++) { assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---11 -Hello---12 -Hello---13 -Hello---14 -Hello---15 -Hello---16 -Hello---17 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 Tue Oct 17 16:19:31 2006 @@ -1 +1,4 @@ -Hello---10 +Hello---2 +Hello---0 +Hello---1 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---11 -Hello---12 -Hello---13 -Hello---14 -Hello---15 -Hello---16 -Hello---17 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 Tue Oct 17 16:19:31 2006 @@ -1,8 +1,4 @@ -Hello---18 -Hello---19 -Hello---20 +Hello---2 +Hello---0 Hello---1 Hello---2 -Hello---3 -Hello---4 -Hello---5 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 Tue Oct 17 16:19:31 2006 @@ -1,18 +1,2 @@ Hello---0 -Hello---1 -Hello---2 -Hello---3 -Hello---4 -Hello---5 -Hello---6 -Hello---7 -Hello---8 -Hello---9 -Hello---10 -Hello---11 -Hello---12 -Hello---13 -Hello---14 -Hello---15 -Hello---16 -Hello---17 +Hello---1 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Tue Oct 17 16:19:31 2006 @@ -1,2 +1 @@ -Hello---18 -Hello---19 +Hello---2