Merge "Getter/setter tests inside the aai model"

1 files changed, 5 insertions, 80 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/ModelTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/ModelTest.java
index 413c0b33e..5b8d43938 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/model/ModelTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/ModelTest.java
@@ -2,89 +2,14 @@ package org.onap.vid.aai.model;
 
 import org.junit.Test;
 
-public class ModelTest {
-
-    private Model createTestSubject() {
-        return new Model();
-    }
-
-    @Test
-    public void testGetModelInvariantId() throws Exception {
-        Model testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getModelInvariantId();
-    }
-
-    @Test
-    public void testSetModelInvariantId() throws Exception {
-        Model testSubject;
-        String modelInvariantId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setModelInvariantId(modelInvariantId);
-    }
-
-    @Test
-    public void testGetModelType() throws Exception {
-        Model testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getModelType();
-    }
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-    @Test
-    public void testSetModelType() throws Exception {
-        Model testSubject;
-        String modelType = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setModelType(modelType);
-    }
-
-    @Test
-    public void testGetResourceVersion() throws Exception {
-        Model testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getResourceVersion();
-    }
-
-    @Test
-    public void testSetResourceVersion() throws Exception {
-        Model testSubject;
-        String resourceVersion = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setResourceVersion(resourceVersion);
-    }
+public class ModelTest {
 
     @Test
-    public void testGetModelVers() throws Exception {
-        Model testSubject;
-        ModelVers result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getModelVers();
+    public void shouldHaveValidGettersAndSetters(){
+        assertThat(Model.class, hasValidGettersAndSetters());
     }
 
-    @Test
-    public void testSetModelVers() throws Exception {
-        Model testSubject;
-        ModelVers modelVers = null;
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setModelVers(modelVers);
-    }
 }
\ No newline at end of file