logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject cvs commit: logging-log4j/tests/src/java/org/apache/log4j/rolling TimeBasedRollingTest.java
Date Sat, 20 Nov 2004 19:12:26 GMT
ceki        2004/11/20 11:12:26

  Modified:    tests/src/java/org/apache/log4j
                        HierarchyThresholdTestCase.java
               tests/src/java/org/apache/log4j/rolling
                        TimeBasedRollingTest.java
  Added:       tests/witness/hierarchy hierarchyThreshold.8
                        hierarchyThreshold.3 hierarchyThreshold.5
                        hierarchyThreshold.4 hierarchyThreshold.1
                        hierarchyThreshold.7 hierarchyThreshold.2
                        hierarchyThreshold.6
  Removed:     tests/witness tbr-test3.2.gz dom.A2.1 tbr-test2.0
                        xmlLayout.2 customLevel.1 hierarchyThreshold.5
                        tbr-test5.1 tbr-test3.1.gz tbr-test2.1
                        hierarchyThreshold.4 xmlLayout.3 xmlLayout.null
                        hierarchyThreshold.7 customLevel.4 tbr-test2.2
                        tbr-test5.0 hierarchyThreshold.8 tbr-test5.3
                        xmlLayout.mdc.2 hierarchyThreshold.3 tbr-test5.2
                        customLevel.2 hierarchyThreshold.6 xmlLayout.1
                        tbr-test6.2.gz tbr-test6.1.gz tbr-test1.0
                        customLogger.2 customLogger.1 dom.A1.1 tbr-test1.3
                        customLevel.3 tbr-test6.0.gz tbr-test3.3
                        xmlLayout.mdc.1 tbr-test2.3 hierarchyThreshold.1
                        tbr-test6.3 hierarchyThreshold.2 tbr-test1.2
                        tbr-test1.1 tbr-test3.0.gz
  Log:
  Moving around witness files
  
  Revision  Changes    Path
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.8
  
  Index: hierarchyThreshold.8
  ===================================================================
  TRACE [main] log4j.HierarchyThresholdTestCase = m0
  DEBUG [main] log4j.HierarchyThresholdTestCase = m1
  INFO [main] log4j.HierarchyThresholdTestCase = m2
  WARN [main] log4j.HierarchyThresholdTestCase = m3
  ERROR [main] log4j.HierarchyThresholdTestCase = m4
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.3
  
  Index: hierarchyThreshold.3
  ===================================================================
  ERROR [main] log4j.HierarchyThresholdTestCase = m4
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.5
  
  Index: hierarchyThreshold.5
  ===================================================================
  INFO [main] log4j.HierarchyThresholdTestCase = m2
  WARN [main] log4j.HierarchyThresholdTestCase = m3
  ERROR [main] log4j.HierarchyThresholdTestCase = m4
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.4
  
  Index: hierarchyThreshold.4
  ===================================================================
  WARN [main] log4j.HierarchyThresholdTestCase = m3
  ERROR [main] log4j.HierarchyThresholdTestCase = m4
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.1
  
  	<<Binary file>>
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.7
  
  Index: hierarchyThreshold.7
  ===================================================================
  TRACE [main] log4j.HierarchyThresholdTestCase = m0
  DEBUG [main] log4j.HierarchyThresholdTestCase = m1
  INFO [main] log4j.HierarchyThresholdTestCase = m2
  WARN [main] log4j.HierarchyThresholdTestCase = m3
  ERROR [main] log4j.HierarchyThresholdTestCase = m4
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.2
  
  Index: hierarchyThreshold.2
  ===================================================================
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.1                  logging-log4j/tests/witness/hierarchy/hierarchyThreshold.6
  
  Index: hierarchyThreshold.6
  ===================================================================
  DEBUG [main] log4j.HierarchyThresholdTestCase = m1
  INFO [main] log4j.HierarchyThresholdTestCase = m2
  WARN [main] log4j.HierarchyThresholdTestCase = m3
  ERROR [main] log4j.HierarchyThresholdTestCase = m4
  FATAL [main] log4j.HierarchyThresholdTestCase = m5
  
  
  
  1.5       +8 -8      logging-log4j/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java
  
  Index: HierarchyThresholdTestCase.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HierarchyThresholdTestCase.java	20 Nov 2004 12:54:11 -0000	1.4
  +++ HierarchyThresholdTestCase.java	20 Nov 2004 19:12:26 -0000	1.5
  @@ -54,49 +54,49 @@
     public void test1() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold1.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.1"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.1"));
     }
   
     public void test2() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold2.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.2"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.2"));
     }
   
     public void test3() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold3.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.3"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.3"));
     }
   
     public void test4() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold4.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.4"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.4"));
     }
   
     public void test5() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold5.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.5"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.5"));
     }
   
     public void test6() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold6.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.6"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.6"));
     }
   
     public void test7() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold7.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.7"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.7"));
     }
   
     public void test8() throws Exception {
       PropertyConfigurator.configure("input/hierarchy/hierarchyThreshold8.properties");
       common();
  -    assertTrue(Compare.compare(TEMP, "witness/hierarchyThreshold.8"));
  +    assertTrue(Compare.compare(TEMP, "witness/hierarchy/hierarchyThreshold.8"));
     }
   
     static void common() {
  
  
  
  1.8       +7 -7      logging-log4j/tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java
  
  Index: TimeBasedRollingTest.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/rolling/TimeBasedRollingTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TimeBasedRollingTest.java	31 May 2004 21:14:24 -0000	1.7
  +++ TimeBasedRollingTest.java	20 Nov 2004 19:12:26 -0000	1.8
  @@ -100,7 +100,7 @@
       }
   
       for (int i = 0; i < 4; i++) {
  -      assertTrue(Compare.compare(filenames[i], "witness/tbr-test1." + i));
  +      assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test1." + i));
       }
     }
   
  @@ -164,7 +164,7 @@
       }
   
       for (int i = 0; i < 4; i++) {
  -      assertTrue(Compare.compare(filenames[i], "witness/tbr-test2." + i));
  +      assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test2." + i));
       }
     }
   
  @@ -215,10 +215,10 @@
       }
   
       for (int i = 0; i < 3; i++) {
  -      assertTrue(Compare.gzCompare(filenames[i], "witness/tbr-test3." + i + ".gz"));
  +      assertTrue(Compare.gzCompare(filenames[i], "witness/rolling/tbr-test3." + i + ".gz"));
       }
   
  -    assertTrue(Compare.compare(filenames[3], "witness/tbr-test3.3"));
  +    assertTrue(Compare.compare(filenames[3], "witness/rolling/tbr-test3.3"));
     }
   
     /**
  @@ -275,7 +275,7 @@
       }
   
       for (int i = 0; i < 4; i++) {
  -      assertTrue(Compare.compare(filenames[i], "witness/tbr-test5." + i));
  +      assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test5." + i));
       }
     }
   
  @@ -327,10 +327,10 @@
       }
   
       for (int i = 0; i < 3; i++) {
  -      assertTrue(Compare.gzCompare(filenames[i], "witness/tbr-test6." + i + ".gz"));
  +      assertTrue(Compare.gzCompare(filenames[i], "witness/rolling/tbr-test6." + i + ".gz"));
       }
   
  -    assertTrue(Compare.compare(filenames[3], "witness/tbr-test6.3"));
  +    assertTrue(Compare.compare(filenames[3], "witness/rolling/tbr-test6.3"));
     }
   
     void delayUntilNextSecond(int millis) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message