Update tests to use ILC.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/260a4a01 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/260a4a01 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/260a4a01 Branch: refs/heads/master Commit: 260a4a0180d684c704263bf9750f82264ecf4d5c Parents: ee9a055 Author: Matt Sicker <[email protected]> Authored: Sat Oct 4 10:54:23 2014 -0500 Committer: Matt Sicker <[email protected]> Committed: Sat Oct 4 10:56:03 2014 -0500 ---------------------------------------------------------------------- .../org/apache/logging/slf4j/OptionalTest.java | 43 ++++---------------- .../org/apache/logging/slf4j/SerializeTest.java | 25 ++---------- 2 files changed, 13 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/260a4a01/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java index def24f4..587c032 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java @@ -17,18 +17,12 @@ package org.apache.logging.slf4j; import java.util.List; -import java.util.Map; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.util.Constants; -import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.junit.InitialLoggerContext; import org.apache.logging.log4j.test.appender.ListAppender; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.ClassRule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,22 +38,9 @@ import static org.junit.Assert.*; public class OptionalTest { private static final String CONFIG = "log4j-test1.xml"; - private static LoggerContext ctx; - @BeforeClass - public static void setupClass() { - System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); - ctx = (LoggerContext) LogManager.getContext(false); - ctx.reconfigure(); - ctx.getConfiguration(); - } - - @AfterClass - public static void cleanupClass() { - System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY); - ctx.reconfigure(); - StatusLogger.getLogger().reset(); - } + @ClassRule + public static final InitialLoggerContext CTX = new InitialLoggerContext(CONFIG); Logger logger = LoggerFactory.getLogger("EventLogger"); Marker marker = MarkerFactory.getMarker("EVENT"); @@ -72,23 +53,17 @@ public class OptionalTest { } private void verify(final String name, final String expected) { - //LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - final Appender listApp = ctx.getConfiguration().getAppender(name); - assertNotNull("Missing Appender", listApp); - assertTrue("Not a ListAppender", listApp instanceof ListAppender); - final List<String> events = ((ListAppender) listApp).getMessages(); + final ListAppender listApp = CTX.getListAppender(name); + final List<String> events = listApp.getMessages(); assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1); final String actual = events.get(0); assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual); - ((ListAppender) listApp).clear(); + listApp.clear(); } @Before public void cleanup() { - final Map<String, Appender> map = ctx.getConfiguration().getAppenders(); - final Appender listApp = map.get("List"); - ((ListAppender) listApp).clear(); - final Appender eventApp = map.get("EventLogger"); - ((ListAppender) eventApp).clear(); + CTX.getListAppender("List").clear(); + CTX.getListAppender("EventLogger").clear(); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/260a4a01/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java index 0ecc493..f44d8ac 100644 --- a/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java +++ b/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java @@ -21,12 +21,8 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.status.StatusLogger; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.apache.logging.log4j.junit.InitialLoggerContext; +import org.junit.ClassRule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,22 +38,9 @@ public class SerializeTest { private static final String CONFIG = "log4j-test1.xml"; - private static LoggerContext ctx; - @BeforeClass - public static void setupClass() { - System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG); - ctx = (LoggerContext) LogManager.getContext(false); - ctx.reconfigure(); - ctx.getConfiguration(); - } - - @AfterClass - public static void cleanupClass() { - System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY); - ctx.reconfigure(); - StatusLogger.getLogger().reset(); - } + @ClassRule + public static final InitialLoggerContext CTX = new InitialLoggerContext(CONFIG); Logger logger = LoggerFactory.getLogger("LoggerTest"); XLogger xlogger = XLoggerFactory.getXLogger("LoggerTest");
