Repository: logging-log4j2 Updated Branches: refs/heads/master 59c465dc2 -> a05e53671
[LOG4J2-2179] The MongoDB Appender should use keys and values from a Log4j MapMessage. Fix up mocks. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a05e5367 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a05e5367 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a05e5367 Branch: refs/heads/master Commit: a05e5367163d746c0ee97adebba99faf14653e28 Parents: 59c465d Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Jan 10 23:33:58 2018 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Jan 10 23:33:58 2018 -0700 ---------------------------------------------------------------------- .../db/AbstractDatabaseAppenderTest.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a05e5367/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java index c21311a..f5192ae 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java @@ -16,6 +16,17 @@ */ package org.apache.logging.log4j.core.appender.db; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.ArgumentMatchers.same; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.then; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; + +import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.core.Filter; @@ -25,13 +36,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import static org.junit.Assert.*; -import static org.mockito.ArgumentMatchers.same; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.then; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; - @RunWith(MockitoJUnitRunner.class) public class AbstractDatabaseAppenderTest { private LocalAbstractDatabaseAppender appender; @@ -95,20 +99,20 @@ public class AbstractDatabaseAppenderTest { appender.append(event1); then(manager).should().connectAndStart(); - then(manager).should().writeInternal(same(event1), null); + then(manager).should().writeInternal(same(event1), (Serializable) isNull()); then(manager).should().commitAndClose(); reset(manager); appender.append(event2); then(manager).should().connectAndStart(); - then(manager).should().writeInternal(same(event2), null); + then(manager).should().writeInternal(same(event2), (Serializable) isNull()); then(manager).should().commitAndClose(); } private static abstract class LocalAbstractDatabaseManager extends AbstractDatabaseManager { public LocalAbstractDatabaseManager(final String name, final int bufferSize) { - super(name, bufferSize); + super(name, bufferSize; } }
