ceki 2004/11/20 11:06:58
Modified: tests/src/java/org/apache/log4j/xml DOMTestCase.java
CustomLevelTestCase.java XMLLayoutTestCase.java
tests/src/java/org/apache/log4j/customLogger
XLoggerTestCase.java
Added: tests/witness/rolling tbr-test5.3 tbr-test2.1 tbr-test1.1
tbr-test3.1.gz tbr-test5.1 tbr-test1.0 tbr-test1.2
tbr-test2.3 tbr-test6.1.gz tbr-test1.3
tbr-test6.0.gz tbr-test6.3 tbr-test5.0
tbr-test3.2.gz tbr-test2.2 tbr-test3.0.gz
tbr-test5.2 tbr-test3.3 tbr-test2.0 tbr-test6.2.gz
tests/witness/xml xmlLayout.3 customLevel.3 customLevel.4
xmlLayout.2 xmlLayout.null dom.A2.1 customLevel.2
xmlLayout.1 customLogger.2 xmlLayout.mdc.2
customLogger.1 xmlLayout.mdc.1 dom.A1.1
customLevel.1
Log:
Moving around test files
Revision Changes Path
1.1 logging-log4j/tests/witness/rolling/tbr-test5.3
Index: tbr-test5.3
===================================================================
TimeBasedRollingTest - Hello---4
1.1 logging-log4j/tests/witness/rolling/tbr-test2.1
Index: tbr-test2.1
===================================================================
TimeBasedRollingTest - Hello---0
TimeBasedRollingTest - Hello---1
1.1 logging-log4j/tests/witness/rolling/tbr-test1.1
Index: tbr-test1.1
===================================================================
TimeBasedRollingTest - Hello---0
TimeBasedRollingTest - Hello---1
1.1 logging-log4j/tests/witness/rolling/tbr-test3.1.gz
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test5.1
Index: tbr-test5.1
===================================================================
TimeBasedRollingTest - Hello---0
TimeBasedRollingTest - Hello---1
1.1 logging-log4j/tests/witness/rolling/tbr-test1.0
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test1.2
Index: tbr-test1.2
===================================================================
TimeBasedRollingTest - Hello---2
TimeBasedRollingTest - Hello---3
1.1 logging-log4j/tests/witness/rolling/tbr-test2.3
Index: tbr-test2.3
===================================================================
TimeBasedRollingTest - Hello---4
1.1 logging-log4j/tests/witness/rolling/tbr-test6.1.gz
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test1.3
Index: tbr-test1.3
===================================================================
TimeBasedRollingTest - Hello---4
1.1 logging-log4j/tests/witness/rolling/tbr-test6.0.gz
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test6.3
Index: tbr-test6.3
===================================================================
TimeBasedRollingTest - Hello---4
1.1 logging-log4j/tests/witness/rolling/tbr-test5.0
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test3.2.gz
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test2.2
Index: tbr-test2.2
===================================================================
TimeBasedRollingTest - Hello---2
TimeBasedRollingTest - Hello---3
1.1 logging-log4j/tests/witness/rolling/tbr-test3.0.gz
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test5.2
Index: tbr-test5.2
===================================================================
TimeBasedRollingTest - Hello---2
TimeBasedRollingTest - Hello---3
1.1 logging-log4j/tests/witness/rolling/tbr-test3.3
Index: tbr-test3.3
===================================================================
TimeBasedRollingTest - Hello---4
1.1 logging-log4j/tests/witness/rolling/tbr-test2.0
<<Binary file>>
1.1 logging-log4j/tests/witness/rolling/tbr-test6.2.gz
<<Binary file>>
1.1 logging-log4j/tests/witness/xml/xmlLayout.3
Index: xmlLayout.3
===================================================================
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message with embedded
<![CDATA[<hello>hi</hello>]]>]]><![CDATA[.]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="testCDATA" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
1.1 logging-log4j/tests/witness/xml/customLevel.3
Index: customLevel.3
===================================================================
TRACE xml.CustomLevelTestCase - Message 5
1.1 logging-log4j/tests/witness/xml/customLevel.4
Index: customLevel.4
===================================================================
DEBUG xml.CustomLevelTestCase - Message 1
INFO xml.CustomLevelTestCase - Message 2
WARN xml.CustomLevelTestCase - Message 3
ERROR xml.CustomLevelTestCase - Message 4
TRACE xml.CustomLevelTestCase - Message 5
1.1 logging-log4j/tests/witness/xml/xmlLayout.2
Index: xmlLayout.2
===================================================================
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase$X"
timestamp="XXX" sequenceNumber="XXX" level="INFO" thread="main">
<log4j:message><![CDATA[in X() constructor]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase$X"
method="<init>" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="DEBUG"
thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="INFO" thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="INFO"
thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="WARN" thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="WARN"
thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="ERROR"
thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="FATAL" thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="FATAL"
thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 5]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(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)
]]></log4j:throwable>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="DEBUG"
thread="main">
<log4j:message><![CDATA[Message 5]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(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)
]]></log4j:throwable>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(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)
]]></log4j:throwable>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="ERROR"
thread="main">
<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(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)
]]></log4j:throwable>
<log4j:locationInfo class="org.apache.log4j.xml.XMLLayoutTestCase"
method="common" file="XMLLayoutTestCase.java" line="X"/>
</log4j:event>
1.1 logging-log4j/tests/witness/xml/xmlLayout.null
Index: xmlLayout.null
===================================================================
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[hi]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[hi]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception
at org.apache.log4j.xml.XMLLayoutTestCase.testNull(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)
]]></log4j:throwable>
</log4j:event>
1.1 logging-log4j/tests/witness/xml/dom.A2.1
Index: dom.A2.1
===================================================================
[main] DEBUG org.apache.log4j.xml.DOMTestCase - Message 0
[main] DEBUG root - Message 0
[main] INFO org.apache.log4j.xml.DOMTestCase - Message 1
[main] INFO root - Message 1
[main] WARN org.apache.log4j.xml.DOMTestCase - Message 2
[main] WARN root - Message 2
[main] ERROR org.apache.log4j.xml.DOMTestCase - Message 3
[main] ERROR root - Message 3
[main] FATAL org.apache.log4j.xml.DOMTestCase - Message 4
[main] FATAL root - Message 4
[main] DEBUG org.apache.log4j.xml.DOMTestCase - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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/customLevel.2
Index: customLevel.2
===================================================================
DEBUG xml.CustomLevelTestCase - Message 1
INFO xml.CustomLevelTestCase - Message 2
WARN xml.CustomLevelTestCase - Message 3
ERROR xml.CustomLevelTestCase - Message 4
TRACE xml.CustomLevelTestCase - Message 5
1.1 logging-log4j/tests/witness/xml/xmlLayout.1
Index: xmlLayout.1
===================================================================
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase$X"
timestamp="XXX" sequenceNumber="XXX" level="INFO" thread="main">
<log4j:message><![CDATA[in X() constructor]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="DEBUG"
thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="INFO" thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="INFO"
thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="WARN" thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="WARN"
thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="ERROR"
thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="FATAL" thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="FATAL"
thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 5]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(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)
]]></log4j:throwable>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="DEBUG"
thread="main">
<log4j:message><![CDATA[Message 5]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(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)
]]></log4j:throwable>
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(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)
]]></log4j:throwable>
</log4j:event>
<log4j:event logger="root" timestamp="XXX" sequenceNumber="XXX" level="ERROR"
thread="main">
<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(X)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(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)
]]></log4j:throwable>
</log4j:event>
1.1 logging-log4j/tests/witness/xml/customLogger.2
Index: customLogger.2
===================================================================
TRACE customLogger.XLoggerTestCase - Message 0
1.1 logging-log4j/tests/witness/xml/xmlLayout.mdc.2
Index: xmlLayout.mdc.2
===================================================================
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
level="DEBUG" thread="main">
<log4j:message><![CDATA[Hello]]></log4j:message>
<log4j:properties>
<log4j:data name="<![CDATA[<blahKey value="blah"/>]]>"
value="<![CDATA[blahValue]]>"/>
<log4j:data name="<![CDATA[blahAttribute]]>" value="<![CDATA[<blah
value="blah">]]>"/>
</log4j:properties>
</log4j:event>
1.1 logging-log4j/tests/witness/xml/customLogger.1
Index: customLogger.1
===================================================================
TRACE customLogger.XLoggerTestCase - Message 0
DEBUG customLogger.XLoggerTestCase - Message 1
WARN customLogger.XLoggerTestCase - Message 2
ERROR customLogger.XLoggerTestCase - Message 3
FATAL customLogger.XLoggerTestCase - Message 4
DEBUG customLogger.XLoggerTestCase - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.customLogger.XLoggerTestCase.common(X)
at org.apache.log4j.customLogger.XLoggerTestCase.test1(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/xmlLayout.mdc.1
Index: xmlLayout.mdc.1
===================================================================
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
sequenceNumber="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Hello]]></log4j:message>
<log4j:properties>
<log4j:data name="key1" value="val1"/>
<log4j:data name="key2" value="val2"/>
</log4j:properties>
</log4j:event>
1.1 logging-log4j/tests/witness/xml/dom.A1.1
Index: dom.A1.1
===================================================================
DEBUG xml.DOMTestCase - Message 0
DEBUG xml.DOMTestCase - Message 0
DEBUG root - Message 0
INFO xml.DOMTestCase - Message 1
INFO xml.DOMTestCase - Message 1
INFO root - Message 1
WARN xml.DOMTestCase - Message 2
WARN xml.DOMTestCase - Message 2
WARN root - Message 2
ERROR xml.DOMTestCase - Message 3
ERROR xml.DOMTestCase - Message 3
ERROR root - Message 3
FATAL xml.DOMTestCase - Message 4
FATAL xml.DOMTestCase - Message 4
FATAL root - Message 4
DEBUG xml.DOMTestCase - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase - Message 5
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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.DOMTestCase.common(X)
at org.apache.log4j.xml.DOMTestCase.test1(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/customLevel.1
Index: customLevel.1
===================================================================
DEBUG xml.CustomLevelTestCase - Message 1
INFO xml.CustomLevelTestCase - Message 2
WARN xml.CustomLevelTestCase - Message 3
ERROR xml.CustomLevelTestCase - Message 4
TRACE xml.CustomLevelTestCase - Message 5
1.12 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
Index: DOMTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/DOMTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMTestCase.java 19 Nov 2004 15:20:06 -0000 1.11
+++ DOMTestCase.java 20 Nov 2004 19:06:58 -0000 1.12
@@ -79,8 +79,8 @@
new LineNumberFilter(), new
ISO8601Filter(),
new SunReflectFilter(), new
JunitTestRunnerFilter()});
- assertTrue(Compare.compare(FILTERED_A1, "witness/dom.A1.1"));
- assertTrue(Compare.compare(FILTERED_A2, "witness/dom.A2.1"));
+ assertTrue(Compare.compare(FILTERED_A1, "witness/xml/dom.A1.1"));
+ assertTrue(Compare.compare(FILTERED_A2, "witness/xml/dom.A2.1"));
}
void common() {
1.10 +4 -4
logging-log4j/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java
Index: CustomLevelTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/CustomLevelTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CustomLevelTestCase.java 18 Nov 2004 22:36:36 -0000 1.9
+++ CustomLevelTestCase.java 20 Nov 2004 19:06:58 -0000 1.10
@@ -55,7 +55,7 @@
jc.dumpErrors();
common();
- assertTrue(Compare.compare(TEMP, "witness/customLevel.1"));
+ assertTrue(Compare.compare(TEMP, "witness/xml/customLevel.1"));
}
public void test2() throws Exception {
@@ -65,7 +65,7 @@
jc.dumpErrors();
common();
- assertTrue(Compare.compare(TEMP, "witness/customLevel.2"));
+ assertTrue(Compare.compare(TEMP, "witness/xml/customLevel.2"));
}
public void test3() throws Exception {
@@ -75,7 +75,7 @@
jc.dumpErrors();
common();
- assertTrue(Compare.compare(TEMP, "witness/customLevel.3"));
+ assertTrue(Compare.compare(TEMP, "witness/xml/customLevel.3"));
}
public void test4() throws Exception {
@@ -85,7 +85,7 @@
jc.dumpErrors();
common();
- assertTrue(Compare.compare(TEMP, "witness/customLevel.4"));
+ assertTrue(Compare.compare(TEMP, "witness/xml/customLevel.4"));
}
void common() {
1.13 +6 -6
logging-log4j/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Index: XMLLayoutTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLLayoutTestCase.java 21 May 2004 15:05:45 -0000 1.12
+++ XMLLayoutTestCase.java 20 Nov 2004 19:06:58 -0000 1.13
@@ -68,7 +68,7 @@
new XMLSequenceNumberFilter(),
new SunReflectFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.1"));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/xmlLayout.1"));
}
public void locationInfo() throws Exception {
@@ -85,7 +85,7 @@
new XMLSequenceNumberFilter(),
new XMLLineAttributeFilter(), new SunReflectFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.2"));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/xmlLayout.2"));
}
public void testCDATA() throws Exception {
@@ -104,7 +104,7 @@
new XMLSequenceNumberFilter(),
new XMLLineAttributeFilter(), new SunReflectFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.3"));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/xmlLayout.3"));
}
public void testNull() throws Exception {
@@ -122,7 +122,7 @@
new SunReflectFilter(),
new XMLTimestampFilter(),
new XMLSequenceNumberFilter() });
- assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.null"));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/xmlLayout.null"));
}
/**
@@ -145,7 +145,7 @@
new JunitTestRunnerFilter(),
new XMLTimestampFilter(),
new XMLSequenceNumberFilter()});
- assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.mdc.1"));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/xmlLayout.mdc.1"));
}
public void holdTestMDCEscaped() throws Exception {
@@ -163,7 +163,7 @@
new JunitTestRunnerFilter(),
new XMLTimestampFilter(),
new XMLSequenceNumberFilter() });
- assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.mdc.2"));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/xmlLayout.mdc.2"));
}
void common() {
1.8 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/customLogger/XLoggerTestCase.java
Index: XLoggerTestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/customLogger/XLoggerTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XLoggerTestCase.java 17 Nov 2004 21:25:25 -0000 1.7
+++ XLoggerTestCase.java 20 Nov 2004 19:06:58 -0000 1.8
@@ -72,7 +72,7 @@
new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/customLogger." + number));
+ assertTrue(Compare.compare(FILTERED, "witness/xml/customLogger." +
number));
}
public static Test suite() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
