You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/04/27 20:19:25 UTC
svn commit: r533183 - in
/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j:
HierarchyThresholdTestCase.java MinimumTestCase.java
PatternLayoutTestCase.java net/SocketServerTestCase.java
xml/DOMTestCase.java xml/XMLLayoutTestCase.java
Author: carnold
Date: Fri Apr 27 11:19:24 2007
New Revision: 533183
URL: http://svn.apache.org/viewvc?view=rev&rev=533183
Log:
Bug 42281: Explicitly set thread name to pass tests on JRockit
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java
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/xml/DOMTestCase.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java?view=diff&rev=533183&r1=533182&r2=533183
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/HierarchyThresholdTestCase.java Fri Apr 27 11:19:24 2007
@@ -98,12 +98,17 @@
static
void common() {
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
+
logger.log(XLevel.TRACE, "m0");
logger.debug("m1");
logger.info("m2");
logger.warn("m3");
logger.error("m4");
logger.fatal("m5");
+
+ Thread.currentThread().setName(oldThreadName);
}
public static Test suite() {
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=533183&r1=533182&r2=533183
==============================================================================
--- 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 11:19:24 2007
@@ -84,7 +84,11 @@
Layout layout = new TTCCLayout(AbsoluteTimeDateFormat.DATE_AND_TIME_DATE_FORMAT);
Appender appender = new FileAppender(layout, "output/ttcc", false);
root.addAppender(appender);
+
+ String oldName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
common();
+ Thread.currentThread().setName(oldName);
ControlFilter cf1 = new ControlFilter(new String[]{TTCC_PAT,
TTCC2_PAT, EXCEPTION1, EXCEPTION2,
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=533183&r1=533182&r2=533183
==============================================================================
--- 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 11:19:24 2007
@@ -286,6 +286,9 @@
}
void common() {
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
+
int i = -1;
logger.trace("Message " + ++i);
@@ -313,6 +316,8 @@
logger.warn("Message " + ++i , e);
logger.error("Message " + ++i, e);
logger.log(Level.FATAL, "Message " + ++i, e);
+
+ Thread.currentThread().setName(oldThreadName);
}
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=533183&r1=533182&r2=533183
==============================================================================
--- 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 11:19:24 2007
@@ -350,6 +350,9 @@
static
void common(String dc, String key, Object o) {
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
+
int i = -1;
NDC.push(dc);
MDC.put(key, o);
@@ -376,6 +379,8 @@
root.error("Message " + ++i, e);
NDC.pop();
MDC.remove(key);
+
+ Thread.currentThread().setName(oldThreadName);
}
public void delay(int secs) {
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=533183&r1=533182&r2=533183
==============================================================================
--- 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 11:19:24 2007
@@ -134,6 +134,9 @@
}
void common() {
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
+
int i = -1;
logger.trace("Message " + ++i);
@@ -161,6 +164,7 @@
logger.error("Message " + ++i, e);
root.error("Message " + i, e);
+ Thread.currentThread().setName(oldThreadName);
}
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java?view=diff&rev=533183&r1=533182&r2=533183
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java Fri Apr 27 11:19:24 2007
@@ -94,10 +94,15 @@
XMLLayout xmlLayout = new XMLLayout();
xmlLayout.setLocationInfo(true);
root.addAppender(new FileAppender(xmlLayout, TEMP, false));
+
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
logger.trace("Message with embedded <![CDATA[<hello>hi</hello>]]>.");
logger.debug("Message with embedded <![CDATA[<hello>hi</hello>]]>.");
+ Thread.currentThread().setName(oldThreadName);
+
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -117,10 +122,17 @@
public void testNull() throws Exception {
XMLLayout xmlLayout = new XMLLayout();
root.addAppender(new FileAppender(xmlLayout, TEMP, false));
+
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
+
logger.debug("hi");
logger.debug(null);
Exception e = new Exception((String) null);
logger.debug("hi", e);
+
+ Thread.currentThread().setName(oldThreadName);
+
Transformer.transform(
TEMP, FILTERED,
new Filter[] { new LineNumberFilter(),
@@ -131,6 +143,9 @@
}
void common() {
+ String oldThreadName = Thread.currentThread().getName();
+ Thread.currentThread().setName("main");
+
int i = -1;
X x = new X();
@@ -159,6 +174,9 @@
logger.error("Message " + ++i, e);
root.error("Message " + i, e);
+
+
+ Thread.currentThread().setName(oldThreadName);
}
public static Test suite() {
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org