carnold 2005/08/19 12:35:09
Modified: tests/src/java/org/apache/log4j Tag: v1_2-branch
LoggerTestCase.java MinimumTestCase.java
PatternLayoutTestCase.java
tests/src/java/org/apache/log4j/net Tag: v1_2-branch
SocketServerTestCase.java
tests/src/java/org/apache/log4j/or Tag: v1_2-branch
ORTestCase.java
tests/src/java/org/apache/log4j/util Tag: v1_2-branch
JunitTestRunnerFilter.java SunReflectFilter.java
tests/src/java/org/apache/log4j/xml Tag: v1_2-branch
DOMTestCase.java
Log:
Bug 35519: Expand stack trace pattern for JDK 1.1
Revision Changes Path
No revision
No revision
1.4.2.5 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/Attic/LoggerTestCase.java
Index: LoggerTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/Attic/LoggerTestCase.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- LoggerTestCase.java 22 Jul 2005 19:00:46 -0000 1.4.2.4
+++ LoggerTestCase.java 19 Aug 2005 19:35:08 -0000 1.4.2.5
@@ -348,7 +348,7 @@
Vector msgs = appender.getVector();
assertEquals(1, msgs.size());
- LoggingEvent event = (LoggingEvent) msgs.get(0);
+ LoggingEvent event = (LoggingEvent) msgs.elementAt(0);
assertEquals(Level.TRACE, event.getLevel());
assertEquals("Message 1", event.getMessage());
}
@@ -374,7 +374,7 @@
Vector msgs = appender.getVector();
assertEquals(1, msgs.size());
- LoggingEvent event = (LoggingEvent) msgs.get(0);
+ LoggingEvent event = (LoggingEvent) msgs.elementAt(0);
assertEquals(Level.TRACE, event.getLevel());
assertEquals("Message 1", event.getMessage());
}
1.5.2.4 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/Attic/MinimumTestCase.java
Index: MinimumTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/Attic/MinimumTestCase.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- MinimumTestCase.java 19 Aug 2005 07:10:22 -0000 1.5.2.3
+++ MinimumTestCase.java 19 Aug 2005 19:35:08 -0000 1.5.2.4
@@ -34,7 +34,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
- static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
//18 fevr. 2002 20:02:41,551 [main] FATAL ERR - Message 0
1.4.2.4 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/Attic/PatternLayoutTestCase.java
Index: PatternLayoutTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/Attic/PatternLayoutTestCase.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- PatternLayoutTestCase.java 19 Aug 2005 07:10:23 -0000 1.4.2.3
+++ PatternLayoutTestCase.java 19 Aug 2005 19:35:08 -0000 1.4.2.4
@@ -48,7 +48,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
- static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
static String PAT0 = "\\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* -
Message \\d{1,2}";
static String PAT1 = Filter.ISO8601_PAT + " " + PAT0;
No revision
No revision
1.2.2.6 +1 -1
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.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- SocketServerTestCase.java 19 Aug 2005 07:10:23 -0000 1.2.2.5
+++ SocketServerTestCase.java 19 Aug 2005 19:35:09 -0000 1.2.2.6
@@ -82,7 +82,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
- static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
static Logger logger = Logger.getLogger(SocketServerTestCase.class);
No revision
No revision
1.1.2.2 +9 -2
logging-log4j/tests/src/java/org/apache/log4j/or/ORTestCase.java
Index: ORTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/or/ORTestCase.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ORTestCase.java 24 May 2005 05:06:25 -0000 1.1.2.1
+++ ORTestCase.java 19 Aug 2005 19:35:09 -0000 1.1.2.2
@@ -147,9 +147,16 @@
// Add: Comparable
// Expect: Comparable
public
- void test7() {
+ void test7() throws Exception {
RendererMap map = new RendererMap();
- map.put(Comparable.class, cor);
+ Class comparable = null;
+ try {
+ comparable = getClass().forName("java.lang.Comparable");
+ } catch(Exception ex) {
+ // likely JDK 1.1
+ return;
+ }
+ map.put(comparable, cor);
ObjectRenderer r = map.get(Integer.class);
assertEquals(r, cor);
}
No revision
No revision
1.3.2.2 +2 -0
logging-log4j/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Index: JunitTestRunnerFilter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- JunitTestRunnerFilter.java 27 Jun 2005 19:40:18 -0000 1.3.2.1
+++ JunitTestRunnerFilter.java 19 Aug 2005 19:35:09 -0000 1.3.2.2
@@ -39,6 +39,8 @@
"/at
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner/",
in)) {
return null;
+ } else if (in.indexOf("at junit.") >= 0 && in.indexOf("ui.TestRunner")
>= 0) {
+ return null;
} else {
return in;
}
1.5.2.2 +9 -1
logging-log4j/tests/src/java/org/apache/log4j/util/SunReflectFilter.java
Index: SunReflectFilter.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/util/SunReflectFilter.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SunReflectFilter.java 27 Jun 2005 19:40:18 -0000 1.5.2.1
+++ SunReflectFilter.java 19 Aug 2005 19:35:09 -0000 1.5.2.2
@@ -19,7 +19,7 @@
import org.apache.oro.text.perl.Perl5Util;
/**
- * The sun.reflect.* lines are not present in all JDKs.
+ * The sun.reflect.* and java.lang.reflect.* lines are not present in all
JDKs.
*
* @author Ceki Gulcu
*/
@@ -33,6 +33,14 @@
if (util.match("/at sun.reflect/", in)) {
return null;
}
+ if (in.indexOf("at java.lang.reflect.Method") >= 0) {
+ return null;
+ }
+ if (in.indexOf("Compiled Code") >= 0) {
+ if(in.indexOf("junit.framework.TestSuite") >= 0) {
+ return util.substitute("s/Compiled Code/TestSuite.java:XXX/",
in);
+ }
+ }
if (util.match("/\\(Method.java:.*\\)/", in)) {
return util.substitute("s/\\(Method.java:.*\\)/(Native Method)/", in);
}
No revision
No revision
1.5.2.5 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/xml/Attic/DOMTestCase.java
Index: DOMTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/Attic/DOMTestCase.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- DOMTestCase.java 19 Aug 2005 07:10:23 -0000 1.5.2.4
+++ DOMTestCase.java 19 Aug 2005 19:35:09 -0000 1.5.2.5
@@ -42,7 +42,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
- static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
static String TEST1_1A_PAT =
"(DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* -
Message \\d";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
