carnold 2005/07/14 14:28:27
Modified: tests/src/java/org/apache/log4j/xml DOMTest.java
Added: tests/input/xml DOMTest4.xml DOMTest4_A1.xml DOMTest4_A2.xml
tests/witness/xml dom.A1.4 dom.A2.4
Log:
Bug 23705: Add external entity test to log4j CVS HEAD
Revision Changes Path
1.2 +29 -0 logging-log4j/tests/input/xml/DOMTest4.xml
1.2 +1 -0 logging-log4j/tests/input/xml/DOMTest4_A1.xml
1.2 +1 -0 logging-log4j/tests/input/xml/DOMTest4_A2.xml
1.4 +39 -0
logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTest.java
Index: DOMTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMTest.java 8 Mar 2005 04:18:16 -0000 1.3
+++ DOMTest.java 14 Jul 2005 21:28:26 -0000 1.4
@@ -194,6 +194,45 @@
assertTrue(Compare.compare(FILTERED_A1 + ".3", "witness/xml/dom.A1.3"));
assertTrue(Compare.compare(FILTERED_A2 + ".3", "witness/xml/dom.A2.3"));
}
+
+ /**
+ * Tests processing of external entities in XML file.
+ */
+ public void test4() throws Exception {
+ //org.apache.log4j.BasicConfigurator.configure();
+ JoranConfigurator jc = new JoranConfigurator();
+ jc.doConfigure("input/xml/DOMTest4.xml",
LogManager.getLoggerRepository());
+ dumpErrors(jc.getErrorList());
+ common();
+
+ ControlFilter cf1 =
+ new ControlFilter(
+ new String[] {
+ TEST1_1A_PAT, TEST1_1B_PAT, EXCEPTION1, EXCEPTION2, EXCEPTION3
+ });
+
+ ControlFilter cf2 =
+ new ControlFilter(
+ new String[] { TEST1_2_PAT, EXCEPTION1, EXCEPTION2, EXCEPTION3 });
+
+ Transformer.transform(
+ TEMP_A1 + ".4", FILTERED_A1 + ".4",
+ new Filter[] {
+ cf1, new LineNumberFilter(), new SunReflectFilter(),
+ new JunitTestRunnerFilter()
+ });
+
+ Transformer.transform(
+ TEMP_A2 + ".4", FILTERED_A2 + ".4",
+ new Filter[] {
+ cf2, new LineNumberFilter(), new ISO8601Filter(),
+ new SunReflectFilter(), new JunitTestRunnerFilter()
+ });
+
+ assertTrue(Compare.compare(FILTERED_A1 + ".4", "witness/xml/dom.A1.4"));
+ assertTrue(Compare.compare(FILTERED_A2 + ".4", "witness/xml/dom.A2.4"));
+ }
+
void common() {
int i = -1;
1.1 logging-log4j/tests/witness/xml/dom.A1.4
Index: dom.A1.4
===================================================================
DEBUG xml.DOMTest - Message 0
DEBUG xml.DOMTest - Message 0
DEBUG root - Message 0
INFO xml.DOMTest - Message 1
INFO xml.DOMTest - Message 1
INFO root - Message 1
WARN xml.DOMTest - Message 2
WARN xml.DOMTest - Message 2
WARN root - Message 2
ERROR xml.DOMTest - Message 3
ERROR xml.DOMTest - Message 3
ERROR root - Message 3
FATAL xml.DOMTest - Message 4
FATAL xml.DOMTest - Message 4
FATAL root - Message 4
DEBUG xml.DOMTest - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
DEBUG xml.DOMTest - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
DEBUG root - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
ERROR xml.DOMTest - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
ERROR xml.DOMTest - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
ERROR root - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
1.1 logging-log4j/tests/witness/xml/dom.A2.4
Index: dom.A2.4
===================================================================
[main] DEBUG org.apache.log4j.xml.DOMTest - Message 0
[main] DEBUG root - Message 0
[main] INFO org.apache.log4j.xml.DOMTest - Message 1
[main] INFO root - Message 1
[main] WARN org.apache.log4j.xml.DOMTest - Message 2
[main] WARN root - Message 2
[main] ERROR org.apache.log4j.xml.DOMTest - Message 3
[main] ERROR root - Message 3
[main] FATAL org.apache.log4j.xml.DOMTest - Message 4
[main] FATAL root - Message 4
[main] DEBUG org.apache.log4j.xml.DOMTest - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
[main] DEBUG root - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
[main] ERROR org.apache.log4j.xml.DOMTest - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
[main] ERROR root - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTest.common(X)
at org.apache.log4j.xml.DOMTest.test4(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
at junit.framework.TestResult$1.protect(X)
at junit.framework.TestResult.runProtected(X)
at junit.framework.TestResult.run(X)
at junit.framework.TestCase.run(X)
at junit.framework.TestSuite.runTest(X)
at junit.framework.TestSuite.run(X)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
