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/varia ErrorHandlerTestCase.java
Date Mon, 03 May 2004 07:40:45 GMT
ceki        2004/05/03 00:40:45

  Modified:    tests/witness socketServer.2 socketServer.7 socketServer.8
                        fallback socketServer.5 socketServer.1
                        socketServer.3 socketServer.6 socketServer.4
               tests/src/java/org/apache/log4j/net
                        SocketServerTestCase.java
               tests    build.xml
               tests/src/java/org/apache/log4j/varia
                        ErrorHandlerTestCase.java
  Log:
  - This time gump should stop complaining.
  - Added SocketServerTestCase back into the fold in build.xml
  
  Revision  Changes    Path
  1.3       +1 -5      logging-log4j/tests/witness/socketServer.2
  
  Index: socketServer.2
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.2,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- socketServer.2	14 Nov 2002 08:48:40 -0000	1.2
  +++ socketServer.2	3 May 2004 07:40:44 -0000	1.3
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR T2 [main] ? (?:?) Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -30,6 +28,4 @@
   	at junit.framework.TestResult.run(X)
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
  -	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  +	at junit.framework.TestSuite.run(X)
  \ No newline at end of file
  
  
  
  1.4       +0 -4      logging-log4j/tests/witness/socketServer.7
  
  Index: socketServer.7
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.7,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- socketServer.7	14 Nov 2002 08:48:40 -0000	1.3
  +++ socketServer.7	3 May 2004 07:40:44 -0000	1.4
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR some7 T7 client-test7 MDC-TEST7 [main] root - Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -31,5 +29,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.4       +0 -4      logging-log4j/tests/witness/socketServer.8
  
  Index: socketServer.8
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.8,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- socketServer.8	14 Nov 2002 08:48:40 -0000	1.3
  +++ socketServer.8	3 May 2004 07:40:44 -0000	1.4
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -31,5 +29,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.2       +0 -8      logging-log4j/tests/witness/fallback
  
  Index: fallback
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/fallback,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fallback	14 Nov 2002 13:50:35 -0000	1.1
  +++ fallback	3 May 2004 07:40:44 -0000	1.2
  @@ -21,8 +21,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   FALLBACK - root - Message 5
   java.lang.Exception: Just testing
   	at org.apache.log4j.varia.ErrorHandlerTestCase.common(X)
  @@ -36,8 +34,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   FALLBACK - test - Message 6
   java.lang.Exception: Just testing
   	at org.apache.log4j.varia.ErrorHandlerTestCase.common(X)
  @@ -51,8 +47,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   FALLBACK - root - Message 6
   java.lang.Exception: Just testing
   	at org.apache.log4j.varia.ErrorHandlerTestCase.common(X)
  @@ -66,5 +60,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.4       +0 -4      logging-log4j/tests/witness/socketServer.5
  
  Index: socketServer.5
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.5,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- socketServer.5	14 Nov 2002 08:48:40 -0000	1.3
  +++ socketServer.5	3 May 2004 07:40:44 -0000	1.4
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR some5 T5 MDC-TEST5 [main] root - Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -31,5 +29,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.3       +1 -5      logging-log4j/tests/witness/socketServer.1
  
  Index: socketServer.1
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.1,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- socketServer.1	14 Nov 2002 08:48:40 -0000	1.2
  +++ socketServer.1	3 May 2004 07:40:44 -0000	1.3
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR T1 [main] root Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -30,6 +28,4 @@
   	at junit.framework.TestResult.run(X)
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
  -	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  +	at junit.framework.TestSuite.run(X)
  \ No newline at end of file
  
  
  
  1.3       +0 -4      logging-log4j/tests/witness/socketServer.3
  
  Index: socketServer.3
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.3,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- socketServer.3	14 Nov 2002 08:48:40 -0000	1.2
  +++ socketServer.3	3 May 2004 07:40:44 -0000	1.3
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR T3 [main] org.apache.log4j.net.SocketServerTestCase (X) Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -31,5 +29,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.4       +0 -4      logging-log4j/tests/witness/socketServer.6
  
  Index: socketServer.6
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.6,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- socketServer.6	14 Nov 2002 08:48:40 -0000	1.3
  +++ socketServer.6	3 May 2004 07:40:44 -0000	1.4
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR some6 T6 client-test6 MDC-TEST6 [main] root - Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -31,5 +29,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.3       +0 -4      logging-log4j/tests/witness/socketServer.4
  
  Index: socketServer.4
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/witness/socketServer.4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- socketServer.4	14 Nov 2002 08:48:40 -0000	1.2
  +++ socketServer.4	3 May 2004 07:40:44 -0000	1.3
  @@ -16,8 +16,6 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
   ERROR some T4 MDC-TEST4 [main] root - Message 7
   java.lang.Exception: Just testing
   	at org.apache.log4j.net.SocketServerTestCase.common(X)
  @@ -31,5 +29,3 @@
   	at junit.framework.TestCase.run(X)
   	at junit.framework.TestSuite.runTest(X)
   	at junit.framework.TestSuite.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(X)
  -	at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(X)
  
  
  
  1.8       +25 -9     logging-log4j/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
  
  Index: SocketServerTestCase.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SocketServerTestCase.java	1 May 2004 13:10:55 -0000	1.7
  +++ SocketServerTestCase.java	3 May 2004 07:40:44 -0000	1.8
  @@ -109,7 +109,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
   
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.1"));
     }
  @@ -133,7 +135,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
   
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.2"));
     }
  @@ -156,7 +160,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
   
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.3"));
     }
  @@ -182,7 +188,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
   
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.4"));
     }
  @@ -221,7 +229,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.5"));
     }
   
  @@ -253,7 +263,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.6"));
     }
   
  @@ -280,7 +292,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.7"));
     }
   
  @@ -305,7 +319,9 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, new LineNumberFilter(), 
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
       assertTrue(Compare.compare(FILTERED, "witness/socketServer.8"));
     }
   
  @@ -337,7 +353,7 @@
       }
     }
   
  -  public static Test suite() {
  +  public static Test XXsuite() {
       TestSuite suite = new TestSuite();
       suite.addTest(new SocketServerTestCase("test1"));
       suite.addTest(new SocketServerTestCase("test2"));
  
  
  
  1.52      +1 -4      logging-log4j/tests/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/build.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- build.xml	28 Apr 2004 15:39:44 -0000	1.51
  +++ build.xml	3 May 2004 07:40:44 -0000	1.52
  @@ -110,13 +110,10 @@
     <!-- created witness file.                                             -->
     <!-- ================================================================= -->  
   
  -  <!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
  -  <!-- Temporarily removed SocketServer which followed DefaultInit -->
  -  <!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
  -  
     <target name="regression" depends="Minimum, Logger, DOM, CustomLevel, 
                                        CustomLogger, PatternLayout, 
                                        HierarchyThreshold, DefaultInit, 
  +                                     SocketServer,
                                        XMLLayout, AsyncAppender, ErrorHandler,
                                        OptionConverter, BoundedFIFO, 
                                        Joran,  
  
  
  
  1.6       +6 -2      logging-log4j/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java
  
  Index: ErrorHandlerTestCase.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ErrorHandlerTestCase.java	27 Feb 2004 16:47:37 -0000	1.5
  +++ ErrorHandlerTestCase.java	3 May 2004 07:40:45 -0000	1.6
  @@ -25,6 +25,7 @@
   import org.apache.log4j.util.Compare;
   import org.apache.log4j.util.ControlFilter;
   import org.apache.log4j.util.Filter;
  +import org.apache.log4j.util.JunitTestRunnerFilter;
   import org.apache.log4j.util.LineNumberFilter;
   import org.apache.log4j.util.SunReflectFilter;
   import org.apache.log4j.util.Transformer;
  @@ -70,7 +71,10 @@
   
       Transformer.transform(
         TEMP, FILTERED,
  -      new Filter[] { cf, new LineNumberFilter(), new SunReflectFilter() });
  +      new Filter[] { cf, 
  +          new LineNumberFilter(),
  +          new JunitTestRunnerFilter(),
  +          new SunReflectFilter() });
   
       assertTrue(Compare.compare(FILTERED, "witness/fallback"));
     }
  @@ -101,7 +105,7 @@
       root.error("Message " + i, e);
     }
   
  -  public static Test suite() {
  +  public static Test XXsuite() {
       TestSuite suite = new TestSuite();
       suite.addTest(new ErrorHandlerTestCase("test1"));
   
  
  
  

---------------------------------------------------------------------
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