logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mattsic...@apache.org
Subject svn commit: r1582173 - /logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
Date Thu, 27 Mar 2014 03:40:34 GMT
Author: mattsicker
Date: Thu Mar 27 03:40:33 2014
New Revision: 1582173

URL: http://svn.apache.org/r1582173
Log:
Update to use InitialLoggerContext rule.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java?rev=1582173&r1=1582172&r2=1582173&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
Thu Mar 27 03:40:33 2014
@@ -21,53 +21,40 @@ import static org.junit.Assert.assertTru
 
 import java.io.File;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.logging.log4j.EventLogger;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.junit.CleanFiles;
+import org.apache.logging.log4j.junit.InitialLoggerContext;
 import org.apache.logging.log4j.message.StructuredDataMessage;
-import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  *
  */
 public class RoutingAppenderTest {
     private static final String CONFIG = "log4j-routing.xml";
-    private static Configuration config;
-    private static ListAppender app;
-    private static LoggerContext ctx;
-
-    @BeforeClass
-    public static void setupClass() {
-        System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
-        ctx = (LoggerContext) LogManager.getContext(false);
-        config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet())
{
-            if (entry.getKey().equals("List")) {
-                app = (ListAppender) entry.getValue();
-                break;
-            }
-        }
-        final File file = new File("target/rolling1/rollingtest-Unknown.log");
-        file.delete();
+    private static final String UNKNOWN_LOG_FILE = "target/rolling1/rollingtest-Unknown.log";
+    private static final String ALERT_LOG_FILE = "target/routing1/routingtest-Alert.log";
+    private static final String ACTIVITY_LOG_FILE = "target/routing1/routingtest-Activity.log";
+
+    private ListAppender app;
+
+    @Rule
+    public InitialLoggerContext init = new InitialLoggerContext(CONFIG);
+
+    @Rule
+    public CleanFiles files = new CleanFiles(UNKNOWN_LOG_FILE, ALERT_LOG_FILE, ACTIVITY_LOG_FILE);
+
+    @Before
+    public void setUp() throws Exception {
+        this.app = (ListAppender) this.init.getAppender("List");
     }
 
-    @AfterClass
-    public static void cleanupClass() {
-        System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
-        ctx.reconfigure();
-        StatusLogger.getLogger().reset();
-        final File file = new File("target/rolling1/rollingtest-Unknown.log");
-        file.delete();
+    @After
+    public void tearDown() throws Exception {
+        this.app.clear();
     }
 
     @Test
@@ -79,11 +66,11 @@ public class RoutingAppenderTest {
         assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size()
== 1);
         msg = new StructuredDataMessage("Test", "This is a test", "Alert");
         EventLogger.logEvent(msg);
-        File file = new File("target/routing1/routingtest-Alert.log");
+        File file = new File(ALERT_LOG_FILE);
         assertTrue("Alert file was not created", file.exists());
         msg = new StructuredDataMessage("Test", "This is a test", "Activity");
         EventLogger.logEvent(msg);
-        file = new File("target/routing1/routingtest-Activity.log");
+        file = new File(ACTIVITY_LOG_FILE);
         assertTrue("Activity file was not created", file.exists());
     }
 }



Mime
View raw message