You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/10/21 16:48:43 UTC
[21/27] logging-log4j2 git commit: Use LoggerContextRule to simplify
test.
Use LoggerContextRule to simplify test.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/96c38036
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/96c38036
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/96c38036
Branch: refs/heads/LOG4J2-323-493-1159-AsyncMemLeak
Commit: 96c38036801622e9af283349d6d7abc66b5b8277
Parents: 080ce0f
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Oct 21 02:04:47 2015 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Oct 21 02:04:47 2015 -0500
----------------------------------------------------------------------
.../log4j/core/appender/AsyncAppenderTest.java | 32 +++++++-------------
1 file changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96c38036/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
index 895e649..7a86e48 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
@@ -17,17 +17,15 @@
package org.apache.logging.log4j.core.appender;
import java.util.List;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LoggingException;
-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.status.StatusLogger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -37,23 +35,15 @@ import static org.junit.Assert.*;
*/
public class AsyncAppenderTest {
private static final String CONFIG = "log4j-asynch.xml";
- private static Configuration config;
- private static ListAppender listAppender;
- private static LoggerContext ctx;
- @BeforeClass
- public static void setupClass() {
- System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- ctx = LoggerContext.getContext(false);
- config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
- }
+ @ClassRule
+ public static LoggerContextRule context = new LoggerContextRule(CONFIG);
+
+ private ListAppender listAppender;
- @AfterClass
- public static void cleanupClass() {
- System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
- ctx.reconfigure();
- StatusLogger.getLogger().reset();
+ @Before
+ public void before() throws Exception {
+ listAppender = context.getListAppender("List");
}
@After