diff options
Diffstat (limited to 'aai-core')
| -rw-r--r-- | aai-core/pom.xml | 23 | ||||
| -rw-r--r-- | aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java | 85 |
2 files changed, 69 insertions, 39 deletions
diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 4715bcf6..6ba76996 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -45,10 +45,11 @@ <eelf.core.version>1.0.0</eelf.core.version> <logback.version>1.2.3</logback.version> <freemarker.version>2.3.21</freemarker.version> - <activemq.version>5.15.3</activemq.version> + <activemq.version>5.15.6</activemq.version> <jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit> <gremlin.version>3.2.2</gremlin.version> - <jetty.version>9.4.6.v20170531</jetty.version> + <groovy.version>2.4.15</groovy.version> + <jetty.version>9.4.11.v20180605</jetty.version> <!-- Start of Default ONAP Schema Properties --> <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link> @@ -781,6 +782,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -796,12 +801,12 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>4.3.6.RELEASE</version> + <version>4.3.18.RELEASE</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>4.3.6.RELEASE</version> + <version>4.3.18.RELEASE</version> </dependency> <dependency> <groupId>javax.xml.bind</groupId> @@ -943,10 +948,16 @@ <artifactId>json-patch</artifactId> <version>1.9</version> </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>${groovy.version}</version> + <classifier>indy</classifier> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>4.3.16.RELEASE</version> + <version>4.3.18.RELEASE</version> <scope>test</scope> </dependency> <dependency> @@ -980,7 +991,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> - <version>4.3.16.RELEASE</version> + <version>4.3.18.RELEASE</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java b/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java index 309d1333..2d68f833 100644 --- a/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java +++ b/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright © 2018 IBM. + * ================================================================================ * 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 @@ -27,44 +29,61 @@ import static org.junit.Assert.assertEquals; public class MapperUtilTest { - public class SampleClass { - private String color; - private String shape; - - public SampleClass(String c, String s){ - color = c; - shape = s; - } + - public String getColor() { - return color; - } + private JSONObject expectedJson; + private JSONObject sampleJson; - public void setColor(String color) { - this.color = color; - } + @Before + public void setup(){ + expectedJson = new JSONObject(); + sampleJson = new JSONObject(); + } - public String getShape() { - return shape; - } + @Test + public void writeAsJSONStringTest() throws Exception { + expectedJson.put("color", "black"); + expectedJson.put("shape", "box"); + SampleClass sample = new SampleClass("black", "box"); + assertEquals(expectedJson.toString(), MapperUtil.writeAsJSONString(sample)); + } + + @Test + public void readAsObjectOfTest() throws Exception { + sampleJson.put("color", "black"); + sampleJson.put("shape", "box"); + SampleClass expectedObject = new SampleClass("black", "box"); + SampleClass actualObject = MapperUtil.readAsObjectOf(SampleClass.class, sampleJson.toString()); + assertEquals(expectedObject.getColor(), actualObject.getColor()); + assertEquals(expectedObject.getShape(), actualObject.getShape()); + } +} - public void setShape(String shape) { - this.shape = shape; - } - } +class SampleClass { + private String color; + private String shape; - private JSONObject expectedJson; + public SampleClass() { + + } + public SampleClass(String c, String s){ + color = c; + shape = s; + } - @Before - public void setup(){ - expectedJson = new JSONObject(); - } + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getShape() { + return shape; + } - @Test - public void writeAsJSONStringTest() throws Exception { - expectedJson.put("color", "black"); - expectedJson.put("shape", "box"); - SampleClass sample = new SampleClass("black", "box"); - assertEquals(expectedJson.toString(), MapperUtil.writeAsJSONString(sample)); - } + public void setShape(String shape) { + this.shape = shape; + } } |