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 ca...@apache.org on 2007/08/15 19:21:18 UTC
svn commit: r566270 - in /logging/log4j/companions/receivers/trunk/src:
main/java/org/apache/log4j/xml/ test/java/org/apache/log4j/xml/
test/resources/org/apache/log4j/xml/
Author: carnold
Date: Wed Aug 15 10:21:17 2007
New Revision: 566270
URL: http://svn.apache.org/viewvc?view=rev&rev=566270
Log:
Bug 43131: Remove dummy: protocol from XMLDecoder
Added:
logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/xml/
logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java
- copied, changed from r566217, logging/log4j/branches/BRANCH_1_3_ABANDONED/tests/src/java/org/apache/log4j/xml/XMLDecoderTest.java
logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/
logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xmlLayout.1.xml
- copied, changed from r566217, logging/log4j/trunk/tests/witness/xmlLayout.1
logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1.xml (contents, props changed)
- copied, changed from r564393, logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/xml/XMLDecoder.java
Modified: logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/xml/XMLDecoder.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/xml/XMLDecoder.java?view=diff&rev=566270&r1=566269&r2=566270
==============================================================================
--- logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/xml/XMLDecoder.java (original)
+++ logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/xml/XMLDecoder.java Wed Aug 15 10:21:17 2007
@@ -67,7 +67,7 @@
*/
private static final String BEGINPART =
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
- + "<!DOCTYPE log4j:eventSet SYSTEM \"log4j.dtd\">"
+ + "<!DOCTYPE log4j:eventSet SYSTEM \"http://localhost/log4j.dtd\">"
+ "<log4j:eventSet version=\"1.2\" "
+ "xmlns:log4j=\"http://jakarta.apache.org/log4j/\">";
/**
@@ -164,7 +164,6 @@
InputSource inputSource =
new InputSource(new StringReader(buf.toString()));
- inputSource.setSystemId("dummy://log4j.dtd");
document = docBuilder.parse(inputSource);
} catch (Exception e) {
e.printStackTrace();
Copied: logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java (from r566217, logging/log4j/branches/BRANCH_1_3_ABANDONED/tests/src/java/org/apache/log4j/xml/XMLDecoderTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java?view=diff&rev=566270&p1=logging/log4j/branches/BRANCH_1_3_ABANDONED/tests/src/java/org/apache/log4j/xml/XMLDecoderTest.java&r1=566217&p2=logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java&r2=566270
==============================================================================
--- logging/log4j/branches/BRANCH_1_3_ABANDONED/tests/src/java/org/apache/log4j/xml/XMLDecoderTest.java (original)
+++ logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/xml/XMLDecoderTest.java Wed Aug 15 10:21:17 2007
@@ -1,40 +1,86 @@
/*
- * Created on 29/04/2003
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.log4j.xml;
-import java.io.File;
-import java.util.List;
-
import junit.framework.TestCase;
-import org.apache.log4j.xml.XMLDecoder;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.CharBuffer;
+import java.util.Vector;
+import java.net.URL;
/**
- * @author Paul Smith <ps...@apache.org>
+ * Tests for XMLDecoder.
*
*/
public class XMLDecoderTest extends TestCase {
+
/**
* Constructor for XMLDecoderTest.
- * @param arg0
+ * @param arg0 test name.
*/
public XMLDecoderTest(String arg0) {
super(arg0);
}
- /*
- * Test for Vector decode(File)
- */
- public void testDecodeFile() throws Exception {
- XMLDecoder xmlDecoder = new XMLDecoder();
- List events = xmlDecoder.decode(new File("tests/witness/eventSet.1.xml").toURL());
- assertTrue("Should have returned at least 418 events: " + events.size(), events.size()==418);
-
+ public String getStringFromResource(final String resourceName,
+ final int maxSize) throws Exception {
+ InputStream is = XMLDecoderTest.class.getResourceAsStream(resourceName);
+ if (is == null) {
+ throw new FileNotFoundException(resourceName);
+ }
+ InputStreamReader reader = new InputStreamReader(is, "UTF-8");
+ CharBuffer cb = CharBuffer.allocate(maxSize);
+ for(int chars = reader.read(cb);
+ chars != -1;
+ chars = reader.read(cb));
+ cb.flip();
+ return cb.toString();
}
-
+
+ public void testDecodeEventsString1() throws Exception {
+ String xmlStr = getStringFromResource("xmlLayout.1.xml", 10000);
+ XMLDecoder decoder = new XMLDecoder();
+ Vector events = decoder.decodeEvents(xmlStr);
+ assertEquals(17, events.size());
+ }
+
+ public void testDecodeEventsString2() throws Exception {
+ String xmlStr = getStringFromResource("xsltLayout.1.xml", 10000);
+ XMLDecoder decoder = new XMLDecoder();
+ Vector events = decoder.decodeEvents(xmlStr);
+ assertEquals(15, events.size());
+ }
+
+ public void testDecodeEventsURL1() throws Exception {
+ URL resource = XMLDecoderTest.class.getResource("xmlLayout.1.xml");
+ XMLDecoder decoder = new XMLDecoder();
+ Vector events = decoder.decode(resource);
+ assertEquals(17, events.size());
+ }
+
+ public void testDecodeEventsURL2() throws Exception {
+ URL resource = XMLDecoderTest.class.getResource("xsltLayout.1.xml");
+ XMLDecoder decoder = new XMLDecoder();
+ Vector events = decoder.decode(resource);
+ assertEquals(15, events.size());
+ }
+
}
Copied: logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xmlLayout.1.xml (from r566217, logging/log4j/trunk/tests/witness/xmlLayout.1)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xmlLayout.1.xml?view=diff&rev=566270&p1=logging/log4j/trunk/tests/witness/xmlLayout.1&r1=566217&p2=logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xmlLayout.1.xml&r2=566270
==============================================================================
--- logging/log4j/trunk/tests/witness/xmlLayout.1 (original)
+++ logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xmlLayout.1.xml Wed Aug 15 10:21:17 2007
@@ -1,116 +1,146 @@
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase$X" timestamp="XXX" level="INFO" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase$X" timestamp="1187196936354" level="INFO" thread="main">
<log4j:message><![CDATA[in X() constructor]]></log4j:message>
</log4j:event>
-<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX" level="TRACE" thread="main">
+<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="1187196936358" level="TRACE" thread="main">
<log4j:message><![CDATA[Message 0]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="TRACE" thread="main">
+<log4j:event logger="root" timestamp="1187196936358" level="TRACE" thread="main">
<log4j:message><![CDATA[Message 0]]></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="1187196936358" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 1]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="DEBUG" thread="main">
+<log4j:event logger="root" timestamp="1187196936363" level="DEBUG" thread="main">
<log4j:message><![CDATA[Message 1]]></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="1187196936363" level="INFO" thread="main">
<log4j:message><![CDATA[Message 2]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="INFO" thread="main">
+<log4j:event logger="root" timestamp="1187196936363" level="INFO" thread="main">
<log4j:message><![CDATA[Message 2]]></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="1187196936363" level="WARN" thread="main">
<log4j:message><![CDATA[Message 3]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="WARN" thread="main">
+<log4j:event logger="root" timestamp="1187196936363" level="WARN" thread="main">
<log4j:message><![CDATA[Message 3]]></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="1187196936363" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 4]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="ERROR" thread="main">
+<log4j:event logger="root" timestamp="1187196936363" level="ERROR" thread="main">
<log4j:message><![CDATA[Message 4]]></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="1187196936363" level="FATAL" thread="main">
<log4j:message><![CDATA[Message 5]]></log4j:message>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="FATAL" thread="main">
+<log4j:event logger="root" timestamp="1187196936363" 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:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="1187196936364" 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)
- at junit.framework.TestCase.runTest(TestCase.java:XXX)
- at junit.framework.TestCase.runBare(TestCase.java:XXX)
- at junit.framework.TestResult$1.protect(TestResult.java:XXX)
- at junit.framework.TestResult.runProtected(TestResult.java:XXX)
- at junit.framework.TestResult.run(TestResult.java:XXX)
- at junit.framework.TestCase.run(TestCase.java:XXX)
- at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
- at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:219)
+ at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:64)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:585)
+ at junit.framework.TestCase.runTest(TestCase.java:154)
+ at junit.framework.TestCase.runBare(TestCase.java:127)
+ at junit.framework.TestResult$1.protect(TestResult.java:106)
+ at junit.framework.TestResult.runProtected(TestResult.java:124)
+ at junit.framework.TestResult.run(TestResult.java:109)
+ at junit.framework.TestCase.run(TestCase.java:118)
+ at junit.framework.TestSuite.runTest(TestSuite.java:208)
+ at junit.framework.TestSuite.run(TestSuite.java:203)
+ at junit.textui.TestRunner.doRun(TestRunner.java:116)
+ at com.intellij.rt.execution.junit.IdeaTestRunner.doRun(IdeaTestRunner.java:69)
+ at junit.textui.TestRunner.doRun(TestRunner.java:109)
+ at com.intellij.rt.execution.junit.IdeaTestRunner.startRunnerWithArgs(IdeaTestRunner.java:24)
+ at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:118)
+ at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:40)
]]></log4j:throwable>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="DEBUG" thread="main">
+<log4j:event logger="root" timestamp="1187196936368" 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)
- at junit.framework.TestCase.runTest(TestCase.java:XXX)
- at junit.framework.TestCase.runBare(TestCase.java:XXX)
- at junit.framework.TestResult$1.protect(TestResult.java:XXX)
- at junit.framework.TestResult.runProtected(TestResult.java:XXX)
- at junit.framework.TestResult.run(TestResult.java:XXX)
- at junit.framework.TestCase.run(TestCase.java:XXX)
- at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
- at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:219)
+ at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:64)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:585)
+ at junit.framework.TestCase.runTest(TestCase.java:154)
+ at junit.framework.TestCase.runBare(TestCase.java:127)
+ at junit.framework.TestResult$1.protect(TestResult.java:106)
+ at junit.framework.TestResult.runProtected(TestResult.java:124)
+ at junit.framework.TestResult.run(TestResult.java:109)
+ at junit.framework.TestCase.run(TestCase.java:118)
+ at junit.framework.TestSuite.runTest(TestSuite.java:208)
+ at junit.framework.TestSuite.run(TestSuite.java:203)
+ at junit.textui.TestRunner.doRun(TestRunner.java:116)
+ at com.intellij.rt.execution.junit.IdeaTestRunner.doRun(IdeaTestRunner.java:69)
+ at junit.textui.TestRunner.doRun(TestRunner.java:109)
+ at com.intellij.rt.execution.junit.IdeaTestRunner.startRunnerWithArgs(IdeaTestRunner.java:24)
+ at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:118)
+ at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:40)
]]></log4j:throwable>
</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="1187196936369" level="ERROR" thread="main">
<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)
- at junit.framework.TestCase.runTest(TestCase.java:XXX)
- at junit.framework.TestCase.runBare(TestCase.java:XXX)
- at junit.framework.TestResult$1.protect(TestResult.java:XXX)
- at junit.framework.TestResult.runProtected(TestResult.java:XXX)
- at junit.framework.TestResult.run(TestResult.java:XXX)
- at junit.framework.TestCase.run(TestCase.java:XXX)
- at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
- at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:219)
+ at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:64)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:585)
+ at junit.framework.TestCase.runTest(TestCase.java:154)
+ at junit.framework.TestCase.runBare(TestCase.java:127)
+ at junit.framework.TestResult$1.protect(TestResult.java:106)
+ at junit.framework.TestResult.runProtected(TestResult.java:124)
+ at junit.framework.TestResult.run(TestResult.java:109)
+ at junit.framework.TestCase.run(TestCase.java:118)
+ at junit.framework.TestSuite.runTest(TestSuite.java:208)
+ at junit.framework.TestSuite.run(TestSuite.java:203)
+ at junit.textui.TestRunner.doRun(TestRunner.java:116)
]]></log4j:throwable>
</log4j:event>
-<log4j:event logger="root" timestamp="XXX" level="ERROR" thread="main">
+<log4j:event logger="root" timestamp="1187196936371" level="ERROR" thread="main">
<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)
- at junit.framework.TestCase.runTest(TestCase.java:XXX)
- at junit.framework.TestCase.runBare(TestCase.java:XXX)
- at junit.framework.TestResult$1.protect(TestResult.java:XXX)
- at junit.framework.TestResult.runProtected(TestResult.java:XXX)
- at junit.framework.TestResult.run(TestResult.java:XXX)
- at junit.framework.TestCase.run(TestCase.java:XXX)
- at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
- at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ at org.apache.log4j.xml.XMLLayoutTestCase.common(XMLLayoutTestCase.java:219)
+ at org.apache.log4j.xml.XMLLayoutTestCase.basic(XMLLayoutTestCase.java:64)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
+ at java.lang.reflect.Method.invoke(Method.java:585)
+ at junit.framework.TestCase.runTest(TestCase.java:154)
+ at junit.framework.TestCase.runBare(TestCase.java:127)
+ at junit.framework.TestResult$1.protect(TestResult.java:106)
+ at junit.framework.TestResult.runProtected(TestResult.java:124)
+ at junit.framework.TestResult.run(TestResult.java:109)
+ at junit.framework.TestCase.run(TestCase.java:118)
+ at junit.framework.TestSuite.runTest(TestSuite.java:208)
+ at junit.framework.TestSuite.run(TestSuite.java:203)
+ at junit.textui.TestRunner.doRun(TestRunner.java:116)
]]></log4j:throwable>
</log4j:event>
Copied: logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1.xml (from r564393, logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1)
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1.xml?view=diff&rev=566270&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1&r1=564393&p2=logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1.xml&r2=566270
==============================================================================
Binary files - no diff available.
Propchange: logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/xml/xsltLayout.1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org