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 2003/03/26 07:27:13 UTC
cvs commit: jakarta-log4j/tests/src/java/org/apache/log4j/xml XMLLayoutTestCase.java
mwomack 2003/03/25 22:27:13
Modified: tests/src/java/org/apache/log4j/xml XMLLayoutTestCase.java
Log:
Test cases for testing output of MDC data, bug #18246, changes submitted by Paul Smith.
Revision Changes Path
1.6 +39 -0 jakarta-log4j/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Index: XMLLayoutTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLLayoutTestCase.java 3 Mar 2003 15:24:03 -0000 1.5
+++ XMLLayoutTestCase.java 26 Mar 2003 06:27:13 -0000 1.6
@@ -17,6 +17,7 @@
import org.apache.log4j.util.SunReflectFilter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.Compare;
+import org.apache.log4j.MDC;
public class XMLLayoutTestCase extends TestCase {
@@ -87,6 +88,41 @@
assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.null"));
}
+ /**
+ * Tests the format of the MDC portion of the layout to ensure
+ * the KVP's we put in turn up in the output file.
+ * @throws Exception
+ */
+ public void testMDC() throws Exception {
+ XMLLayout xmlLayout = new XMLLayout();
+ root.addAppender(new FileAppender(xmlLayout, TEMP, false));
+
+ MDC.clear();
+ MDC.put("key1", "val1");
+ MDC.put("key2", "val2");
+
+ logger.debug("Hello");
+ Transformer.transform(TEMP, FILTERED, new Filter[] {new LineNumberFilter(),
+ new XMLTimestampFilter()});
+ assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.mdc.1"));
+
+ }
+
+ public void testMDCEscaped() throws Exception {
+ XMLLayout xmlLayout = new XMLLayout();
+ root.addAppender(new FileAppender(xmlLayout, TEMP, false));
+
+ MDC.clear();
+ MDC.put("blahAttribute", "<blah value=\"blah\">");
+ MDC.put("<blahKey value=\"blah\"/>", "blahValue");
+
+ logger.debug("Hello");
+ Transformer.transform(TEMP, FILTERED, new Filter[] {new LineNumberFilter(),
+ new XMLTimestampFilter()});
+ assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.mdc.2"));
+
+ }
+
void common() {
int i = -1;
@@ -121,6 +157,9 @@
suite.addTest(new XMLLayoutTestCase("locationInfo"));
suite.addTest(new XMLLayoutTestCase("testCDATA"));
suite.addTest(new XMLLayoutTestCase("testNull"));
+ suite.addTest(new XMLLayoutTestCase("testMDC"));
+ suite.addTest(new XMLLayoutTestCase("testMDCEscaped"));
+
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org