svn commit: r1595326 - /logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java

[ggregory]

Author: ggregory
Date: Fri May 16 19:56:14 2014
New Revision: 1595326

URL: http://svn.apache.org/r1595326
Log:
No need to fail if sleeping is interrupted, just go on and check assertions. 
Also, rename ivar.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java?rev=1595326&r1=1595325&r2=1595326&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
 Fri May 16 19:56:14 2014
@@ -79,7 +79,7 @@ public abstract class AbstractSocketServ
 
     private final String protocol;
 
-    private final Logger root = 
ctx.getLogger(AbstractSocketServerTest.class.getSimpleName());
+    private final Logger rootLogger = 
ctx.getLogger(AbstractSocketServerTest.class.getSimpleName());
 
     protected AbstractSocketServerTest(final String protocol, final String 
port, final boolean expectLengthException) {
         this.protocol = protocol;
@@ -103,10 +103,10 @@ public abstract class AbstractSocketServ
 
     @After
     public void tearDown() {
-        final Map<String, Appender> map = root.getAppenders();
+        final Map<String, Appender> map = rootLogger.getAppenders();
         for (final Map.Entry<String, Appender> entry : map.entrySet()) {
             final Appender appender = entry.getValue();
-            root.removeAppender(appender);
+            rootLogger.removeAppender(appender);
             appender.stop();
         }
     }
@@ -181,14 +181,18 @@ public abstract class AbstractSocketServ
         serverLogger.setAdditive(false);
 
         // set appender on root and set level to debug
-        root.addAppender(appender);
-        root.addAppender(listApp);
-        root.setAdditive(false);
-        root.setLevel(Level.DEBUG);
+        rootLogger.addAppender(appender);
+        rootLogger.addAppender(listApp);
+        rootLogger.setAdditive(false);
+        rootLogger.setLevel(Level.DEBUG);
         for (final String message : messages) {
-            root.debug(message);
+            rootLogger.debug(message);
+        }
+        try {
+            Thread.sleep(2000);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        Thread.sleep(2000);
         final List<LogEvent> events = listApp.getEvents();
         assertNotNull("No event retrieved", events);
         assertEquals("Incorrect number of events received", messages.length, 
events.size());