Author: carnold
Date: Fri Apr 27 10:27:10 2007
New Revision: 533171
URL: http://svn.apache.org/viewvc?view=rev&rev=533171
Log:
Bug 42281: Unit test fixes for java-gcj
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PatternLayoutTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java?view=diff&rev=533171&r1=533170&r2=533171
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/MinimumTestCase.java
Fri Apr 27 10:27:10 2007
@@ -36,6 +36,7 @@
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
+ static String EXCEPTION5 = "\\s*at .*\\(.*libgcj.*\\)";
//18 fevr. 2002 20:02:41,551 [main] FATAL ERR - Message 0
@@ -85,8 +86,9 @@
root.addAppender(appender);
common();
- ControlFilter cf1 = new ControlFilter(new String[]{TTCC_PAT, TTCC2_PAT,
EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ ControlFilter cf1 = new ControlFilter(new String[]{TTCC_PAT,
+ TTCC2_PAT, EXCEPTION1, EXCEPTION2,
+ EXCEPTION3, EXCEPTION4, EXCEPTION5 });
Transformer.transform(
"output/ttcc", FILTERED,
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PatternLayoutTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PatternLayoutTestCase.java?view=diff&rev=533171&r1=533170&r2=533171
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PatternLayoutTestCase.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PatternLayoutTestCase.java
Fri Apr 27 10:27:10 2007
@@ -50,6 +50,7 @@
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
+ static String EXCEPTION5 = "\\s*at .*\\(.*libgcj.*\\)";
static String PAT0 = "\\[main]\\ (TRACE|DEBUG|INFO |WARN |ERROR|FATAL) .* -
Message \\d{1,2}";
static String PAT1 = Filter.ISO8601_PAT + " " + PAT0;
@@ -102,7 +103,7 @@
PropertyConfigurator.configure("input/patternLayout2.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT1, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -116,7 +117,7 @@
PropertyConfigurator.configure("input/patternLayout3.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT1, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -132,7 +133,7 @@
PropertyConfigurator.configure("input/patternLayout4.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT2, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -146,7 +147,7 @@
PropertyConfigurator.configure("input/patternLayout5.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT2, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -161,7 +162,7 @@
PropertyConfigurator.configure("input/patternLayout6.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT3, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -176,7 +177,7 @@
PropertyConfigurator.configure("input/patternLayout7.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT3, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -190,7 +191,7 @@
PropertyConfigurator.configure("input/patternLayout8.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT4, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -204,7 +205,7 @@
PropertyConfigurator.configure("input/patternLayout9.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT5, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -218,7 +219,7 @@
PropertyConfigurator.configure("input/patternLayout10.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT6, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -232,7 +233,7 @@
PropertyConfigurator.configure("input/patternLayout11.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT11a, PAT11b,
EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -246,7 +247,7 @@
PropertyConfigurator.configure("input/patternLayout12.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT12, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -260,7 +261,7 @@
PropertyConfigurator.configure("input/patternLayout13.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT13, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -274,7 +275,7 @@
PropertyConfigurator.configure("input/patternLayout14.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT14, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java?view=diff&rev=533171&r1=533170&r2=533171
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
Fri Apr 27 10:27:10 2007
@@ -84,6 +84,7 @@
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
+ static String EXCEPTION5 = "\\s*at .*\\(.*libgcj.*\\)";
static Logger logger = Logger.getLogger(SocketServerTestCase.class);
@@ -116,7 +117,7 @@
common("T1", "key1", "MDC-TEST1");
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT1, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
@@ -140,7 +141,7 @@
common("T2", "key2", "MDC-TEST2");
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT2, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
@@ -163,7 +164,7 @@
common("T3", "key3", "MDC-TEST3");
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT3, EXCEPTION1,
- EXCEPTION2, EXCEPTION3,
EXCEPTION4});
+ EXCEPTION2, EXCEPTION3,
EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
@@ -194,7 +195,7 @@
if(!System.getProperty("java.version").startsWith("1.1.")) {
ControlFilter cf = new ControlFilter(new String[]{PAT4, EXCEPTION1,
- EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
new Filter[] { cf, new LineNumberFilter(),
@@ -236,7 +237,7 @@
// requires JDK 1.2 or later
if(!System.getProperty("java.version").startsWith("1.1.")) {
ControlFilter cf = new ControlFilter(new String[]{PAT5, EXCEPTION1,
- EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
@@ -273,7 +274,7 @@
// requires JDK 1.2 or later
if(!System.getProperty("java.version").startsWith("1.1.")) {
ControlFilter cf = new ControlFilter(new String[]{PAT6, EXCEPTION1,
- EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
@@ -306,7 +307,7 @@
// requires JDK 1.2 or later
if(!System.getProperty("java.version").startsWith("1.1.")) {
ControlFilter cf = new ControlFilter(new String[]{PAT7, EXCEPTION1,
- EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
@@ -336,7 +337,7 @@
// requires JDK 1.2 or later
if(!System.getProperty("java.version").startsWith("1.1.")) {
ControlFilter cf = new ControlFilter(new String[]{PAT8, EXCEPTION1,
- EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP, FILTERED,
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java?view=diff&rev=533171&r1=533170&r2=533171
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Fri Apr 27 10:27:10 2007
@@ -42,6 +42,8 @@
return null;
} else if (in.indexOf("at junit.") >= 0 && in.indexOf("ui.TestRunner") >=
0) {
return null;
+ } else if (util.match("/\\sat /", in)) {
+ return "\t" + in.trim();
} else {
return in;
}
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java?view=diff&rev=533171&r1=533170&r2=533171
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/DOMTestCase.java
Fri Apr 27 10:27:10 2007
@@ -45,6 +45,8 @@
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
static String EXCEPTION4 = "\\s*at .*\\(.*Compiled Code\\)";
+ static String EXCEPTION5 = "\\s*at .*\\(.*libgcj.*\\)";
+
static String TEST1_1A_PAT =
"(TRACE|DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* -
Message \\d";
@@ -77,10 +79,10 @@
common();
ControlFilter cf1 = new ControlFilter(new String[]{TEST1_1A_PAT,
TEST1_1B_PAT,
- EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
ControlFilter cf2 = new ControlFilter(new String[]{TEST1_2_PAT,
- EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP_A1, FILTERED_A1,
@@ -108,10 +110,10 @@
common();
ControlFilter cf1 = new ControlFilter(new String[]{TEST1_1A_PAT,
TEST1_1B_PAT,
- EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
ControlFilter cf2 = new ControlFilter(new String[]{TEST1_2_PAT,
- EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4});
+ EXCEPTION1, EXCEPTION2,
EXCEPTION3, EXCEPTION4, EXCEPTION5});
Transformer.transform(
TEMP_A1 + ".4", FILTERED_A1 + ".4",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
