You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by mw...@apache.org on 2005/10/20 07:26:01 UTC
svn commit: r326828 - in /logging/log4j/branches/v1_2-branch/tests: input/
input/xml/ src/java/org/apache/log4j/ src/java/org/apache/log4j/net/
src/java/org/apache/log4j/varia/ src/java/org/apache/log4j/xml/ witness/
Author: mwomack
Date: Wed Oct 19 22:25:38 2005
New Revision: 326828
URL: http://svn.apache.org/viewcvs?rev=326828&view=rev
Log:
Expanded coverage for TRACE level in various test cases
Modified:
logging/log4j/branches/v1_2-branch/tests/input/socketServer1.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer2.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer3.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer4.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer5.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer6.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer7.properties
logging/log4j/branches/v1_2-branch/tests/input/socketServer8.properties
logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTest4.xml
logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTestCase1.xml
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/varia/LevelMatchFilterTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_accept
logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_deny
logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.1
logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.4
logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.1
logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.4
logging/log4j/branches/v1_2-branch/tests/witness/simple
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.1
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.2
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.3
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.4
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.5
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.6
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.7
logging/log4j/branches/v1_2-branch/tests/witness/socketServer.8
logging/log4j/branches/v1_2-branch/tests/witness/ttcc
logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.1
logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.2
logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.3
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer1.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer1.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer1.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer1.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer2.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer2.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer2.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer2.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer3.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer3.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer3.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer3.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer4.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer4.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer4.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer4.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer5.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer5.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer5.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer5.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer6.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer6.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer6.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer6.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer7.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer7.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer7.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer7.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/socketServer8.properties
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/socketServer8.properties?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/socketServer8.properties (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/socketServer8.properties Wed Oct 19 22:25:38 2005
@@ -1,4 +1,4 @@
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTest4.xml
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTest4.xml?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTest4.xml (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTest4.xml Wed Oct 19 22:25:38 2005
@@ -16,12 +16,12 @@
<logger name="org.apache.log4j.xml.DOMConfigurator"><level value="INFO" /></logger>
<logger name="org.apache.log4j.xml">
- <level value="debug" />
+ <level value="trace" />
<appender-ref ref="A1" />
</logger>
<root>
- <priority value ="debug" />
+ <priority value ="trace" />
<appender-ref ref="A1" />
<appender-ref ref="A2" />
</root>
Modified: logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTestCase1.xml
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTestCase1.xml?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTestCase1.xml (original)
+++ logging/log4j/branches/v1_2-branch/tests/input/xml/DOMTestCase1.xml Wed Oct 19 22:25:38 2005
@@ -21,12 +21,12 @@
</appender>
<logger name="org.apache.log4j.xml">
- <level value="debug" />
+ <level value="trace" />
<appender-ref ref="A1" />
</logger>
<root>
- <priority value ="debug" />
+ <priority value ="trace" />
<appender-ref ref="A1" />
<appender-ref ref="A2" />
</root>
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java Wed Oct 19 22:25:38 2005
@@ -39,10 +39,10 @@
//18 fevr. 2002 20:02:41,551 [main] FATAL ERR - Message 0
static String TTCC_PAT = Filter.ABSOLUTE_DATE_AND_TIME_PAT+
- " \\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message \\d{1,2}";
+ " \\[main]\\ (TRACE|DEBUG|INFO|WARN|ERROR|FATAL) .* - Message \\d{1,2}";
static String TTCC2_PAT = Filter.ABSOLUTE_DATE_AND_TIME_PAT+
- " \\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Messages should bear numbers 0 through 23\\.";
+ " \\[main]\\ (TRACE|DEBUG|INFO|WARN|ERROR|FATAL) .* - Messages should bear numbers 0 through 29\\.";
//18 fvr. 2002 19:49:53,456
@@ -115,6 +115,8 @@
INF_ERR.setLevel(Level.ERROR);
Logger DEB = Logger.getLogger("DEB");
DEB.setLevel(Level.DEBUG);
+ Logger TRC = Logger.getLogger("TRC");
+ TRC.setLevel(Level.TRACE);
// Note: categories with undefined level
Logger INF_UNDEF = Logger.getLogger("INF.UNDEF");
@@ -136,26 +138,33 @@
INF_UNDEF.warn ( "Message " + i); i++;
INF_UNDEF.info ( "Message " + i); i++;
-
INF_ERR.log(Level.FATAL, "Message " + i); i++; // 10
INF_ERR.error( "Message " + i); i++;
- INF_ERR_UNDEF.log(Level.FATAL, "Message " + i); i++;
+ INF_ERR_UNDEF.log(Level.FATAL, "Message " + i); i++;
INF_ERR_UNDEF.error( "Message " + i); i++;
DEB.log(Level.FATAL, "Message " + i); i++; //14
DEB.error( "Message " + i); i++;
DEB.warn ( "Message " + i); i++;
DEB.info ( "Message " + i); i++;
- DEB.debug( "Message " + i); i++;
+ DEB.debug( "Message " + i); i++;
+ TRC.log(Level.FATAL, "Message " + i); i++; //14
+ TRC.error( "Message " + i); i++;
+ TRC.warn ( "Message " + i); i++;
+ TRC.info ( "Message " + i); i++;
+ TRC.debug( "Message " + i); i++;
+ TRC.trace( "Message " + i); i++;
// defaultLevel=DEBUG
UNDEF.log(Level.FATAL, "Message " + i); i++; // 19
UNDEF.error("Message " + i); i++;
UNDEF.warn ("Message " + i); i++;
UNDEF.info ("Message " + i); i++;
- UNDEF.debug("Message " + i, new Exception("Just testing.")); i++;
+ UNDEF.debug("Message " + i, new Exception("Just testing."));
+ int printCount = i;
+ i++;
// -------------------------------------------------
// The following should not log
@@ -173,9 +182,11 @@
INF_ERR_UNDEF.warn("Message " + i); i++;
INF_ERR_UNDEF.info("Message " + i); i++;
INF_ERR_UNDEF.debug("Message " + i); i++;
+
+ UNDEF.trace("Message " + i, new Exception("Just testing.")); i++;
// -------------------------------------------------
- INF.info("Messages should bear numbers 0 through 23.");
+ INF.info("Messages should bear numbers 0 through "+printCount+".");
}
public static Test suite() {
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java Wed Oct 19 22:25:38 2005
@@ -45,36 +45,36 @@
// %5p %x [%t] %c %m%n
// DEBUG T1 [main] org.apache.log4j.net.SocketAppenderTestCase Message 1
- static String PAT1 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) T1 \\[main]\\ "
+ static String PAT1 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) T1 \\[main]\\ "
+ ".* Message \\d{1,2}";
// DEBUG T2 [main] ? (?:?) Message 1
- static String PAT2 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) T2 \\[main]\\ "
+ static String PAT2 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) T2 \\[main]\\ "
+ "\\? \\(\\?:\\?\\) Message \\d{1,2}";
// DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:121) Message 1
- static String PAT3 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) T3 \\[main]\\ "
+ static String PAT3 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) T3 \\[main]\\ "
+ "org.apache.log4j.net.SocketServerTestCase "
+ "\\(SocketServerTestCase.java:\\d{3}\\) Message \\d{1,2}";
// DEBUG some T4 MDC-TEST4 [main] SocketAppenderTestCase - Message 1
// DEBUG some T4 MDC-TEST4 [main] SocketAppenderTestCase - Message 1
- static String PAT4 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some T4 MDC-TEST4 \\[main]\\"
+ static String PAT4 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some T4 MDC-TEST4 \\[main]\\"
+ " (root|SocketServerTestCase) - Message \\d{1,2}";
- static String PAT5 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some5 T5 MDC-TEST5 \\[main]\\"
+ static String PAT5 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some5 T5 MDC-TEST5 \\[main]\\"
+ " (root|SocketServerTestCase) - Message \\d{1,2}";
- static String PAT6 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some6 T6 client-test6 MDC-TEST6"
+ static String PAT6 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some6 T6 client-test6 MDC-TEST6"
+ " \\[main]\\ (root|SocketServerTestCase) - Message \\d{1,2}";
- static String PAT7 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some7 T7 client-test7 MDC-TEST7"
+ static String PAT7 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some7 T7 client-test7 MDC-TEST7"
+ " \\[main]\\ (root|SocketServerTestCase) - Message \\d{1,2}";
// DEBUG some8 T8 shortSocketServer MDC-TEST7 [main] SocketServerTestCase - Message 1
- static String PAT8 = "^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some8 T8 shortSocketServer"
+ static String PAT8 = "^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some8 T8 shortSocketServer"
+ " MDC-TEST8 \\[main]\\ (root|SocketServerTestCase) - Message \\d{1,2}";
@@ -353,7 +353,16 @@
MDC.put(key, o);
Logger root = Logger.getRootLogger();
+ logger.setLevel(Level.DEBUG);
+ rootLogger.setLevel(Level.DEBUG);
+
logger.log(XLevel.TRACE, "Message " + ++i);
+
+ logger.setLevel(Level.TRACE);
+ rootLogger.setLevel(Level.TRACE);
+
+ logger.trace("Message " + ++i);
+ root.trace("Message " + ++i);
logger.debug("Message " + ++i);
root.debug("Message " + ++i);
logger.info("Message " + ++i);
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/varia/LevelMatchFilterTestCase.java
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/varia/LevelMatchFilterTestCase.java?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/varia/LevelMatchFilterTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/varia/LevelMatchFilterTestCase.java Wed Oct 19 22:25:38 2005
@@ -80,9 +80,9 @@
// set appender on root and set level to debug
root.addAppender(appender);
- root.setLevel(Level.DEBUG);
+ root.setLevel(Level.TRACE);
- Level[] levelArray = new Level[] {Level.DEBUG, Level.INFO, Level.WARN,
+ Level[] levelArray = new Level[] {Level.TRACE, Level.DEBUG, Level.INFO, Level.WARN,
Level.ERROR, Level.FATAL};
for (int x = 0; x < levelArray.length; x++) {
// set the level to match
@@ -110,9 +110,9 @@
// set appender on root and set level to debug
root.addAppender(appender);
- root.setLevel(Level.DEBUG);
+ root.setLevel(Level.TRACE);
- Level[] levelArray = new Level[] {Level.DEBUG, Level.INFO, Level.WARN,
+ Level[] levelArray = new Level[] {Level.TRACE, Level.DEBUG, Level.INFO, Level.WARN,
Level.ERROR, Level.FATAL};
for (int x = 0; x < levelArray.length; x++) {
// set the level to match
@@ -128,6 +128,7 @@
void common(String msg) {
Logger logger = Logger.getLogger("test");
+ logger.trace(msg);
logger.debug(msg);
logger.info(msg);
logger.warn(msg);
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java Wed Oct 19 22:25:38 2005
@@ -45,12 +45,12 @@
static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
static String TEST1_1A_PAT =
- "(DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* - Message \\d";
+ "(TRACE|DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* - Message \\d";
- static String TEST1_1B_PAT = "(DEBUG|INFO |WARN |ERROR|FATAL) root - Message \\d";
+ static String TEST1_1B_PAT = "(TRACE|DEBUG|INFO |WARN |ERROR|FATAL) root - Message \\d";
static String TEST1_2_PAT = "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3} "+
- "\\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message \\d";
+ "\\[main]\\ (TRACE|DEBUG|INFO|WARN|ERROR|FATAL) .* - Message \\d";
@@ -131,6 +131,9 @@
void common() {
int i = -1;
+
+ logger.trace("Message " + ++i);
+ root.trace("Message " + i);
logger.debug("Message " + ++i);
root.debug("Message " + i);
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java Wed Oct 19 22:25:38 2005
@@ -48,7 +48,9 @@
public void setUp() {
root = Logger.getRootLogger();
+ root.setLevel(Level.TRACE);
logger = Logger.getLogger(XMLLayoutTestCase.class);
+ logger.setLevel(Level.TRACE);
}
public void tearDown() {
@@ -92,6 +94,7 @@
xmlLayout.setLocationInfo(true);
root.addAppender(new FileAppender(xmlLayout, TEMP, false));
+ logger.trace("Message with embedded <![CDATA[<hello>hi</hello>]]>.");
logger.debug("Message with embedded <![CDATA[<hello>hi</hello>]]>.");
Transformer.transform(
@@ -131,10 +134,13 @@
X x = new X();
+ logger.trace("Message " + ++i);
+ root.trace("Message " + i);
+
logger.debug("Message " + ++i);
root.debug("Message " + i);
- logger.info ("Message " + ++i);
+ logger.info("Message " + ++i);
root.info("Message " + i);
logger.warn ("Message " + ++i);
Modified: logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_accept
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_accept?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_accept (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_accept Wed Oct 19 22:25:38 2005
@@ -1,5 +1,6 @@
-DEBUG - pass 0; filter set to accept only DEBUG msgs
-INFO - pass 1; filter set to accept only INFO msgs
-WARN - pass 2; filter set to accept only WARN msgs
-ERROR - pass 3; filter set to accept only ERROR msgs
-FATAL - pass 4; filter set to accept only FATAL msgs
+TRACE - pass 0; filter set to accept only TRACE msgs
+DEBUG - pass 1; filter set to accept only DEBUG msgs
+INFO - pass 2; filter set to accept only INFO msgs
+WARN - pass 3; filter set to accept only WARN msgs
+ERROR - pass 4; filter set to accept only ERROR msgs
+FATAL - pass 5; filter set to accept only FATAL msgs
Modified: logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_deny
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_deny?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_deny (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/LevelMatchFilter_deny Wed Oct 19 22:25:38 2005
@@ -1,20 +1,30 @@
-INFO - pass 0; filter set to deny only DEBUG msgs
-WARN - pass 0; filter set to deny only DEBUG msgs
-ERROR - pass 0; filter set to deny only DEBUG msgs
-FATAL - pass 0; filter set to deny only DEBUG msgs
-DEBUG - pass 1; filter set to deny only INFO msgs
-WARN - pass 1; filter set to deny only INFO msgs
-ERROR - pass 1; filter set to deny only INFO msgs
-FATAL - pass 1; filter set to deny only INFO msgs
-DEBUG - pass 2; filter set to deny only WARN msgs
-INFO - pass 2; filter set to deny only WARN msgs
-ERROR - pass 2; filter set to deny only WARN msgs
-FATAL - pass 2; filter set to deny only WARN msgs
-DEBUG - pass 3; filter set to deny only ERROR msgs
-INFO - pass 3; filter set to deny only ERROR msgs
-WARN - pass 3; filter set to deny only ERROR msgs
-FATAL - pass 3; filter set to deny only ERROR msgs
-DEBUG - pass 4; filter set to deny only FATAL msgs
-INFO - pass 4; filter set to deny only FATAL msgs
-WARN - pass 4; filter set to deny only FATAL msgs
-ERROR - pass 4; filter set to deny only FATAL msgs
+DEBUG - pass 0; filter set to deny only TRACE msgs
+INFO - pass 0; filter set to deny only TRACE msgs
+WARN - pass 0; filter set to deny only TRACE msgs
+ERROR - pass 0; filter set to deny only TRACE msgs
+FATAL - pass 0; filter set to deny only TRACE msgs
+TRACE - pass 1; filter set to deny only DEBUG msgs
+INFO - pass 1; filter set to deny only DEBUG msgs
+WARN - pass 1; filter set to deny only DEBUG msgs
+ERROR - pass 1; filter set to deny only DEBUG msgs
+FATAL - pass 1; filter set to deny only DEBUG msgs
+TRACE - pass 2; filter set to deny only INFO msgs
+DEBUG - pass 2; filter set to deny only INFO msgs
+WARN - pass 2; filter set to deny only INFO msgs
+ERROR - pass 2; filter set to deny only INFO msgs
+FATAL - pass 2; filter set to deny only INFO msgs
+TRACE - pass 3; filter set to deny only WARN msgs
+DEBUG - pass 3; filter set to deny only WARN msgs
+INFO - pass 3; filter set to deny only WARN msgs
+ERROR - pass 3; filter set to deny only WARN msgs
+FATAL - pass 3; filter set to deny only WARN msgs
+TRACE - pass 4; filter set to deny only ERROR msgs
+DEBUG - pass 4; filter set to deny only ERROR msgs
+INFO - pass 4; filter set to deny only ERROR msgs
+WARN - pass 4; filter set to deny only ERROR msgs
+FATAL - pass 4; filter set to deny only ERROR msgs
+TRACE - pass 5; filter set to deny only FATAL msgs
+DEBUG - pass 5; filter set to deny only FATAL msgs
+INFO - pass 5; filter set to deny only FATAL msgs
+WARN - pass 5; filter set to deny only FATAL msgs
+ERROR - pass 5; filter set to deny only FATAL msgs
Modified: logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.1
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.1?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.1 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.1 Wed Oct 19 22:25:38 2005
@@ -1,19 +1,22 @@
-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
+TRACE xml.DOMTestCase - Message 0
+TRACE xml.DOMTestCase - Message 0
+TRACE root - Message 0
+DEBUG xml.DOMTestCase - Message 1
+DEBUG xml.DOMTestCase - Message 1
+DEBUG root - Message 1
+INFO xml.DOMTestCase - Message 2
+INFO xml.DOMTestCase - Message 2
+INFO root - Message 2
+WARN xml.DOMTestCase - Message 3
+WARN xml.DOMTestCase - Message 3
+WARN root - Message 3
+ERROR xml.DOMTestCase - Message 4
+ERROR xml.DOMTestCase - Message 4
+ERROR root - Message 4
+FATAL xml.DOMTestCase - Message 5
+FATAL xml.DOMTestCase - Message 5
+FATAL root - Message 5
+DEBUG xml.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -25,7 +28,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-DEBUG xml.DOMTestCase - Message 5
+DEBUG xml.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -37,7 +40,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-DEBUG root - Message 5
+DEBUG root - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -49,7 +52,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR xml.DOMTestCase - Message 6
+ERROR xml.DOMTestCase - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -61,7 +64,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR xml.DOMTestCase - Message 6
+ERROR xml.DOMTestCase - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -73,7 +76,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR root - Message 6
+ERROR root - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.4
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.4?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.4 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/dom.A1.4 Wed Oct 19 22:25:38 2005
@@ -1,19 +1,22 @@
-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
+TRACE xml.DOMTestCase - Message 0
+TRACE xml.DOMTestCase - Message 0
+TRACE root - Message 0
+DEBUG xml.DOMTestCase - Message 1
+DEBUG xml.DOMTestCase - Message 1
+DEBUG root - Message 1
+INFO xml.DOMTestCase - Message 2
+INFO xml.DOMTestCase - Message 2
+INFO root - Message 2
+WARN xml.DOMTestCase - Message 3
+WARN xml.DOMTestCase - Message 3
+WARN root - Message 3
+ERROR xml.DOMTestCase - Message 4
+ERROR xml.DOMTestCase - Message 4
+ERROR root - Message 4
+FATAL xml.DOMTestCase - Message 5
+FATAL xml.DOMTestCase - Message 5
+FATAL root - Message 5
+DEBUG xml.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -25,7 +28,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-DEBUG xml.DOMTestCase - Message 5
+DEBUG xml.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -37,7 +40,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-DEBUG root - Message 5
+DEBUG root - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -49,7 +52,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR xml.DOMTestCase - Message 6
+ERROR xml.DOMTestCase - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -61,7 +64,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR xml.DOMTestCase - Message 6
+ERROR xml.DOMTestCase - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -73,7 +76,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR root - Message 6
+ERROR root - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.1
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.1?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.1 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.1 Wed Oct 19 22:25:38 2005
@@ -1,14 +1,16 @@
- [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
+ [main] TRACE org.apache.log4j.xml.DOMTestCase - Message 0
+ [main] TRACE root - Message 0
+ [main] DEBUG org.apache.log4j.xml.DOMTestCase - Message 1
+ [main] DEBUG root - Message 1
+ [main] INFO org.apache.log4j.xml.DOMTestCase - Message 2
+ [main] INFO root - Message 2
+ [main] WARN org.apache.log4j.xml.DOMTestCase - Message 3
+ [main] WARN root - Message 3
+ [main] ERROR org.apache.log4j.xml.DOMTestCase - Message 4
+ [main] ERROR root - Message 4
+ [main] FATAL org.apache.log4j.xml.DOMTestCase - Message 5
+ [main] FATAL root - Message 5
+ [main] DEBUG org.apache.log4j.xml.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -20,7 +22,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] DEBUG root - Message 5
+ [main] DEBUG root - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -32,7 +34,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] ERROR org.apache.log4j.xml.DOMTestCase - Message 6
+ [main] ERROR org.apache.log4j.xml.DOMTestCase - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
@@ -44,7 +46,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] ERROR root - Message 6
+ [main] ERROR root - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test1(DOMTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.4
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.4?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.4 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/dom.A2.4 Wed Oct 19 22:25:38 2005
@@ -1,14 +1,16 @@
- [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
+ [main] TRACE org.apache.log4j.xml.DOMTestCase - Message 0
+ [main] TRACE root - Message 0
+ [main] DEBUG org.apache.log4j.xml.DOMTestCase - Message 1
+ [main] DEBUG root - Message 1
+ [main] INFO org.apache.log4j.xml.DOMTestCase - Message 2
+ [main] INFO root - Message 2
+ [main] WARN org.apache.log4j.xml.DOMTestCase - Message 3
+ [main] WARN root - Message 3
+ [main] ERROR org.apache.log4j.xml.DOMTestCase - Message 4
+ [main] ERROR root - Message 4
+ [main] FATAL org.apache.log4j.xml.DOMTestCase - Message 5
+ [main] FATAL root - Message 5
+ [main] DEBUG org.apache.log4j.xml.DOMTestCase - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -20,7 +22,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] DEBUG root - Message 5
+ [main] DEBUG root - Message 6
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -32,7 +34,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] ERROR org.apache.log4j.xml.DOMTestCase - Message 6
+ [main] ERROR org.apache.log4j.xml.DOMTestCase - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
@@ -44,7 +46,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] ERROR root - Message 6
+ [main] ERROR root - Message 7
java.lang.Exception: Just testing
at org.apache.log4j.xml.DOMTestCase.common(DOMTestCase.java:XXX)
at org.apache.log4j.xml.DOMTestCase.test4(DOMTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/simple
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/simple?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/simple (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/simple Wed Oct 19 22:25:38 2005
@@ -22,6 +22,12 @@
WARN - Message 21
INFO - Message 22
DEBUG - Message 23
+TRACE - Message 24
+FATAL - Message 25
+ERROR - Message 26
+WARN - Message 27
+INFO - Message 28
+DEBUG - Message 29
java.lang.Exception: Just testing.
at org.apache.log4j.MinimumTestCase.common(MinimumTestCase.java:XXX)
at org.apache.log4j.MinimumTestCase.simple(MinimumTestCase.java:XXX)
@@ -33,4 +39,4 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-INFO - Messages should bear numbers 0 through 23.
+INFO - Messages should bear numbers 0 through 29.
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.1
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.1?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.1 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.1 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 1
-DEBUG T1 [main] root Message 2
- INFO T1 [main] org.apache.log4j.net.SocketServerTestCase Message 3
- WARN T1 [main] org.apache.log4j.net.SocketServerTestCase Message 4
-LETHAL T1 [main] org.apache.log4j.net.SocketServerTestCase Message 5
-DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 6
+TRACE T1 [main] org.apache.log4j.net.SocketServerTestCase Message 1
+TRACE T1 [main] root Message 2
+DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 3
+DEBUG T1 [main] root Message 4
+ INFO T1 [main] org.apache.log4j.net.SocketServerTestCase Message 5
+ WARN T1 [main] org.apache.log4j.net.SocketServerTestCase Message 6
+LETHAL T1 [main] org.apache.log4j.net.SocketServerTestCase Message 7
+DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test1(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR T1 [main] root Message 7
+ERROR T1 [main] root Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test1(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.2
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.2?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.2 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.2 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG T2 [main] ? (?:?) Message 1
-DEBUG T2 [main] ? (?:?) Message 2
- INFO T2 [main] ? (?:?) Message 3
- WARN T2 [main] ? (?:?) Message 4
-LETHAL T2 [main] ? (?:?) Message 5
-DEBUG T2 [main] ? (?:?) Message 6
+TRACE T2 [main] ? (?:?) Message 1
+TRACE T2 [main] ? (?:?) Message 2
+DEBUG T2 [main] ? (?:?) Message 3
+DEBUG T2 [main] ? (?:?) Message 4
+ INFO T2 [main] ? (?:?) Message 5
+ WARN T2 [main] ? (?:?) Message 6
+LETHAL T2 [main] ? (?:?) Message 7
+DEBUG T2 [main] ? (?:?) Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test2(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR T2 [main] ? (?:?) Message 7
+ERROR T2 [main] ? (?:?) Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test2(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.3
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.3?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.3 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.3 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 1
-DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 2
- INFO T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 3
- WARN T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 4
-LETHAL T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 5
-DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 6
+TRACE T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 1
+TRACE T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 2
+DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 3
+DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 4
+ INFO T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 5
+ WARN T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 6
+LETHAL T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 7
+DEBUG T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test3(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 7
+ERROR T3 [main] org.apache.log4j.net.SocketServerTestCase (SocketServerTestCase.java:XXX) Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test3(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.4
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.4?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.4 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.4 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 1
-DEBUG some T4 MDC-TEST4 [main] root - Message 2
- INFO some T4 MDC-TEST4 [main] SocketServerTestCase - Message 3
- WARN some T4 MDC-TEST4 [main] SocketServerTestCase - Message 4
-LETHAL some T4 MDC-TEST4 [main] SocketServerTestCase - Message 5
-DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 6
+TRACE some T4 MDC-TEST4 [main] SocketServerTestCase - Message 1
+TRACE some T4 MDC-TEST4 [main] root - Message 2
+DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 3
+DEBUG some T4 MDC-TEST4 [main] root - Message 4
+ INFO some T4 MDC-TEST4 [main] SocketServerTestCase - Message 5
+ WARN some T4 MDC-TEST4 [main] SocketServerTestCase - Message 6
+LETHAL some T4 MDC-TEST4 [main] SocketServerTestCase - Message 7
+DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test4(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR some T4 MDC-TEST4 [main] root - Message 7
+ERROR some T4 MDC-TEST4 [main] root - Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test4(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.5
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.5?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.5 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.5 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 1
-DEBUG some5 T5 MDC-TEST5 [main] root - Message 2
- INFO some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 3
- WARN some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 4
-LETHAL some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 5
-DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 6
+TRACE some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 1
+TRACE some5 T5 MDC-TEST5 [main] root - Message 2
+DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 3
+DEBUG some5 T5 MDC-TEST5 [main] root - Message 4
+ INFO some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 5
+ WARN some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 6
+LETHAL some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 7
+DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test5(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR some5 T5 MDC-TEST5 [main] root - Message 7
+ERROR some5 T5 MDC-TEST5 [main] root - Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test5(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.6
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.6?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.6 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.6 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 1
-DEBUG some6 T6 client-test6 MDC-TEST6 [main] root - Message 2
- INFO some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 3
- WARN some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 4
-LETHAL some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 5
-DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 6
+TRACE some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 1
+TRACE some6 T6 client-test6 MDC-TEST6 [main] root - Message 2
+DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 3
+DEBUG some6 T6 client-test6 MDC-TEST6 [main] root - Message 4
+ INFO some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 5
+ WARN some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 6
+LETHAL some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 7
+DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test6(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR some6 T6 client-test6 MDC-TEST6 [main] root - Message 7
+ERROR some6 T6 client-test6 MDC-TEST6 [main] root - Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test6(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.7
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.7?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.7 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.7 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 1
-DEBUG some7 T7 client-test7 MDC-TEST7 [main] root - Message 2
- INFO some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 3
- WARN some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 4
-LETHAL some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 5
-DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 6
+TRACE some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 1
+TRACE some7 T7 client-test7 MDC-TEST7 [main] root - Message 2
+DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 3
+DEBUG some7 T7 client-test7 MDC-TEST7 [main] root - Message 4
+ INFO some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 5
+ WARN some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 6
+LETHAL some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 7
+DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test7(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR some7 T7 client-test7 MDC-TEST7 [main] root - Message 7
+ERROR some7 T7 client-test7 MDC-TEST7 [main] root - Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test7(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/socketServer.8
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/socketServer.8?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/socketServer.8 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/socketServer.8 Wed Oct 19 22:25:38 2005
@@ -1,9 +1,11 @@
-DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 1
-DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 2
- INFO some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 3
- WARN some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 4
-LETHAL some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 5
-DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 6
+TRACE some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 1
+TRACE some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 2
+DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 3
+DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 4
+ INFO some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 5
+ WARN some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 6
+LETHAL some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 7
+DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 8
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test8(SocketServerTestCase.java:XXX)
@@ -15,7 +17,7 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
-ERROR some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 7
+ERROR some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 9
java.lang.Exception: Just testing
at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
at org.apache.log4j.net.SocketServerTestCase.test8(SocketServerTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/ttcc
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/ttcc?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/ttcc (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/ttcc Wed Oct 19 22:25:38 2005
@@ -17,11 +17,17 @@
[main] WARN DEB - Message 16
[main] INFO DEB - Message 17
[main] DEBUG DEB - Message 18
- [main] FATAL UNDEF - Message 19
- [main] ERROR UNDEF - Message 20
- [main] WARN UNDEF - Message 21
- [main] INFO UNDEF - Message 22
- [main] DEBUG UNDEF - Message 23
+ [main] FATAL TRC - Message 19
+ [main] ERROR TRC - Message 20
+ [main] WARN TRC - Message 21
+ [main] INFO TRC - Message 22
+ [main] DEBUG TRC - Message 23
+ [main] TRACE TRC - Message 24
+ [main] FATAL UNDEF - Message 25
+ [main] ERROR UNDEF - Message 26
+ [main] WARN UNDEF - Message 27
+ [main] INFO UNDEF - Message 28
+ [main] DEBUG UNDEF - Message 29
java.lang.Exception: Just testing.
at org.apache.log4j.MinimumTestCase.common(MinimumTestCase.java:XXX)
at org.apache.log4j.MinimumTestCase.ttcc(MinimumTestCase.java:XXX)
@@ -33,4 +39,4 @@
at junit.framework.TestCase.run(TestCase.java:XXX)
at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
at junit.framework.TestSuite.run(TestSuite.java:XXX)
- [main] INFO INF - Messages should bear numbers 0 through 23.
+ [main] INFO INF - Messages should bear numbers 0 through 29.
Modified: logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.1
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.1?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.1 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.1 Wed Oct 19 22:25:38 2005
@@ -2,48 +2,56 @@
<log4j:message><![CDATA[in X() constructor]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="DEBUG" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="TRACE" thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="DEBUG" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="TRACE" thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="INFO" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="INFO" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="WARN" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="INFO" thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="WARN" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="INFO" thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="ERROR" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="WARN" thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="ERROR" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="WARN" thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="FATAL" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="FATAL" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="DEBUG" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="FATAL" thread="main">
+<log4j:message><![CDATA[Message 5]]></log4j:message>
+</log4j:event>
+
+<log4j:event logger="root" timestamp="XXX" level="FATAL" thread="main">
<log4j:message><![CDATA[Message 5]]></log4j:message>
+</log4j:event>
+
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="DEBUG" thread="main">
+<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:XXX)
@@ -59,7 +67,7 @@
</log4j:event>
<log4j:event logger="root" timestamp="XXX" level="DEBUG" thread="main">
-<log4j:message><![CDATA[Message 5]]></log4j:message>
+<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:XXX)
@@ -75,7 +83,7 @@
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="ERROR" thread="main">
-<log4j:message><![CDATA[Message 6]]></log4j:message>
+<log4j:message><![CDATA[Message 7]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:XXX)
@@ -91,7 +99,7 @@
</log4j:event>
<log4j:event logger="root" timestamp="XXX" level="ERROR" thread="main">
-<log4j:message><![CDATA[Message 6]]></log4j:message>
+<log4j:message><![CDATA[Message 7]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.2
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.2?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.2 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.2 Wed Oct 19 22:25:38 2005
@@ -3,58 +3,68 @@
<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" level="DEBUG" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="TRACE" 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" level="DEBUG" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="TRACE" 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" level="INFO" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="DEBUG" 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" level="INFO" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="DEBUG" 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" level="WARN" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="INFO" 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" level="WARN" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="INFO" 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" level="ERROR" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="WARN" 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" level="ERROR" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="WARN" 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" level="FATAL" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="ERROR" 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" level="FATAL" thread="main">
+<log4j:event logger="root" timestamp="XXX" level="ERROR" 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" level="DEBUG" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="FATAL" thread="main">
<log4j:message><![CDATA[Message 5]]></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" level="FATAL" thread="main">
+<log4j:message><![CDATA[Message 5]]></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" level="DEBUG" thread="main">
+<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(XMLLayoutTestCase.java:XXX)
@@ -71,7 +81,7 @@
</log4j:event>
<log4j:event logger="root" timestamp="XXX" level="DEBUG" thread="main">
-<log4j:message><![CDATA[Message 5]]></log4j:message>
+<log4j:message><![CDATA[Message 6]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(XMLLayoutTestCase.java:XXX)
@@ -88,7 +98,7 @@
</log4j:event>
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="ERROR" thread="main">
-<log4j:message><![CDATA[Message 6]]></log4j:message>
+<log4j:message><![CDATA[Message 7]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(XMLLayoutTestCase.java:XXX)
@@ -105,7 +115,7 @@
</log4j:event>
<log4j:event logger="root" timestamp="XXX" level="ERROR" thread="main">
-<log4j:message><![CDATA[Message 6]]></log4j:message>
+<log4j:message><![CDATA[Message 7]]></log4j:message>
<log4j:throwable><![CDATA[java.lang.Exception: Just testing
at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:XXX)
at org.apache.log4j.xml.XMLLayoutTestCase.locationInfo(XMLLayoutTestCase.java:XXX)
Modified: logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.3
URL: http://svn.apache.org/viewcvs/logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.3?rev=326828&r1=326827&r2=326828&view=diff
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.3 (original)
+++ logging/log4j/branches/v1_2-branch/tests/witness/xmlLayout.3 Wed Oct 19 22:25:38 2005
@@ -1,3 +1,8 @@
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="TRACE" 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>
+
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org