Repository: logging-log4j2 Updated Branches: refs/heads/master 78681540d -> 202f0f73e
LOG4J2-1278 fixed test to take into account that message factory may be wrapped with a MessageFactory2Adapter Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7b83e517 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7b83e517 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7b83e517 Branch: refs/heads/master Commit: 7b83e5171861136ec6aa67c166bebe1c5752946b Parents: 7868154 Author: rpopma <[email protected]> Authored: Thu Mar 31 21:44:17 2016 +0900 Committer: rpopma <[email protected]> Committed: Thu Mar 31 21:44:17 2016 +0900 ---------------------------------------------------------------------- .../java/org/apache/logging/slf4j/LoggerTest.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b83e517/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java ---------------------------------------------------------------------- diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java index fb30a1b..c061782 100644 --- a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java +++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java @@ -28,6 +28,8 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.ParameterizedMessageFactory; import org.apache.logging.log4j.message.StringFormatterMessageFactory; +import org.apache.logging.log4j.spi.AbstractLogger; +import org.apache.logging.log4j.spi.MessageFactory2Adapter; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -118,12 +120,24 @@ public class LoggerTest { private Logger testMessageFactoryMismatch(final String name, final MessageFactory messageFactory1, final MessageFactory messageFactory2) { final Logger testLogger = LogManager.getLogger(name, messageFactory1); assertThat(testLogger, is(notNullValue())); - assertThat(testLogger.getMessageFactory(), equalTo(messageFactory1)); + checkMessageFactory(messageFactory1, testLogger); final Logger testLogger2 = LogManager.getLogger(name, messageFactory2); - assertThat(testLogger2.getMessageFactory(), equalTo(messageFactory1)); + checkMessageFactory(messageFactory1, testLogger2); return testLogger; } + private static void checkMessageFactory(final MessageFactory messageFactory1, final Logger testLogger1) { + if (messageFactory1 == null) { + assertEquals(AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS, testLogger1.getMessageFactory().getClass()); + } else { + MessageFactory actual = testLogger1.getMessageFactory(); + if (actual instanceof MessageFactory2Adapter) { + actual = ((MessageFactory2Adapter) actual).getOriginal(); + } + assertEquals(messageFactory1, actual); + } + } + @Test public void debugObject() { logger.debug(new Date());
