ceki 02/04/11 16:04:49
Modified: tests/src/java/org/apache/log4j/util ControlFilter.java
Filter.java RelativeTimeFilter.java
Added: tests/witness patternLayout.8 patternLayout.9
Log:
More test cases for patternLayout
Revision Changes Path
1.3 +1 -1
jakarta-log4j/tests/src/java/org/apache/log4j/util/ControlFilter.java
Index: ControlFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/util/ControlFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ControlFilter.java 6 Apr 2002 17:52:07 -0000 1.2
+++ ControlFilter.java 11 Apr 2002 23:04:49 -0000 1.3
@@ -26,6 +26,6 @@
}
}
- throw new UnexpectedFormatException(in);
+ throw new UnexpectedFormatException("["+in+"]");
}
}
1.4 +1 -1 jakarta-log4j/tests/src/java/org/apache/log4j/util/Filter.java
Index: Filter.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/util/Filter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Filter.java 6 Apr 2002 17:52:07 -0000 1.3
+++ Filter.java 11 Apr 2002 23:04:49 -0000 1.4
@@ -15,7 +15,7 @@
static public final String ABSOLUTE_TIME_PAT =
"^\\d{2}:\\d{2}:\\d{2},\\d{3}";
- static public final String RELATIVE_TIME_PAT = "^\\d{3,10}";
+ static public final String RELATIVE_TIME_PAT = "^\\d{1,10}";
String filter(String in) throws UnexpectedFormatException;
1.2 +1 -0
jakarta-log4j/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java
Index: RelativeTimeFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelativeTimeFilter.java 6 Apr 2002 17:52:07 -0000 1.1
+++ RelativeTimeFilter.java 11 Apr 2002 23:04:49 -0000 1.2
@@ -14,6 +14,7 @@
String pat = "/"+Filter.RELATIVE_TIME_PAT+"/";
if(util.match(pat, in)) {
+ //System.out.println("Removing relative time from line ["+in+"]");
return util.substitute("s/"+Filter.RELATIVE_TIME_PAT+"//", in);
} else {
return in;
1.1 jakarta-log4j/tests/witness/patternLayout.8
Index: patternLayout.8
===================================================================
[main] DEBUG rnLayoutTestCase - Message 0
[main] DEBUG root - Message 0
[main] INFO rnLayoutTestCase - Message 1
[main] INFO root - Message 1
[main] WARN rnLayoutTestCase - Message 2
[main] WARN root - Message 2
[main] ERROR rnLayoutTestCase - Message 3
[main] ERROR root - Message 3
[main] FATAL rnLayoutTestCase - Message 4
[main] FATAL root - Message 4
[main] DEBUG rnLayoutTestCase - Message 5
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test8(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)
[main] INFO rnLayoutTestCase - Message 6
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test8(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)
[main] WARN rnLayoutTestCase - Message 7
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test8(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)
[main] ERROR rnLayoutTestCase - Message 8
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test8(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)
[main] FATAL rnLayoutTestCase - Message 9
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test8(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)
1.1 jakarta-log4j/tests/witness/patternLayout.9
Index: patternLayout.9
===================================================================
[main] DEBUG rnLayoutTestCase : Message 0
[main] DEBUG root : Message 0
[main] INFO rnLayoutTestCase : Message 1
[main] INFO root : Message 1
[main] WARN rnLayoutTestCase : Message 2
[main] WARN root : Message 2
[main] ERROR rnLayoutTestCase : Message 3
[main] ERROR root : Message 3
[main] FATAL rnLayoutTestCase : Message 4
[main] FATAL root : Message 4
[main] DEBUG rnLayoutTestCase : Message 5
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test9(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)
[main] INFO rnLayoutTestCase : Message 6
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test9(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)
[main] WARN rnLayoutTestCase : Message 7
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test9(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)
[main] ERROR rnLayoutTestCase : Message 8
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test9(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)
[main] FATAL rnLayoutTestCase : Message 9
java.lang.Exception: Just testing
at
org.apache.log4j.PatternLayoutTestCase.common(PatternLayoutTestCase.java:XXX)
at org.apache.log4j.PatternLayoutTestCase.test9(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]>
