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 2008/07/18 04:20:19 UTC
svn commit: r677804 - in /logging/log4j/trunk/tests: build.xml
input/xml/fallback1.xml
src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java witness/fallback1
Author: carnold
Date: Thu Jul 17 19:20:19 2008
New Revision: 677804
URL: http://svn.apache.org/viewvc?rev=677804&view=rev
Log:
Bug 45426: ErrorHandlerTestCase is not run and does not pass
Added:
logging/log4j/trunk/tests/witness/fallback1
Modified:
logging/log4j/trunk/tests/build.xml
logging/log4j/trunk/tests/input/xml/fallback1.xml
logging/log4j/trunk/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java
Modified: logging/log4j/trunk/tests/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/build.xml?rev=677804&r1=677803&r2=677804&view=diff
==============================================================================
--- logging/log4j/trunk/tests/build.xml (original)
+++ logging/log4j/trunk/tests/build.xml Thu Jul 17 19:20:19 2008
@@ -171,7 +171,8 @@
CyclicBuffer, OR,
LevelMatchFilter, PatternParser,
PatternLayout, RFA, ERFA, DRFA,
- NTEventLogAppender, Syslog, Socket"/>
+ NTEventLogAppender, Syslog, Socket,
+ ErrorHandler"/>
<!-- ================================================================= -->
<!-- Longer unit tests -->
Modified: logging/log4j/trunk/tests/input/xml/fallback1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/input/xml/fallback1.xml?rev=677804&r1=677803&r2=677804&view=diff
==============================================================================
--- logging/log4j/trunk/tests/input/xml/fallback1.xml (original)
+++ logging/log4j/trunk/tests/input/xml/fallback1.xml Thu Jul 17 19:20:19 2008
@@ -26,7 +26,7 @@
<appender-ref ref="FALLBACK" />
</errorHandler>
- <param name="File" value="/xyz/x.log" />
+ <param name="File" value="/xyz/:x.log" />
<param name="Append" value="false" />
<layout class="org.apache.log4j.PatternLayout">
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java?rev=677804&r1=677803&r2=677804&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java (original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/varia/ErrorHandlerTestCase.java Thu Jul 17 19:20:19 2008
@@ -18,39 +18,30 @@
package org.apache.log4j.varia;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.framework.Test;
-
-import org.apache.log4j.Logger;
+import org.apache.log4j.Appender;
import org.apache.log4j.Level;
-import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.util.Filter;
-import org.apache.log4j.util.LineNumberFilter;
-import org.apache.log4j.util.ControlFilter;
-import org.apache.log4j.util.ISO8601Filter;
import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.Compare;
+import org.apache.log4j.util.JunitTestRunnerFilter;
+import org.apache.log4j.util.LineNumberFilter;
+import org.apache.log4j.util.ControlFilter;
+import org.apache.log4j.xml.DOMConfigurator;
public class ErrorHandlerTestCase extends TestCase {
- static String TEMP_A1 = "output/temp.A1";
- static String TEMP_A2 = "output/temp.A2";
- static String FILTERED_A1 = "output/filtered.A1";
- static String FILTERED_A2 = "output/filtered.A2";
+ static String TEMP = "output/temp";
+ static String FILTERED = "output/filtered";
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
- static String TEST1_1A_PAT =
- "(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_2_PAT = "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3} "+
- "\\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message \\d";
-
+ static String TEST1_PAT =
+ "FALLBACK - (root|test) - Message \\d";
Logger root;
@@ -71,22 +62,21 @@
public void test1() throws Exception {
DOMConfigurator.configure("input/xml/fallback1.xml");
- common();
+ Appender primary = root.getAppender("PRIMARY");
+ ErrorHandler eh = primary.getErrorHandler();
+ assertNotNull(eh);
- ControlFilter cf1 = new ControlFilter(new String[]{TEST1_1A_PAT, TEST1_1B_PAT,
- EXCEPTION1, EXCEPTION2, EXCEPTION3});
+ common();
- ControlFilter cf2 = new ControlFilter(new String[]{TEST1_2_PAT,
+ ControlFilter cf = new ControlFilter(new String[]{TEST1_PAT,
EXCEPTION1, EXCEPTION2, EXCEPTION3});
- Transformer.transform(TEMP_A1, FILTERED_A1, new Filter[] {cf1,
- new LineNumberFilter()});
+ Transformer.transform(TEMP, FILTERED, new Filter[] {cf,
+ new LineNumberFilter(),
+ new JunitTestRunnerFilter()});
- Transformer.transform(TEMP_A2, FILTERED_A2, new Filter[] {cf2,
- new LineNumberFilter(), new ISO8601Filter()});
- assertTrue(Compare.compare(FILTERED_A1, "witness/dom.A1.1"));
- assertTrue(Compare.compare(FILTERED_A2, "witness/dom.A2.1"));
+ assertTrue(Compare.compare(FILTERED, "witness/fallback1"));
}
void common() {
@@ -116,10 +106,4 @@
}
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new ErrorHandlerTestCase("test1"));
- return suite;
- }
-
}
Added: logging/log4j/trunk/tests/witness/fallback1
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/tests/witness/fallback1?rev=677804&view=auto
==============================================================================
--- logging/log4j/trunk/tests/witness/fallback1 (added)
+++ logging/log4j/trunk/tests/witness/fallback1 Thu Jul 17 19:20:19 2008
@@ -0,0 +1,74 @@
+FALLBACK - test - Message 0
+FALLBACK - root - Message 0
+FALLBACK - test - Message 1
+FALLBACK - root - Message 1
+FALLBACK - test - Message 2
+FALLBACK - root - Message 2
+FALLBACK - test - Message 3
+FALLBACK - root - Message 3
+FALLBACK - test - Message 4
+FALLBACK - root - Message 4
+FALLBACK - test - Message 5
+java.lang.Exception: Just testing
+ at org.apache.log4j.varia.ErrorHandlerTestCase.common(ErrorHandlerTestCase.java:XXX)
+ at org.apache.log4j.varia.ErrorHandlerTestCase.test1(ErrorHandlerTestCase.java:XXX)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:XXX)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:XXX)
+ at java.lang.reflect.Method.invoke(Method.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)
+FALLBACK - root - Message 5
+java.lang.Exception: Just testing
+ at org.apache.log4j.varia.ErrorHandlerTestCase.common(ErrorHandlerTestCase.java:XXX)
+ at org.apache.log4j.varia.ErrorHandlerTestCase.test1(ErrorHandlerTestCase.java:XXX)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:XXX)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:XXX)
+ at java.lang.reflect.Method.invoke(Method.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)
+FALLBACK - test - Message 6
+java.lang.Exception: Just testing
+ at org.apache.log4j.varia.ErrorHandlerTestCase.common(ErrorHandlerTestCase.java:XXX)
+ at org.apache.log4j.varia.ErrorHandlerTestCase.test1(ErrorHandlerTestCase.java:XXX)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:XXX)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:XXX)
+ at java.lang.reflect.Method.invoke(Method.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)
+FALLBACK - root - Message 6
+java.lang.Exception: Just testing
+ at org.apache.log4j.varia.ErrorHandlerTestCase.common(ErrorHandlerTestCase.java:XXX)
+ at org.apache.log4j.varia.ErrorHandlerTestCase.test1(ErrorHandlerTestCase.java:XXX)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:XXX)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:XXX)
+ at java.lang.reflect.Method.invoke(Method.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)
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org