LOG4J2-1447 LogEvent test updates for ContextData changes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a414da42 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a414da42 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a414da42 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: a414da427ca7ebffaeefb92186dc4b257e87c267 Parents: 42d6b91 Author: rpopma <[email protected]> Authored: Wed Jul 27 01:24:22 2016 +0900 Committer: rpopma <[email protected]> Committed: Wed Jul 27 01:24:22 2016 +0900 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/layout/LogEventFixtures.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a414da42/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java index eb1a6c2..f210bca 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java @@ -25,6 +25,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.impl.ArrayContextData; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.impl.ThrowableProxy; import org.apache.logging.log4j.message.SimpleMessage; @@ -80,9 +81,10 @@ class LogEventFixtures { return expected; } - static void assertEqualLogEvents(final LogEvent expected, final LogEvent actual, final boolean includeSource, + static void assertEqualLogEvents(final LogEvent expected, final LogEvent actual, final boolean includeSource, final boolean includeContext) { assertEquals(expected.getClass(), actual.getClass()); + assertEquals(includeContext ? expected.getContextData() : new ArrayContextData(), actual.getContextData()); assertEquals(includeContext ? expected.getContextMap() : Collections.EMPTY_MAP, actual.getContextMap()); assertEquals(expected.getContextStack(), actual.getContextStack()); assertEquals(expected.getLevel(), actual.getLevel());
