svn commit: r1593353 - /logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java

[ggregory]

Author: ggregory
Date: Thu May  8 17:55:05 2014
New Revision: 1593353

URL: http://svn.apache.org/r1593353
Log:
ThreadContext.clearAll() must be used from tests to avoid creating test 
failures due to test ordering. Also put the HTML in an ivar for easy debugging.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java?rev=1593353&r1=1593352&r2=1593353&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
 Thu May  8 17:55:05 2014
@@ -46,6 +46,7 @@ public class HTMLLayoutTest {
 
     @BeforeClass
     public static void setupClass() {
+        ThreadContext.clearAll();
         ConfigurationFactory.setConfigurationFactory(cf);
         final LoggerContext ctx = (LoggerContext) LogManager.getContext();
         ctx.reconfigure();
@@ -54,6 +55,7 @@ public class HTMLLayoutTest {
     @AfterClass
     public static void cleanupClass() {
         ConfigurationFactory.removeConfigurationFactory(cf);
+        ThreadContext.clearAll();
     }
 
     private static final String body = "<tr><td bgcolor=\"#993300\" 
style=\"color:White; font-size : small;\" 
colspan=\"6\">java.lang.NullPointerException: test";
@@ -126,12 +128,16 @@ public class HTMLLayoutTest {
         appender.stop();
 
         final List<String> list = appender.getMessages();
+        StringBuilder sb = new StringBuilder();
+        for (String string : list) {
+            sb.append(string);
+        }
+        String html = sb.toString();
         assertTrue("Incorrect number of lines. Require at least 85 " + 
list.size(), list.size() > 85);
         final String string = list.get(3);
         assertTrue("Incorrect header: " + string, string.equals("<meta 
charset=\"UTF-8\"/>"));
         assertTrue("Incorrect title", list.get(4).equals("<title>Log4j Log 
Messages</title>"));
         assertTrue("Incorrect footer", list.get(list.size() - 
1).equals("</body></html>"));
-        String html = list.toString();
         if (includeLocation) {
             assertTrue("Incorrect multiline", list.get(50).equals(multiLine));
             assertTrue("Missing location", 
html.contains("HTMLLayoutTest.java:"));