diff options
Diffstat (limited to 'gson/src/test/java')
4 files changed, 196 insertions, 2 deletions
diff --git a/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java b/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java index 85ecfea4..f1740ac1 100644 --- a/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java +++ b/gson/src/test/java/org/onap/policy/common/gson/GsonMessageBodyHandlerTest.java @@ -26,10 +26,11 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.core.MediaType; import org.junit.Before; import org.junit.Test; -import org.onap.policy.common.gson.GsonMessageBodyHandler; public class GsonMessageBodyHandlerTest { private static final String GEN_TYPE = "some-type"; @@ -136,6 +137,30 @@ public class GsonMessageBodyHandlerTest { assertEquals(obj1.toString(), obj2.toString()); } + @Test + public void testMapDouble() throws Exception { + MyMap map = new MyMap(); + map.props = new HashMap<>(); + map.props.put("plainString", "def"); + map.props.put("negInt", -10); + map.props.put("doubleVal", 12.5); + map.props.put("posLong", 100000000000L); + + ByteArrayOutputStream outstr = new ByteArrayOutputStream(); + hdlr.writeTo(map, map.getClass(), map.getClass(), null, null, null, outstr); + + Object obj2 = hdlr.readFrom(Object.class, map.getClass(), null, null, null, + new ByteArrayInputStream(outstr.toByteArray())); + assertEquals(map.toString(), obj2.toString()); + + map = (MyMap) obj2; + + assertEquals(-10, map.props.get("negInt")); + assertEquals(100000000000L, map.props.get("posLong")); + assertEquals(12.5, map.props.get("doubleVal")); + } + + public static class MyObject { private int id; @@ -153,4 +178,12 @@ public class GsonMessageBodyHandlerTest { } } + private static class MyMap { + private Map<String, Object> props; + + @Override + public String toString() { + return props.toString(); + } + } } diff --git a/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java b/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java index 5a49a403..18a6fc73 100644 --- a/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java +++ b/gson/src/test/java/org/onap/policy/common/gson/JacksonHandlerTest.java @@ -34,7 +34,6 @@ import java.util.Map; import java.util.TreeMap; import javax.ws.rs.core.MediaType; import org.junit.Test; -import org.onap.policy.common.gson.JacksonHandler; import org.onap.policy.common.gson.annotation.GsonJsonAnyGetter; import org.onap.policy.common.gson.annotation.GsonJsonAnySetter; @@ -83,6 +82,30 @@ public class JacksonHandlerTest { assertEquals(data.toString(), data2.toString()); } + @Test + public void testMapDouble() throws Exception { + MyMap map = new MyMap(); + map.props = new HashMap<>(); + map.props.put("plainString", "def"); + map.props.put("negInt", -10); + map.props.put("doubleVal", 12.5); + map.props.put("posLong", 100000000000L); + + JacksonHandler hdlr = new JacksonHandler(); + ByteArrayOutputStream outstr = new ByteArrayOutputStream(); + hdlr.writeTo(map, map.getClass(), map.getClass(), null, null, null, outstr); + + Object obj2 = hdlr.readFrom(Object.class, map.getClass(), null, null, null, + new ByteArrayInputStream(outstr.toByteArray())); + assertEquals(map.toString(), obj2.toString()); + + map = (MyMap) obj2; + + assertEquals(-10, map.props.get("negInt")); + assertEquals(100000000000L, map.props.get("posLong")); + assertEquals(12.5, map.props.get("doubleVal")); + } + /** * This class includes all policy-specific gson annotations. */ @@ -112,6 +135,7 @@ public class JacksonHandlerTest { /** * Sets a property. + * * @param name property name * @param value new value */ @@ -129,4 +153,23 @@ public class JacksonHandlerTest { return "Data [id=" + id + ", value=" + value + ", props=" + props + "]"; } } + + private static class MyMap { + private Map<String, Object> props; + + @Override + public String toString() { + return props.toString(); + } + + @SuppressWarnings("unused") + public Map<String, Object> getProps() { + return props; + } + + @SuppressWarnings("unused") + public void setProps(Map<String, Object> props) { + this.props = props; + } + } } diff --git a/gson/src/test/java/org/onap/policy/common/gson/MapDoubleAdapterFactoryTest.java b/gson/src/test/java/org/onap/policy/common/gson/MapDoubleAdapterFactoryTest.java new file mode 100644 index 00000000..7171d262 --- /dev/null +++ b/gson/src/test/java/org/onap/policy/common/gson/MapDoubleAdapterFactoryTest.java @@ -0,0 +1,117 @@ +/* + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.common.gson; + +import static org.junit.Assert.assertEquals; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import org.junit.Test; + +public class MapDoubleAdapterFactoryTest { + private static Gson gson = new GsonBuilder().registerTypeAdapterFactory(new MapDoubleAdapterFactory()).create(); + + @Test + @SuppressWarnings("unchecked") + public void test() { + MyMap map = new MyMap(); + map.props = new HashMap<>(); + map.props.put("plainString", "def"); + map.props.put("posInt", 10); + map.props.put("negInt", -10); + map.props.put("doubleVal", 12.5); + map.props.put("posLong", 100000000000L); + map.props.put("negLong", -100000000000L); + + Map<String, Object> nested = new LinkedHashMap<>(); + map.props.put("nestedMap", nested); + nested.put("nestedString", "world"); + nested.put("nestedInt", 50); + + String json = gson.toJson(map); + + map.props.clear(); + map = gson.fromJson(json, MyMap.class); + + assertEquals(json, gson.toJson(map)); + + assertEquals(10, map.props.get("posInt")); + assertEquals(-10, map.props.get("negInt")); + assertEquals(100000000000L, map.props.get("posLong")); + assertEquals(-100000000000L, map.props.get("negLong")); + assertEquals(12.5, map.props.get("doubleVal")); + assertEquals(nested, map.props.get("nestedMap")); + + nested = (Map<String, Object>) map.props.get("nestedMap"); + assertEquals(50, nested.get("nestedInt")); + } + + @Test + public void test_ValueIsNotObject() { + MyDoubleMap map = new MyDoubleMap(); + map.props = new LinkedHashMap<>(); + map.props.put("plainDouble", 13.5); + map.props.put("doubleAsInt", 100.0); + + String json = gson.toJson(map); + + map.props.clear(); + map = gson.fromJson(json, MyDoubleMap.class); + + // everything should still be Double - check by simply accessing + map.props.get("plainDouble"); + map.props.get("doubleAsInt"); + } + + @Test + public void test_KeyIsNotString() { + MyObjectMap map = new MyObjectMap(); + + map.props = new LinkedHashMap<>(); + map.props.put("plainDouble2", 14.5); + map.props.put("doubleAsInt2", 200.0); + + String json = gson.toJson(map); + + map.props.clear(); + map = gson.fromJson(json, MyObjectMap.class); + + // everything should still be Double + assertEquals(14.5, map.props.get("plainDouble2")); + assertEquals(200.0, map.props.get("doubleAsInt2")); + } + + private static class MyMap { + private Map<String, Object> props; + } + + private static class MyDoubleMap { + private Map<String, Double> props; + } + + private static class MyObjectMap { + private Map<Object, Object> props; + } + +} diff --git a/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java b/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java index d0f0b1ec..2799d8ba 100644 --- a/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java +++ b/gson/src/test/java/org/onap/policy/common/gson/internal/DataAdapterFactory.java @@ -258,6 +258,7 @@ public class DataAdapterFactory implements TypeAdapterFactory { return data; } } + /** * Adapter for "DerivedData". */ |