Author: carnold
Date: Wed Mar 17 05:19:39 2010
New Revision: 924157
URL: http://svn.apache.org/viewvc?rev=924157&view=rev
Log:
Bug 48927: Renaming EnhancedPatternLayout tests and resources to prepare
incorporating into log4j
Added:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedMyPatternLayout.java
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTest.java
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.1
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.1
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.10
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.10
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.11
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.11
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.12
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.12
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.13
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.13
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.14
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.14
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.15
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.15
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.2
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.2
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.3
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.3
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.4
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.4
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.5
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.5
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.6
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.6
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.7
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.7
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.8
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.8
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.9
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.9
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.mdc.1
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.mdc.1.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.mdc.2
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.2
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.throwable
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.throwable
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout1.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout1.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout10.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout10.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout11.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout11.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout12.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout12.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout13.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout13.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout14.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout14.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout15.properties
- copied, changed from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout16.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout16.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout2.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout2.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout3.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout3.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout4.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout4.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout5.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout5.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout6.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout6.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout7.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout7.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout8.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout8.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout9.properties
- copied unchanged from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout9.properties
Removed:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.1
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.10
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.11
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.12
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.13
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.14
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.15
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.2
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.3
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.4
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.5
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.6
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.7
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.8
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.9
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.1.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.mdc.2
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.throwable
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout1.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout10.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout11.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout12.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout13.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout14.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout16.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout2.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout3.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout4.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout5.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout6.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout7.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout8.properties
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout9.properties
Modified:
logging/log4j/companions/extras/trunk/src/changes/changes.xml
Modified: logging/log4j/companions/extras/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/changes/changes.xml?rev=924157&r1=924156&r2=924157&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/extras/trunk/src/changes/changes.xml Wed Mar 17
05:19:39 2010
@@ -31,6 +31,7 @@
<action action="fix" issue="48778">LogMF performance improvement for
number and date types.</action>
<action action="fix" issue="48910">LogSF did not support \\{ escape
sequence.</action>
<action action="fix" issue="48911">LogMF did not optimize simple
patterns on multiple parameter log requests.</action>
+ <action action="fix" issue="48927">EnhancedPatternLayout tests conflict
with PatternLayout tests.</action>
</release>
Copied:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedMyPatternLayout.java
(from r922688,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedMyPatternLayout.java?p2=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedMyPatternLayout.java&p1=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/MyPatternLayout.java
(original)
+++
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedMyPatternLayout.java
Wed Mar 17 05:19:39 2010
@@ -34,14 +34,14 @@ import org.apache.log4j.helpers.PatternP
@see org.apache.log4j.EnhancedPatternLayout
@author Anders Kristensen
*/
-public class MyPatternLayout extends EnhancedPatternLayout {
+public class EnhancedMyPatternLayout extends EnhancedPatternLayout {
public
- MyPatternLayout() {
+ EnhancedMyPatternLayout() {
this(DEFAULT_CONVERSION_PATTERN);
}
public
- MyPatternLayout(String pattern) {
+ EnhancedMyPatternLayout(String pattern) {
super(pattern);
}
Copied:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTest.java
(from r922688,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTest.java?p2=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTest.java&p1=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTest.java
(original)
+++
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTest.java
Wed Mar 17 05:19:39 2010
@@ -23,15 +23,14 @@ import org.apache.log4j.spi.LoggingEvent
/**
* Test for EnhancedPatternLayout.
*
- * @author Curt Arnold
*/
-public class PatternLayoutTest extends LayoutTest {
+public class EnhancedPatternLayoutTest extends LayoutTest {
/**
* Construct new instance of PatternLayoutTest.
*
* @param testName test name.
*/
- public PatternLayoutTest(final String testName) {
+ public EnhancedPatternLayoutTest(final String testName) {
super(testName, "text/plain", true, null, null);
}
Copied:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
(from r922688,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java?p2=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java&p1=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/PatternLayoutTestCase.java
(original)
+++
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
Wed Mar 17 05:19:39 2010
@@ -31,7 +31,6 @@ import org.apache.log4j.util.SunReflectF
import org.apache.log4j.util.Transformer;
import org.apache.log4j.util.MDCOrderFilter;
-import java.io.FileReader;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -40,12 +39,12 @@ import java.io.*;
import java.util.Properties;
-public class PatternLayoutTestCase extends TestCase {
+public class EnhancedPatternLayoutTestCase extends TestCase {
static String TEMP = "temp";
static String FILTERED = "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 EXCEPTION3 = "\\s*at .*\\((Native Method|Unknown Source)\\)";
static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
static String PAT0 =
@@ -57,18 +56,18 @@ public class PatternLayoutTestCase exten
static String PAT5 =
"\\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* : Message \\d{1,2}";
static String PAT6 =
- "\\[main]\\ (DEBUG|INFO |WARN |ERROR|FATAL)
org.apache.log4j.PatternLayoutTestCase.common\\(PatternLayoutTestCase.java:\\d{1,4}\\):
Message \\d{1,2}";
+ "\\[main]\\ (DEBUG|INFO |WARN |ERROR|FATAL)
org.apache.log4j.EnhancedPatternLayoutTestCase.common\\(EnhancedPatternLayoutTestCase.java:\\d{1,4}\\):
Message \\d{1,2}";
static String PAT11a =
- "^(DEBUG|INFO |WARN |ERROR|FATAL) \\[main]\\ log4j.PatternLayoutTest:
Message \\d{1,2}";
+ "^(DEBUG|INFO |WARN |ERROR|FATAL) \\[main]\\
log4j.EnhancedPatternLayoutTest: Message \\d{1,2}";
static String PAT11b =
"^(DEBUG|INFO |WARN |ERROR|FATAL) \\[main]\\ root: Message \\d{1,2}";
static String PAT12 =
"^\\[main]\\ (DEBUG|INFO |WARN |ERROR|FATAL) "
- +
"org.apache.log4j.PatternLayoutTestCase.common\\(PatternLayoutTestCase.java:\\d{3}\\):
"
+ +
"org.apache.log4j.EnhancedPatternLayoutTestCase.common\\(EnhancedPatternLayoutTestCase.java:\\d{3}\\):
"
+ "Message \\d{1,2}";
static String PAT13 =
"^\\[main]\\ (DEBUG|INFO |WARN |ERROR|FATAL) "
- +
"apache.log4j.PatternLayoutTestCase.common\\(PatternLayoutTestCase.java:\\d{3}\\):
"
+ +
"apache.log4j.EnhancedPatternLayoutTestCase.common\\(EnhancedPatternLayoutTestCase.java:\\d{3}\\):
"
+ "Message \\d{1,2}";
static String PAT14 =
"^(TRACE|DEBUG| INFO| WARN|ERROR|FATAL)\\ \\d{1,2}\\ *- Message \\d{1,2}";
@@ -76,13 +75,13 @@ public class PatternLayoutTestCase exten
Logger root;
Logger logger;
- public PatternLayoutTestCase(final String name) {
+ public EnhancedPatternLayoutTestCase(final String name) {
super(name);
}
public void setUp() {
root = Logger.getRootLogger();
- logger = Logger.getLogger(PatternLayoutTest.class);
+ logger = Logger.getLogger(EnhancedPatternLayoutTest.class);
}
public void tearDown() {
@@ -100,7 +99,7 @@ public class PatternLayoutTestCase exten
if (lastSlash >= 0) {
resourceName = resourceName.substring(lastSlash + 1);
}
- InputStream is =
PatternLayoutTestCase.class.getResourceAsStream(resourceName);
+ InputStream is =
EnhancedPatternLayoutTestCase.class.getResourceAsStream(resourceName);
if (is == null) {
throw new FileNotFoundException("Could not find resource " +
resourceName);
}
@@ -118,11 +117,12 @@ public class PatternLayoutTestCase exten
*/
private static boolean compare(final String actual,
final String expected) throws IOException {
- return Compare.compare(PatternLayoutTestCase.class, actual, expected);
+ return Compare.compare(EnhancedPatternLayoutTestCase.class, actual,
expected);
}
+
public void test1() throws Exception {
- configure("input/pattern/patternLayout1.properties");
+ configure("input/pattern/enhancedPatternLayout1.properties");
common();
Transformer.transform(
TEMP, FILTERED,
@@ -130,11 +130,11 @@ public class PatternLayoutTestCase exten
new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.1"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.1"));
}
public void test2() throws Exception {
- configure("input/pattern/patternLayout2.properties");
+ configure("input/pattern/enhancedPatternLayout2.properties");
common();
ControlFilter cf1 =
@@ -146,11 +146,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new ISO8601Filter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.2"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.2"));
}
public void test3() throws Exception {
- configure("input/pattern/patternLayout3.properties");
+ configure("input/pattern/enhancedPatternLayout3.properties");
common();
ControlFilter cf1 =
@@ -162,13 +162,13 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new ISO8601Filter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.3"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.3"));
}
// Output format:
// 06 avr. 2002 18:30:58,937 [main] DEBUG atternLayoutTest - Message 0
public void test4() throws Exception {
- configure("input/pattern/patternLayout4.properties");
+ configure("input/pattern/enhancedPatternLayout4.properties");
common();
ControlFilter cf1 =
@@ -180,11 +180,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new AbsoluteDateAndTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.4"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.4"));
}
public void test5() throws Exception {
- configure("input/pattern/patternLayout5.properties");
+ configure("input/pattern/enhancedPatternLayout5.properties");
common();
ControlFilter cf1 =
@@ -196,12 +196,12 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new AbsoluteDateAndTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.5"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.5"));
}
// 18:54:19,201 [main] DEBUG atternLayoutTest - Message 0
public void test6() throws Exception {
- configure("input/pattern/patternLayout6.properties");
+ configure("input/pattern/enhancedPatternLayout6.properties");
common();
ControlFilter cf1 =
@@ -213,11 +213,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new AbsoluteTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.6"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.6"));
}
public void test7() throws Exception {
- configure("input/pattern/patternLayout7.properties");
+ configure("input/pattern/enhancedPatternLayout7.properties");
common();
ControlFilter cf1 =
@@ -229,11 +229,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new AbsoluteTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.7"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.7"));
}
public void test8() throws Exception {
- configure("input/pattern/patternLayout8.properties");
+ configure("input/pattern/enhancedPatternLayout8.properties");
common();
ControlFilter cf1 =
@@ -245,11 +245,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new RelativeTimeFilter(),
new SunReflectFilter(), new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.8"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.8"));
}
public void test9() throws Exception {
- configure("input/pattern/patternLayout9.properties");
+ configure("input/pattern/enhancedPatternLayout9.properties");
common();
ControlFilter cf1 =
@@ -261,11 +261,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.9"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.9"));
}
public void test10() throws Exception {
- configure("input/pattern/patternLayout10.properties");
+ configure("input/pattern/enhancedPatternLayout10.properties");
common();
ControlFilter cf1 =
@@ -277,11 +277,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.10"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.10"));
}
public void test11() throws Exception {
- configure("input/pattern/patternLayout11.properties");
+ configure("input/pattern/enhancedPatternLayout11.properties");
common();
ControlFilter cf1 =
@@ -293,11 +293,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.11"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.11"));
}
public void test12() throws Exception {
- configure("input/pattern/patternLayout12.properties");
+ configure("input/pattern/enhancedPatternLayout12.properties");
common();
ControlFilter cf1 =
@@ -309,11 +309,11 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.12"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.12"));
}
public void test13() throws Exception {
- configure("input/pattern/patternLayout13.properties");
+ configure("input/pattern/enhancedPatternLayout13.properties");
common();
ControlFilter cf1 =
@@ -325,7 +325,7 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.13"));
+ assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.13"));
}
/**
@@ -334,7 +334,7 @@ public class PatternLayoutTestCase exten
* @throws Exception
*/
public void test14() throws Exception {
- configure("input/pattern/patternLayout14.properties");
+ configure("input/pattern/enhancedPatternLayout14.properties");
common();
Transformer.transform(
@@ -343,12 +343,20 @@ public class PatternLayoutTestCase exten
new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.14"));
+ assertTrue(compare(FILTERED,
"witness/pattern/enhancedPatternLayout.14"));
}
+ private static void clearMDC() throws Exception {
+ java.util.Hashtable context = MDC.getContext();
+ if (context != null) {
+ context.clear();
+ }
+ }
+
public void testMDC1() throws Exception {
- configure("input/pattern/patternLayout.mdc.1.properties");
+ configure("input/pattern/enhancedPatternLayout.mdc.1.properties");
+ clearMDC();
MDC.put("key1", "va11");
MDC.put("key2", "va12");
logger.debug("Hello World");
@@ -362,16 +370,15 @@ public class PatternLayoutTestCase exten
new JunitTestRunnerFilter(),
new MDCOrderFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.mdc.1"));
+ assertTrue(compare(FILTERED,
"witness/pattern/enhancedPatternLayout.mdc.1"));
}
-
/**
* Tests log4j 1.2 style extension of EnhancedPatternLayout.
* Was test14 in log4j 1.2.
* @throws Exception
*/
public void test15() throws Exception {
- configure("input/pattern/patternLayout15.properties");
+ configure("input/pattern/enhancedPatternLayout15.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT14, EXCEPTION1,
EXCEPTION2, EXCEPTION3, EXCEPTION4});
@@ -381,16 +388,15 @@ public class PatternLayoutTestCase exten
cf1, new LineNumberFilter(), new SunReflectFilter(),
new JunitTestRunnerFilter()
});
- assertTrue(compare(FILTERED, "witness/pattern/patternLayout.15"));
+ assertTrue(compare(FILTERED,
"witness/pattern/enhancedPatternLayout.15"));
}
-
/**
* Tests explicit UTC time zone in pattern.
* @throws Exception
*/
public void test16() throws Exception {
final long start = new Date().getTime();
- configure("input/pattern/patternLayout16.properties");
+ configure("input/pattern/enhancedPatternLayout16.properties");
common();
final long end = new Date().getTime();
FileReader reader = new FileReader("patternLayout16.log");
@@ -409,7 +415,6 @@ public class PatternLayoutTestCase exten
assertTrue(cstDate.getTime() >= start - 1000 && cstDate.getTime() < end
+ 1000);
}
-
void common() {
int i = -1;
@@ -441,7 +446,7 @@ public class PatternLayoutTestCase exten
Test case for MDC conversion pattern. */
public void testMDC2() throws Exception {
String OUTPUT_FILE = "patternLayout.mdc.2";
- String WITNESS_FILE = "witness/pattern/patternLayout.mdc.2";
+ String WITNESS_FILE = "witness/pattern/enhancedPatternLayout.mdc.2";
String mdcMsgPattern1 = "%m : %X%n";
String mdcMsgPattern2 = "%m : %X{key1}%n";
@@ -456,7 +461,8 @@ public class PatternLayoutTestCase exten
// set appender on root and set level to debug
root.addAppender(appender);
root.setLevel(Level.DEBUG);
-
+
+ clearMDC();
// output starting message
root.debug("starting mdc pattern test");
@@ -521,12 +527,11 @@ public class PatternLayoutTestCase exten
assertTrue(compare(FILTERED, WITNESS_FILE));
}
-
/**
Test case for throwable conversion pattern. */
public void testThrowable() throws Exception {
String OUTPUT_FILE = "patternLayout.throwable";
- String WITNESS_FILE = "witness/pattern/patternLayout.throwable";
+ String WITNESS_FILE = "witness/pattern/enhancedPatternLayout.throwable";
// set up appender
@@ -568,5 +573,4 @@ public class PatternLayoutTestCase exten
assertTrue(compare(FILTERED, WITNESS_FILE));
}
-
}
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.1
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.1)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.1?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.1&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.1&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.10
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.10)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.10?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.10&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.10&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.11
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.11)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.11?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.11&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.11&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.12
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.12)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.12?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.12&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.12&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.13
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.13)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.13?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.13&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.13&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.14
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.14)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.14?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.14&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.14&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.15
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.15)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.15?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.15&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.15&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.15
(original)
+++
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.15
Wed Mar 17 05:19:39 2010
@@ -10,8 +10,8 @@ FATAL 9 - Message 4
FATAL 10 - Message 4
DEBUG 11 - Message 5
java.lang.Exception: Just testing
- at org.apache.log4j.PatternLayoutTestCase.common(X)
- at org.apache.log4j.PatternLayoutTestCase.test15(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.common(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.test15(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
@@ -23,8 +23,8 @@ java.lang.Exception: Just testing
at junit.framework.TestSuite.run(X)
INFO 12 - Message 6
java.lang.Exception: Just testing
- at org.apache.log4j.PatternLayoutTestCase.common(X)
- at org.apache.log4j.PatternLayoutTestCase.test15(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.common(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.test15(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
@@ -36,8 +36,8 @@ java.lang.Exception: Just testing
at junit.framework.TestSuite.run(X)
WARN 13 - Message 7
java.lang.Exception: Just testing
- at org.apache.log4j.PatternLayoutTestCase.common(X)
- at org.apache.log4j.PatternLayoutTestCase.test15(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.common(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.test15(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
@@ -49,8 +49,8 @@ java.lang.Exception: Just testing
at junit.framework.TestSuite.run(X)
ERROR 14 - Message 8
java.lang.Exception: Just testing
- at org.apache.log4j.PatternLayoutTestCase.common(X)
- at org.apache.log4j.PatternLayoutTestCase.test15(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.common(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.test15(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
@@ -62,8 +62,8 @@ java.lang.Exception: Just testing
at junit.framework.TestSuite.run(X)
FATAL 15 - Message 9
java.lang.Exception: Just testing
- at org.apache.log4j.PatternLayoutTestCase.common(X)
- at org.apache.log4j.PatternLayoutTestCase.test15(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.common(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.test15(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.2
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.2)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.2?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.2&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.2&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.3
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.3)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.3?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.3&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.3&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.4
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.4)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.4?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.4&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.4&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.5
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.5)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.5?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.5&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.5&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.6
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.6)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.6?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.6&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.6&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.7
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.7)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.7?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.7&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.7&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.8
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.8)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.8?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.8&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.8&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.9
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.9)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.9?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.9&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.9&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
Binary files - no diff available.
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.throwable
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.throwable)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.throwable?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.throwable&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.throwable&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout.throwable
(original)
+++
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.throwable
Wed Mar 17 05:19:39 2010
@@ -2,7 +2,7 @@ starting throwable pattern test
plain pattern, no exception
plain pattern, with exception
java.lang.Exception: Test Exception
- at org.apache.log4j.PatternLayoutTestCase.testThrowable(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.testThrowable(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
@@ -15,7 +15,7 @@ java.lang.Exception: Test Exception
%throwable, no exception
%throwable, with exception
java.lang.Exception: Test Exception
- at org.apache.log4j.PatternLayoutTestCase.testThrowable(X)
+ at org.apache.log4j.EnhancedPatternLayoutTestCase.testThrowable(X)
at java.lang.reflect.Method.invoke(X)
at junit.framework.TestCase.runTest(X)
at junit.framework.TestCase.runBare(X)
Copied:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout15.properties
(from r922688,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout15.properties?p2=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout15.properties&p1=logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties&r1=922688&r2=924157&rev=924157&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/patternLayout15.properties
(original)
+++
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout15.properties
Wed Mar 17 05:19:39 2010
@@ -16,7 +16,7 @@ log4j.rootCategory=TRACE, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
log4j.appender.testAppender.File= temp
log4j.appender.testAppender.Append=false
-log4j.appender.testAppender.layout=org.apache.log4j.MyPatternLayout
+log4j.appender.testAppender.layout=org.apache.log4j.EnhancedMyPatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%5p %-4# - %m%n
# Prevent internal log4j DEBUG messages from polluting the output.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
