1 files changed, 5 insertions, 140 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java
index 22aad6eae..6f5a9125f 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/AaiGetPnfs/PnfTest.java
@@ -2,149 +2,14 @@ package org.onap.vid.aai.model.AaiGetPnfs;
 
 import org.junit.Test;
 
-public class PnfTest {
-
-    private Pnf createTestSubject() {
-        return new Pnf();
-    }
-
-    @Test
-    public void testGetPnfName() throws Exception {
-        Pnf testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getPnfName();
-    }
-
-    @Test
-    public void testSetPnfName() throws Exception {
-        Pnf testSubject;
-        String pnfName = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setPnfName(pnfName);
-    }
-
-    @Test
-    public void testGetEquipType() throws Exception {
-        Pnf testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getEquipType();
-    }
-
-    @Test
-    public void testSetEquipType() throws Exception {
-        Pnf testSubject;
-        String equipType = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setEquipType(equipType);
-    }
-
-    @Test
-    public void testGetEquipVendor() throws Exception {
-        Pnf testSubject;
-        String result;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getEquipVendor();
-    }
-
-    @Test
-    public void testSetEquipVendor() throws Exception {
-        Pnf testSubject;
-        String equipVendor = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setEquipVendor(equipVendor);
-    }
-
-    @Test
-    public void testGetPnfName2() throws Exception {
-        Pnf testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getPnfName2();
-    }
-
-    @Test
-    public void testSetPnfName2() throws Exception {
-        Pnf testSubject;
-        String pnfName2 = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setPnfName2(pnfName2);
-    }
-
-    @Test
-    public void testGetPnfId() throws Exception {
-        Pnf testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getPnfId();
-    }
-
-    @Test
-    public void testSetPnfId() throws Exception {
-        Pnf testSubject;
-        String pnfId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setPnfId(pnfId);
-    }
-
-    @Test
-    public void testGetEquipModel() throws Exception {
-        Pnf testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getEquipModel();
-    }
-
-    @Test
-    public void testSetEquipModel() throws Exception {
-        Pnf testSubject;
-        String equipModel = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setEquipModel(equipModel);
-    }
+public class PnfTest {
 
     @Test
-    public void testGetPnfName2Source() throws Exception {
-        Pnf testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getPnfName2Source();
+    public void shouldHaveValidGettersAndSetters(){
+        assertThat(Pnf.class, hasValidGettersAndSetters());
     }
 
-    @Test
-    public void testSetPnfName2Source() throws Exception {
-        Pnf testSubject;
-        String pnfName2Source = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setPnfName2Source(pnfName2Source);
-    }
 }
\ No newline at end of file