Merge "Getter/setter tests inside the aai model"

1 files changed, 18 insertions, 20 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/PnfResultTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/PnfResultTest.java
index 0f66df02f..912eea9d7 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/model/PnfResultTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/PnfResultTest.java
@@ -1,33 +1,31 @@
 package org.onap.vid.aai.model;
 
-import java.util.Map;
+import java.io.IOException;
 
+import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.Before;
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.StringContains.containsString;
+
 public class PnfResultTest {
 
-    private PnfResult createTestSubject() {
-        return new PnfResult();
-    }
+    private PnfResult pnfResult;
 
-    @Test
-    public void testGetAdditionalProperties() throws Exception {
-        PnfResult testSubject;
-        Map<String, Object> result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getAdditionalProperties();
+    @Before
+    public void setUp(){
+        pnfResult = new PnfResult();
+        pnfResult.setAdditionalProperty("key1", "value1");
+        pnfResult.setAdditionalProperty("key2", "value2");
     }
 
     @Test
-    public void testSetAdditionalProperty() throws Exception {
-        PnfResult testSubject;
-        String name = "";
-        Object value = null;
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setAdditionalProperty(name, value);
+    public void shouldHaveValidGettersAndSetters() throws IOException {
+        String result = new ObjectMapper().writeValueAsString(pnfResult);
+        assertThat(result, containsString("key1"));
+        assertThat(result, containsString("value2"));
+        assertThat(result, containsString("key2"));
+        assertThat(result, containsString("value2"));
     }
 }
\ No newline at end of file