Parameterize JsonCompleteFileAppenderTest. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f8832e13 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f8832e13 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f8832e13
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: f8832e1339c73148f13effb0d7234b0c14b6e3c2 Parents: 6478f94 Author: Gary Gregory <ggreg...@apache.org> Authored: Thu Aug 4 22:15:28 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Thu Aug 4 22:15:28 2016 -0700 ---------------------------------------------------------------------- .../appender/JsonCompleteFileAppenderTest.java | 29 ++++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8832e13/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java index d8355a3..739e63f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java @@ -16,31 +16,48 @@ */ package org.apache.logging.log4j.core.appender; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector; +import org.apache.logging.log4j.core.selector.ContextSelector; import org.apache.logging.log4j.junit.CleanFiles; import org.apache.logging.log4j.junit.LoggerContextRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; - -import static org.junit.Assert.*; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; /** * Tests a "complete" JSON file. */ +@RunWith(Parameterized.class) public class JsonCompleteFileAppenderTest { - private final File logFile = new File("target", "JsonCompleteFileAppenderTest.log"); + public JsonCompleteFileAppenderTest(Class<ContextSelector> contextSelector) { + this.init = new LoggerContextRule("JsonCompleteFileAppenderTest.xml", contextSelector); + this.files = new CleanFiles(logFile); + this.chain = RuleChain.outerRule(files).around(init); + } - private final LoggerContextRule init = new LoggerContextRule("JsonCompleteFileAppenderTest.xml"); - private final CleanFiles files = new CleanFiles(logFile); + @Parameters(name = "{0}") + public static Class<?>[] getParameters() { + return new Class<?>[] { ClassLoaderContextSelector.class }; + } + + private final File logFile = new File("target", "JsonCompleteFileAppenderTest.log"); + private final LoggerContextRule init; + private final CleanFiles files; @Rule - public RuleChain chain = RuleChain.outerRule(files).around(init); + public RuleChain chain; @Test public void testFlushAtEndOfBatch() throws Exception {
