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 2016/03/31 14:51:03 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1278 fixed test to take into
account that message factory may be wrapped with a MessageFactory2Adapter
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 <rp...@apache.org>
Authored: Thu Mar 31 21:44:17 2016 +0900
Committer: rpopma <rp...@apache.org>
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());
[2/2] logging-log4j2 git commit: LOG4J2-1278 fixed test to take into
account that message factory may be wrapped with a MessageFactory2Adapter
Posted by rp...@apache.org.
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/202f0f73
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/202f0f73
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/202f0f73
Branch: refs/heads/master
Commit: 202f0f73eb514a9e6ff3364261eab587b113b063
Parents: 7b83e51
Author: rpopma <rp...@apache.org>
Authored: Thu Mar 31 21:51:10 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Mar 31 21:51:10 2016 +0900
----------------------------------------------------------------------
.../logging/log4j/taglib/SetLoggerTagTest.java | 23 +++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/202f0f73/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/SetLoggerTagTest.java
----------------------------------------------------------------------
diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/SetLoggerTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/SetLoggerTagTest.java
index c2742c4..022ea58 100644
--- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/SetLoggerTagTest.java
+++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/SetLoggerTagTest.java
@@ -20,8 +20,11 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.Tag;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.MessageFactory;
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.Test;
import org.springframework.mock.web.MockPageContext;
@@ -97,7 +100,7 @@ public class SetLoggerTagTest {
final Log4jTaglibLogger logger = (Log4jTaglibLogger)attribute;
assertEquals("The logger name is not correct.", "testDoEndTagStringFactoryVarPageScope", logger.getName());
- assertSame("The message factory is not correct.", factory, logger.getMessageFactory());
+ checkMessageFactory("The message factory is not correct.", factory, logger);
}
@Test
@@ -159,7 +162,21 @@ public class SetLoggerTagTest {
final Log4jTaglibLogger logger = (Log4jTaglibLogger)attribute;
assertEquals("The logger name is not correct.", "testDoEndTagStringFactoryVarApplicationScope",
logger.getName());
- assertSame("The message factory is not correct.", factory, logger.getMessageFactory());
+ checkMessageFactory("The message factory is not correct.", factory, logger);
+ }
+
+ private static void checkMessageFactory(final String msg, final MessageFactory messageFactory1,
+ final Logger testLogger1) {
+ if (messageFactory1 == null) {
+ assertEquals(msg, AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS,
+ testLogger1.getMessageFactory().getClass());
+ } else {
+ MessageFactory actual = testLogger1.getMessageFactory();
+ if (actual instanceof MessageFactory2Adapter) {
+ actual = ((MessageFactory2Adapter) actual).getOriginal();
+ }
+ assertEquals(msg, messageFactory1, actual);
+ }
}
@Test
@@ -200,6 +217,6 @@ public class SetLoggerTagTest {
final Log4jTaglibLogger logger = TagUtils.getDefaultLogger(this.context);
assertNotNull("The default logger should not be null anymore.", logger);
assertEquals("The logger name is not correct.", "testDoEndTagStringFactoryDefault", logger.getName());
- assertSame("The message factory is not correct.", factory, logger.getMessageFactory());
+ checkMessageFactory("The message factory is not correct.", factory, logger);
}
}