[logback-dev] branch, master, updated. 1c840c987eca8712860eab12cfc7dbe09441faf5

[added by portage for gitosis-gentoo]

The branch, master has been updated
       via  1c840c987eca8712860eab12cfc7dbe09441faf5 (commit)
      from  12f248fab183df513aa84c1147f8781b69d3a18d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=1c840c987eca8712860eab12cfc7dbe09441faf5
http://github.com/ceki/logback/commit/1c840c987eca8712860eab12cfc7dbe09441faf5

commit 1c840c987eca8712860eab12cfc7dbe09441faf5
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Fri Dec 4 14:47:05 2009 +0100

    - All tests pass. LBCORE-26 has been fixed.

diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java
index 5276ae2..c50fab9 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java
@@ -16,7 +16,6 @@ package ch.qos.logback.core.rolling;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
-import java.sql.Date;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
@@ -215,12 +214,12 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests {
       tbrp1.timeBasedTriggering.setCurrentTime(currentTime);
     }
 
-    File activeFile = new File(rfa1.getFile());
-    
-    System.out.println("activeFile="+activeFile);
-    activeFile.setLastModified(currentTime);
     rfa1.stop();
 
+    // change the timestamp of the currently actively file
+    File activeFile = new File(rfa1.getFile());
+    activeFile.setLastModified(currentTime);
+    
     
     initRFA(rfa2, testId2FileName(testId));
     initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{"
@@ -264,12 +263,9 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests {
 
     rfa1.stop();
 
-
-    System.out.println("time before  wait "+SDF.format(new Date(currentTime)));
-    
+    // change the timestamp of the currently actively file
     File activeFile = new File(rfa1.getFile());
     activeFile.setLastModified(currentTime);
-
     
     incCurrentTime(2000);
 
@@ -277,7 +273,6 @@ public class TimeBasedRollingTest extends ScaffoldingForRollingTests {
     initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{"
         + DATE_PATTERN_WITH_SECONDS + "}", currentTime);
 
-    System.out.println("time after   wait "+SDF.format(new Date(currentTime)));
     for (int i = 0; i <= 2; i++) {
       rfa2.doAppend("World---" + i);
       addExpectedFileNamedIfItsTime_ByDate(testId, false);

-----------------------------------------------------------------------

Summary of changes:
 .../logback/core/rolling/TimeBasedRollingTest.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Logback: the generic, reliable, fast and flexible logging framework.