ceki 02/04/04 14:01:26
Modified: tests build.xml
tests/src/java/org/apache/log4j MinimumTestCase.java
tests/src/java/org/apache/log4j/net SocketAppenderTest.java
tests/src/java/org/apache/log4j/util Transformer.java
tests/src/java/org/apache/log4j/xml CustomLevelTestCase.java
DOMTestCase.java
Added: tests/input/xml customLevel2.xml customLevel3.xml
customLogger2.xml customLogger3.xml
tests/witness patternLayout.1
Log:
improving test cases
Revision Changes Path
1.7 +9 -1 jakarta-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 22 Feb 2002 18:09:26 -0000 1.6
+++ build.xml 4 Apr 2002 22:01:25 -0000 1.7
@@ -123,6 +123,15 @@
</junit>
</target>
+ <target name="PatternLayout" depends="build">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="tests.classpath"/>
+ <formatter type="plain" usefile="false"/>
+ <test name="org.apache.log4j.PatternLayoutTestCase" />
+ </junit>
+ </target>
+
+
<target name="DOM" depends="build">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="tests.classpath"/>
@@ -188,6 +197,5 @@
<test name="org.apache.log4j.or.ORTestCase" />
</junit>
</target>
-
</project>
1.1 jakarta-log4j/tests/input/xml/customLevel2.xml
Index: customLevel2.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="output/temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %c{2} - %m\n"/>
</layout>
<filter class="org.apache.log4j.varia.LevelMatchFilter">
<param name="LevelToMatch" value="TRACE#org.apache.log4j.xml.XLevel" />
<param name="AcceptOnMatch" value="true" />
</filter>
</appender>
<root>
<level value="TRACE" class="org.apache.log4j.xml.XLevel"/>
<appender-ref ref="TEMP" />
</root>
</log4j:configuration>
1.1 jakarta-log4j/tests/input/xml/customLevel3.xml
Index: customLevel3.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="output/temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %c{2} - %m\n"/>
</layout>
<filter class="org.apache.log4j.varia.LevelMatchFilter">
<param name="LevelToMatch" value="TRACE#org.apache.log4j.xml.XLevel" />
<param name="AcceptOnMatch" value="true" />
</filter>
<filter class="org.apache.log4j.varia.DenyAllFilter"/>
</appender>
<root>
<level value="TRACE" class="org.apache.log4j.xml.XLevel"/>
<appender-ref ref="TEMP" />
</root>
</log4j:configuration>
1.1 jakarta-log4j/tests/input/xml/customLogger2.xml
Index: customLogger2.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="output/temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %c{2} - %m%n"/>
</layout>
<filter class="org.apache.log4j.varia.LevelMatchFilter">
<param name="LevelToMatch"
value="TRACE#org.apache.log4j.xml.XLevel" />
<param name="AcceptOnMatch" value="true" />
</filter>
<filter class="org.apache.log4j.varia.DenyAllFilter"/>
</appender>
<root>
<level value ="TRACE" class="org.apache.log4j.xml.XLevel"/>
<appender-ref ref="TEMP" />
</root>
</log4j:configuration>
1.1 jakarta-log4j/tests/input/xml/customLogger3.xml
Index: customLogger3.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="output/temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %c{2} - %m\n"/>
</layout>
</appender>
<root>
<level value ="TRACE" class="org.apache.log4j.xml.XLevel"/>
<appender-ref ref="TEMP" />
</root>
</log4j:configuration>
1.3 +4 -0
jakarta-log4j/tests/src/java/org/apache/log4j/MinimumTestCase.java
Index: MinimumTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/MinimumTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MinimumTestCase.java 22 Feb 2002 16:00:17 -0000 1.2
+++ MinimumTestCase.java 4 Apr 2002 22:01:25 -0000 1.3
@@ -48,6 +48,10 @@
root.removeAllAppenders();
}
+ public void tearDown() {
+ root.getLoggerRepository().resetConfiguration();
+ }
+
public void simple() throws Exception {
Layout layout = new SimpleLayout();
1.2 +1 -1
jakarta-log4j/tests/src/java/org/apache/log4j/net/SocketAppenderTest.java
Index: SocketAppenderTest.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/net/SocketAppenderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketAppenderTest.java 18 Feb 2002 19:16:52 -0000 1.1
+++ SocketAppenderTest.java 4 Apr 2002 22:01:25 -0000 1.2
@@ -2,7 +2,7 @@
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.APL file.
+ * the LICENSE.txt file.
*/
package org.apache.log4j.test;
1.3 +0 -1
jakarta-log4j/tests/src/java/org/apache/log4j/util/Transformer.java
Index: Transformer.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/util/Transformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Transformer.java 18 Feb 2002 19:16:52 -0000 1.2
+++ Transformer.java 4 Apr 2002 22:01:25 -0000 1.3
@@ -43,7 +43,6 @@
// Initialization of input and output omitted
while((line = input.readLine()) != null) {
- // apply all filters
line = filter.filter(line);
output.println(line);
}
1.3 +4 -0
jakarta-log4j/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
Index: CustomLevelTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CustomLevelTestCase.java 24 Mar 2002 23:37:11 -0000 1.2
+++ CustomLevelTestCase.java 4 Apr 2002 22:01:25 -0000 1.3
@@ -30,6 +30,10 @@
logger = Logger.getLogger(CustomLevelTestCase.class);
}
+ public void tearDown() {
+ root.getLoggerRepository().resetConfiguration();
+ }
+
public void test1() throws Exception {
DOMConfigurator.configure("input/xml/customLevel1.xml");
common();
1.3 +4 -0
jakarta-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
Index: DOMTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMTestCase.java 18 Feb 2002 21:43:32 -0000 1.2
+++ DOMTestCase.java 4 Apr 2002 22:01:25 -0000 1.3
@@ -48,6 +48,10 @@
logger = Logger.getLogger(DOMTestCase.class);
}
+ public void tearDown() {
+ root.getLoggerRepository().resetConfiguration();
+ }
+
public void test1() throws Exception {
DOMConfigurator.configure("input/xml/DOMTestCase1.xml");
common();
1.1 jakarta-log4j/tests/witness/patternLayout.1
Index: patternLayout.1
===================================================================
DEBUG - Message 0
DEBUG - Message 0
INFO - Message 1
INFO - Message 1
WARN - Message 2
WARN - Message 2
ERROR - Message 3
ERROR - Message 3
FATAL - Message 4
FATAL - Message 4
DEBUG - Message 5
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test1(PatternLayoutTestCase.java:XXX)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:XXX)
at junit.framework.TestCase.runBare(TestCase.java:XXX)
at junit.framework.TestResult$1.protect(TestResult.java:XXX)
at junit.framework.TestResult.runProtected(TestResult.java:XXX)
at junit.framework.TestResult.run(TestResult.java:XXX)
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(JUnitTestRunner.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(JUnitTestRunner.java:XXX)
INFO - Message 6
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test1(PatternLayoutTestCase.java:XXX)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:XXX)
at junit.framework.TestCase.runBare(TestCase.java:XXX)
at junit.framework.TestResult$1.protect(TestResult.java:XXX)
at junit.framework.TestResult.runProtected(TestResult.java:XXX)
at junit.framework.TestResult.run(TestResult.java:XXX)
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(JUnitTestRunner.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(JUnitTestRunner.java:XXX)
WARN - Message 7
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test1(PatternLayoutTestCase.java:XXX)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:XXX)
at junit.framework.TestCase.runBare(TestCase.java:XXX)
at junit.framework.TestResult$1.protect(TestResult.java:XXX)
at junit.framework.TestResult.runProtected(TestResult.java:XXX)
at junit.framework.TestResult.run(TestResult.java:XXX)
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(JUnitTestRunner.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(JUnitTestRunner.java:XXX)
ERROR - Message 8
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test1(PatternLayoutTestCase.java:XXX)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:XXX)
at junit.framework.TestCase.runBare(TestCase.java:XXX)
at junit.framework.TestResult$1.protect(TestResult.java:XXX)
at junit.framework.TestResult.runProtected(TestResult.java:XXX)
at junit.framework.TestResult.run(TestResult.java:XXX)
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(JUnitTestRunner.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(JUnitTestRunner.java:XXX)
FATAL - Message 9
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test1(PatternLayoutTestCase.java:XXX)
at java.lang.reflect.Method.invoke(Native Method)
at junit.framework.TestCase.runTest(TestCase.java:XXX)
at junit.framework.TestCase.runBare(TestCase.java:XXX)
at junit.framework.TestResult$1.protect(TestResult.java:XXX)
at junit.framework.TestResult.runProtected(TestResult.java:XXX)
at junit.framework.TestResult.run(TestResult.java:XXX)
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.run(JUnitTestRunner.java:XXX)
at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(JUnitTestRunner.java:XXX)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
