LOG4J2-1296 test should also expect ReusableParameterizedMessages
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/22da4fb4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/22da4fb4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/22da4fb4 Branch: refs/heads/LOG4J2-1278-gc-free-logger Commit: 22da4fb414efe31386762b64857f75dcd816cd0e Parents: e40a0d1 Author: rpopma <[email protected]> Authored: Fri Feb 26 03:49:16 2016 +0900 Committer: rpopma <[email protected]> Committed: Fri Feb 26 03:49:16 2016 +0900 ---------------------------------------------------------------------- .../src/test/java/org/apache/logging/log4j/core/LoggerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/22da4fb4/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 0574099..fbdaf86 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 @@ -41,6 +41,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.message.ParameterizedMessageFactory; +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; @@ -406,8 +407,8 @@ public class LoggerTest { Throwable thrown = event.getThrown(); assertNotNull("No throwable present in log event", thrown); Message msg = event.getMessage(); - assertTrue("Incorrect message type. Expected ParameterizedMessage, actual " + msg.getClass().getSimpleName(), - msg instanceof ParameterizedMessage); + assertTrue("Incorrect message type. Expected ParameterizedMessage/ReusableParameterizedMessage, actual " + msg.getClass().getSimpleName(), + msg instanceof ParameterizedMessage || msg instanceof ReusableParameterizedMessage); } }
