Author: carnold
Date: Tue Apr 24 14:39:58 2007
New Revision: 532091
URL: http://svn.apache.org/viewvc?view=rev&rev=532091
Log:
Bug 42121: Copy tests from log4j 1.3
Added:
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/LayoutTest.java
- copied unchanged from r532072,
logging/log4j/trunk/tests/src/java/org/apache/log4j/LayoutTest.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/MyPatternLayout.java
- copied unchanged from r532084,
logging/log4j/trunk/tests/src/java/org/apache/log4j/MyPatternLayout.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/MyPatternParser.java
- copied unchanged from r532084,
logging/log4j/trunk/tests/src/java/org/apache/log4j/MyPatternParser.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/PatternLayoutTest.java
- copied unchanged from r532072,
logging/log4j/trunk/tests/src/java/org/apache/log4j/PatternLayoutTest.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
- copied, changed from r532069,
logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/PatternLayoutTestCase.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/pattern/
- copied from r532069,
logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/pattern/
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/
- copied from r532070,
logging/sandbox/log4j/expression-filter/src/test/java/org/apache/log4j/util/
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java
- copied unchanged from r532072,
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/AbsoluteTimeFilter.java
- copied unchanged from r532072,
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/AbsoluteTimeFilter.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/ISO8601Filter.java
- copied unchanged from r532072,
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/ISO8601Filter.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/RelativeTimeFilter.java
- copied unchanged from r532072,
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/RelativeTimeFilter.java
logging/sandbox/log4j/pattern-layout/src/test/resources/org/
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.1
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.1
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.10
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.10
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.11
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.11
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.12
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.12
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.13
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.13
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.14
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.14
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.15
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.15
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.2
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.2
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.3
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.3
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.4
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.4
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.5
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.5
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.6
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.6
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.7
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.7
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.8
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.8
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.9
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.9
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.mdc.1
- copied unchanged from r532079,
logging/log4j/trunk/tests/witness/pattern/patternLayout.mdc.1
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.mdc.1.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout.mdc.1.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout.mdc.2
- copied unchanged from r532083,
logging/log4j/trunk/tests/witness/pattern/patternLayout.mdc.2
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout1.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout1.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout10.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout10.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout11.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout11.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout12.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout12.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout13.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout13.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout14.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout14.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout15.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout15.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout16.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout16.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout2.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout2.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout3.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout3.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout4.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout4.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout5.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout5.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout6.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout6.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout7.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout7.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout8.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout8.properties
logging/sandbox/log4j/pattern-layout/src/test/resources/org/apache/log4j/patternLayout9.properties
- copied unchanged from r532079,
logging/log4j/trunk/tests/input/pattern/patternLayout9.properties
Removed:
logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/PatternLayoutTestCase.java
logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/pattern/
Modified:
logging/sandbox/log4j/pattern-layout/pom.xml
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/Compare.java
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Modified: logging/sandbox/log4j/pattern-layout/pom.xml
URL:
http://svn.apache.org/viewvc/logging/sandbox/log4j/pattern-layout/pom.xml?view=diff&rev=532091&r1=532090&r2=532091
==============================================================================
--- logging/sandbox/log4j/pattern-layout/pom.xml (original)
+++ logging/sandbox/log4j/pattern-layout/pom.xml Tue Apr 24 14:39:58 2007
@@ -126,6 +126,12 @@
<artifactId>log4j</artifactId>
<version>1.3alpha8</version>
</dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
<plugins>
Copied:
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
(from r532069,
logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/PatternLayoutTestCase.java)
URL:
http://svn.apache.org/viewvc/logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/PatternLayoutTestCase.java?view=diff&rev=532091&p1=logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/PatternLayoutTestCase.java&r1=532069&p2=logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/PatternLayoutTestCase.java&r2=532091
==============================================================================
---
logging/sandbox/log4j/pattern-layout/src/java/org/apache/log4j/PatternLayoutTestCase.java
(original)
+++
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
Tue Apr 24 14:39:58 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -34,6 +35,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
+import java.io.*;
+import java.util.Properties;
public class PatternLayoutTestCase extends TestCase {
@@ -85,8 +88,40 @@
root.getLoggerRepository().resetConfiguration();
}
+ /**
+ * Configures log4j from a properties file resource in class loader path.
+ * @param fileName resource name, only last element is significant.
+ * @throws IOException if resource not found or error reading resource.
+ */
+ private static void configure(final String fileName) throws IOException {
+ String resourceName = fileName;
+ int lastSlash = resourceName.lastIndexOf("/");
+ if (lastSlash >= 0) {
+ resourceName = resourceName.substring(lastSlash + 1);
+ }
+ InputStream is =
PatternLayoutTestCase.class.getResourceAsStream(resourceName);
+ if (is == null) {
+ throw new FileNotFoundException("Could not find resource " +
resourceName);
+ }
+ Properties props = new Properties();
+ props.load(is);
+ PropertyConfigurator.configure(props);
+ }
+
+ /**
+ * Compares actual and expected files.
+ * @param actual file name for file generated by test
+ * @param expected resource name containing expected output
+ * @return true if files are the same after adjustments
+ * @throws IOException if IO error during comparison.
+ */
+ private static boolean compare(final String actual,
+ final String expected) throws IOException {
+ return Compare.compare(PatternLayoutTestCase.class, actual, expected);
+ }
+
public void test1() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout1.properties");
+ configure("input/pattern/patternLayout1.properties");
common();
Transformer.transform(
TEMP, FILTERED,
@@ -94,11 +129,11 @@
new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.1"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.1"));
}
public void test2() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout2.properties");
+ configure("input/pattern/patternLayout2.properties");
common();
ControlFilter cf1 =
@@ -110,11 +145,11 @@
cf1, new LineNumberFilter(), new ISO8601Filter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.2"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.2"));
}
public void test3() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout3.properties");
+ configure("input/pattern/patternLayout3.properties");
common();
ControlFilter cf1 =
@@ -126,13 +161,13 @@
cf1, new LineNumberFilter(), new ISO8601Filter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.3"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.3"));
}
// Output format:
// 06 avr. 2002 18:30:58,937 [main] DEBUG atternLayoutTest - Message 0
public void test4() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout4.properties");
+ configure("input/pattern/patternLayout4.properties");
common();
ControlFilter cf1 =
@@ -144,11 +179,11 @@
cf1, new LineNumberFilter(), new AbsoluteDateAndTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.4"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.4"));
}
public void test5() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout5.properties");
+ configure("input/pattern/patternLayout5.properties");
common();
ControlFilter cf1 =
@@ -160,12 +195,12 @@
cf1, new LineNumberFilter(), new AbsoluteDateAndTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.5"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.5"));
}
// 18:54:19,201 [main] DEBUG atternLayoutTest - Message 0
public void test6() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout6.properties");
+ configure("input/pattern/patternLayout6.properties");
common();
ControlFilter cf1 =
@@ -177,11 +212,11 @@
cf1, new LineNumberFilter(), new AbsoluteTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.6"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.6"));
}
public void test7() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout7.properties");
+ configure("input/pattern/patternLayout7.properties");
common();
ControlFilter cf1 =
@@ -193,11 +228,11 @@
cf1, new LineNumberFilter(), new AbsoluteTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.7"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.7"));
}
public void test8() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout8.properties");
+ configure("input/pattern/patternLayout8.properties");
common();
ControlFilter cf1 =
@@ -209,11 +244,11 @@
cf1, new LineNumberFilter(), new RelativeTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.8"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.8"));
}
public void test9() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout9.properties");
+ configure("input/pattern/patternLayout9.properties");
common();
ControlFilter cf1 =
@@ -225,11 +260,11 @@
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.9"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.9"));
}
public void test10() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout10.properties");
+ configure("input/pattern/patternLayout10.properties");
common();
ControlFilter cf1 =
@@ -241,11 +276,11 @@
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.10"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.10"));
}
public void test11() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout11.properties");
+ configure("input/pattern/patternLayout11.properties");
common();
ControlFilter cf1 =
@@ -257,11 +292,11 @@
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.11"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.11"));
}
public void test12() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout12.properties");
+ configure("input/pattern/patternLayout12.properties");
common();
ControlFilter cf1 =
@@ -273,11 +308,11 @@
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.12"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.12"));
}
public void test13() throws Exception {
- PropertyConfigurator.configure("input/pattern/patternLayout13.properties");
+ configure("input/pattern/patternLayout13.properties");
common();
ControlFilter cf1 =
@@ -289,7 +324,7 @@
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED, "witness/pattern/patternLayout.13"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.13"));
}
/**
@@ -298,7 +333,7 @@
* @throws Exception
*/
public void test14() throws Exception {
-
PropertyConfigurator.configure("input/pattern/patternLayout14.properties");
+ configure("input/pattern/patternLayout14.properties");
common();
Transformer.transform(
@@ -307,12 +342,12 @@
new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED,
"witness/pattern/patternLayout.14"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.14"));
}
public void testMDC1() throws Exception {
-
PropertyConfigurator.configure("input/pattern/patternLayout.mdc.1.properties");
+ configure("input/pattern/patternLayout.mdc.1.properties");
MDC.put("key1", "va11");
MDC.put("key2", "va12");
logger.debug("Hello World");
@@ -324,7 +359,7 @@
new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED,
"witness/pattern/patternLayout.mdc.1"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.mdc.1"));
}
/**
@@ -333,7 +368,7 @@
* @throws Exception
*/
public void test15() throws Exception {
-
PropertyConfigurator.configure("input/pattern/patternLayout15.properties");
+ configure("input/pattern/patternLayout15.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT14, EXCEPTION1,
EXCEPTION2, EXCEPTION3, EXCEPTION4});
@@ -343,7 +378,7 @@
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(Compare.compare(FILTERED,
"witness/pattern/patternLayout.15"));
+ assertTrue(compare(FILTERED, "witness/pattern/patternLayout.15"));
}
/**
@@ -352,7 +387,7 @@
*/
public void test16() throws Exception {
final long start = new Date().getTime();
-
PropertyConfigurator.configure("input/pattern/patternLayout16.properties");
+ configure("input/pattern/patternLayout16.properties");
common();
final long end = new Date().getTime();
FileReader reader = new FileReader("output/patternLayout16.log");
@@ -472,6 +507,6 @@
layout.activateOptions();
root.debug("finished mdc pattern test");
- assertTrue(Compare.compare(OUTPUT_FILE, WITNESS_FILE));
+ assertTrue(compare(OUTPUT_FILE, WITNESS_FILE));
}
}
Modified:
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/Compare.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/Compare.java?view=diff&rev=532091&r1=532070&r2=532091
==============================================================================
---
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/Compare.java
(original)
+++
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/Compare.java
Tue Apr 24 14:39:58 2007
@@ -1,9 +1,10 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified:
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java?view=diff&rev=532091&r1=532070&r2=532091
==============================================================================
---
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
(original)
+++
logging/sandbox/log4j/pattern-layout/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Tue Apr 24 14:39:58 2007
@@ -23,6 +23,15 @@
public class JunitTestRunnerFilter implements Filter {
Perl5Util util = new Perl5Util();
+ private static final String[] patterns = {
+ "/at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner/",
+ "/at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner/",
+ "/at junit.textui.TestRunner/",
+ "/at com.intellij.rt.execution.junit/",
+ "/at java.lang.reflect.Method.invoke/",
+ "/at org.apache.maven.surefire./"
+ };
+
/**
* Filter out stack trace lines coming from the various JUnit TestRunners.
*/
@@ -31,17 +40,18 @@
return null;
}
- if (
- util.match(
- "/at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner/", in)) {
- return null;
- } else if (
- util.match(
- "/at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner/",
- in)) {
- return null;
- } else {
- return in;
+ //
+ // restore the one instance of Method.invoke that we actually want
+ //
+ if (util.match("/at junit.framework.TestCase.runTest/", in)) {
+ return "\tat java.lang.reflect.Method.invoke(X)\n" + in;
+ }
+
+ for (int i = 0; i < patterns.length; i++) {
+ if(util.match(patterns[i], in)) {
+ return null;
+ }
}
+ return in;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
