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/28 14:34:26 UTC
logging-log4j2 git commit: LOG4J2-1278 fix broken unit tests
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1278-gc-free-logger e6300b025 -> bf12a5a4c
LOG4J2-1278 fix broken unit tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bf12a5a4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bf12a5a4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bf12a5a4
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: bf12a5a4cd5390bd1f6e2278304f864d25b6e2bf
Parents: e6300b0
Author: rpopma <rp...@apache.org>
Authored: Mon Mar 28 21:34:30 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Mar 28 21:34:30 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/spi/MessageFactory2Adapter.java | 4 ++++
.../java/org/apache/logging/log4j/AbstractLoggerTest.java | 3 ++-
.../test/java/org/apache/logging/log4j/core/LoggerTest.java | 7 ++++++-
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bf12a5a4/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
index d516dbf..2581b6c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
@@ -34,6 +34,10 @@ public class MessageFactory2Adapter implements MessageFactory2 {
this.wrapped = Objects.requireNonNull(wrapped);
}
+ public MessageFactory getOriginal() {
+ return wrapped;
+ }
+
@Override
public Message newMessage(final String message, final Object p0) {
return wrapped.newMessage(message, p0);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bf12a5a4/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
index 5a416c7..616772f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.MessageFactory2Adapter;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class AbstractLoggerTest extends AbstractLogger {
modifierField.setAccessible(true);
modifierField.setInt(field, field.getModifiers() &~ Modifier.FINAL); // make non-private
- field.set(this, ParameterizedMessageFactory.INSTANCE);
+ field.set(this, new MessageFactory2Adapter(ParameterizedMessageFactory.INSTANCE));
}
private static class LogEvent {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bf12a5a4/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
index fbdaf86..7ba6a89 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
@@ -45,6 +45,7 @@ import org.apache.logging.log4j.message.ReusableParameterizedMessage;
import org.apache.logging.log4j.message.StringFormatterMessageFactory;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.spi.AbstractLogger;
+import org.apache.logging.log4j.spi.MessageFactory2Adapter;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Before;
import org.junit.Rule;
@@ -289,7 +290,11 @@ public class LoggerTest {
if (messageFactory1 == null) {
assertEquals(AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS, testLogger1.getMessageFactory().getClass());
} else {
- assertEquals(messageFactory1, testLogger1.getMessageFactory());
+ MessageFactory actual = testLogger1.getMessageFactory();
+ if (actual instanceof MessageFactory2Adapter) {
+ actual = ((MessageFactory2Adapter) actual).getOriginal();
+ }
+ assertEquals(messageFactory1, actual);
}
}