Repository: logging-log4j2 Updated Branches: refs/heads/master 38107ecee -> 188705000
LOG4J2-1176: fix broken JUnit tests that expect certain names for DefaultConfiguration and default ConsoleAppender Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/18870500 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/18870500 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/18870500 Branch: refs/heads/master Commit: 1887050006778fd40b79d2574c11b334fd1eba10 Parents: 38107ec Author: rpopma <rpo...@apache.org> Authored: Mon Nov 2 00:39:40 2015 +0900 Committer: rpopma <rpo...@apache.org> Committed: Mon Nov 2 00:39:40 2015 +0900 ---------------------------------------------------------------------- .../apache/logging/log4j/core/config/MissingRootLoggerTest.java | 4 ++-- .../org/apache/logging/log4j/core/config/TestConfigurator.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/18870500/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java index 964f7fd..60aa0d9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java @@ -55,7 +55,7 @@ public class MissingRootLoggerTest { assertNotNull("Appenders not null", map); assertThat("There should only be two appenders", map, hasSize(2)); assertThat(map, hasKey("List")); - assertThat(map, hasKey("Console")); + assertThat(map, hasKey("DefaultConsole-2")); final Map<String, LoggerConfig> loggerMap = config.getLoggers(); assertNotNull("loggerMap not null", loggerMap); @@ -74,7 +74,7 @@ public class MissingRootLoggerTest { final Map<String, Appender> rootAppenders = root.getAppenders(); assertThat("The root logger should only have one appender", rootAppenders, hasSize(1)); // root only has Console appender! - assertThat("The root appender should be a ConsoleAppender", rootAppenders, hasKey("Console")); + assertThat("The root appender should be a ConsoleAppender", rootAppenders, hasKey("DefaultConsole-2")); assertEquals(Level.ERROR, root.getLevel()); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/18870500/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java index 30b8115..51de833 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java @@ -290,7 +290,8 @@ public class TestConfigurator { LogManager.getLogger("org.apache.test.TestConfigurator"); final Configuration config = ctx.getConfiguration(); assertNotNull("No configuration", config); - assertEquals("Unexpected Configuration.", DefaultConfiguration.DEFAULT_NAME, config.getName()); + final String name = DefaultConfiguration.DEFAULT_NAME + "@" + Integer.toHexString(config.hashCode()); + assertEquals("Unexpected Configuration.", name, config.getName()); } @Test
