Fix MapMessageTest
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a23a4859 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a23a4859 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a23a4859 Branch: refs/heads/master Commit: a23a48590e610cdf1dc2a4ef49e7a324809beed8 Parents: 2b93414 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sat Nov 11 22:31:37 2017 +0100 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sat Nov 11 22:31:37 2017 +0100 ---------------------------------------------------------------------- .../logging/log4j/message/MapMessageTest.java | 23 +++++++++----------- .../logging/log4j/message/ObjectMapMessage.java | 22 +++++++++++++++++++ 2 files changed, 32 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23a4859/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java index 61fda91..a64e6bd 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/MapMessageTest.java @@ -19,9 +19,6 @@ package org.apache.logging.log4j.message; import org.apache.logging.log4j.util.StringBuilderFormattable; import org.junit.Test; -import java.util.HashMap; -import java.util.Map; - import static org.junit.Assert.*; /** @@ -128,7 +125,7 @@ public class MapMessageTest { @Test public void testGetNonStringValue() { final String key = "Key"; - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with(key, 1L); assertEquals("1", msg.get(key)); } @@ -136,14 +133,14 @@ public class MapMessageTest { @Test public void testRemoveNonStringValue() { final String key = "Key"; - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with(key, 1L); assertEquals("1", msg.remove(key)); } @Test public void testJSONFormatNonStringValue() { - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with("key", 1L); final String result = msg.getFormattedMessage(new String[]{"JSON"}); final String expected = "{\"key\":\"1\"}"; @@ -152,7 +149,7 @@ public class MapMessageTest { @Test public void testXMLFormatNonStringValue() { - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with("key", 1L); final String result = msg.getFormattedMessage(new String[]{"XML"}); final String expected = "<Map>\n <Entry key=\"key\">1</Entry>\n</Map>"; @@ -161,7 +158,7 @@ public class MapMessageTest { @Test public void testFormatToUsedInOutputXml() { - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with("key", new FormattableTestType()); final String result = msg.getFormattedMessage(new String[]{"XML"}); final String expected = "<Map>\n <Entry key=\"key\">formatTo</Entry>\n</Map>"; @@ -170,7 +167,7 @@ public class MapMessageTest { @Test public void testFormatToUsedInOutputJson() { - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with("key", new FormattableTestType()); final String result = msg.getFormattedMessage(new String[]{"JSON"}); final String expected = "{\"key\":\"formatTo\"}"; @@ -179,7 +176,7 @@ public class MapMessageTest { @Test public void testFormatToUsedInOutputJava() { - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with("key", new FormattableTestType()); final String result = msg.getFormattedMessage(new String[]{"JAVA"}); final String expected = "{key=\"formatTo\"}"; @@ -188,7 +185,7 @@ public class MapMessageTest { @Test public void testFormatToUsedInOutputDefault() { - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with("key", new FormattableTestType()); final String result = msg.getFormattedMessage(null); final String expected = "key=\"formatTo\""; @@ -198,7 +195,7 @@ public class MapMessageTest { @Test public void testGetUsesDeepToString() { final String key = "key"; - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with(key, new FormattableTestType()); final String result = msg.get(key); final String expected = "formatTo"; @@ -208,7 +205,7 @@ public class MapMessageTest { @Test public void testRemoveUsesDeepToString() { final String key = "key"; - final MapMessage<?, Object> msg = new MapMessage<>() + final ObjectMapMessage msg = new ObjectMapMessage() .with(key, new FormattableTestType()); final String result = msg.remove(key); final String expected = "formatTo"; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a23a4859/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMapMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMapMessage.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMapMessage.java new file mode 100644 index 0000000..83716f7 --- /dev/null +++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ObjectMapMessage.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ + +package org.apache.logging.log4j.message; + +class ObjectMapMessage extends MapMessage<ObjectMapMessage, Object> { + +}
