Repository: logging-log4j2 Updated Branches: refs/heads/master ca2a888e7 -> 29fe29c01
Fix XmlCompleteFileAppenderTest and some better names. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/29fe29c0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/29fe29c0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/29fe29c0 Branch: refs/heads/master Commit: 29fe29c01f511db578d5435bc1425efa89d3c9c4 Parents: ca2a888 Author: Gary Gregory <[email protected]> Authored: Fri Aug 5 12:12:54 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Fri Aug 5 12:12:54 2016 -0700 ---------------------------------------------------------------------- .../core/appender/JsonCompleteFileAppenderTest.java | 6 +++--- .../core/appender/XmlCompleteFileAppenderTest.java | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/29fe29c0/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 4548521..b184421 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 @@ -63,10 +63,10 @@ public class JsonCompleteFileAppenderTest { @Test public void testFlushAtEndOfBatch() throws Exception { - final Logger log = this.loggerContextRule.getLogger("com.foo.Bar"); + final Logger logger = this.loggerContextRule.getLogger("com.foo.Bar"); final String logMsg = "Message flushed with immediate flush=true"; - log.info(logMsg); - log.error(logMsg, new IllegalArgumentException("badarg")); + logger.info(logMsg); + logger.error(logMsg, new IllegalArgumentException("badarg")); this.loggerContextRule.getContext().stop(); // stops async thread String line1; String line2; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/29fe29c0/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java index ab4d79f..9111825 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java @@ -16,6 +16,10 @@ */ package org.apache.logging.log4j.core.appender; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -24,13 +28,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.CoreLoggerContexts; import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.selector.BasicContextSelector; 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.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; @@ -38,8 +40,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import static org.junit.Assert.*; - /** * Tests a "complete" XML file a.k.a. a well-formed XML file. */ @@ -66,11 +66,9 @@ public class XmlCompleteFileAppenderTest { @Test public void testFlushAtEndOfBatch() throws Exception { - // System.out.println(f.getAbsolutePath()); - logFile.delete(); - final Logger log = LogManager.getLogger("com.foo.Bar"); + final Logger logger = this.loggerContextRule.getLogger("com.foo.Bar"); final String logMsg = "Message flushed with immediate flush=false"; - log.info(logMsg); + logger.info(logMsg); CoreLoggerContexts.stopLoggerContext(false, logFile); // stop async thread String line1;
