Merge "Getter/setter tests inside the aai model"

1 files changed, 21 insertions, 21 deletions

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