You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/03/27 04:51:12 UTC
svn commit: r1582175 -
/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
Author: mattsicker
Date: Thu Mar 27 03:51:12 2014
New Revision: 1582175
URL: http://svn.apache.org/r1582175
Log:
Update to use InitialLoggerContext rule.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java?rev=1582175&r1=1582174&r2=1582175&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java Thu Mar 27 03:51:12 2014
@@ -21,53 +21,37 @@ 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 RoutingDefaultAppenderTest {
- private static final String CONFIG = "log4j-routing3.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/routingtest.log");
- file.delete();
+ private static final String LOG_FILE = "target/routing1/routingtest.log";
+
+ private ListAppender app;
+
+ @Rule
+ public InitialLoggerContext init = new InitialLoggerContext("log4j-routing3.xml");
+
+ @Rule
+ public CleanFiles files = new CleanFiles(LOG_FILE);
+
+ @Before
+ public void setUp() throws Exception {
+ 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/routingtest.log");
- file.delete();
+ @After
+ public void tearDown() throws Exception {
+ app.clear();
}
@Test
@@ -79,7 +63,7 @@ public class RoutingDefaultAppenderTest
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.log");
+ File file = new File(LOG_FILE);
assertTrue("Alert file was not created", file.exists());
}
}