1 files changed, 5 insertions, 41 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/model/OwningEntityTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/model/OwningEntityTest.java
index 1e160d297..9cb6a2f14 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/model/OwningEntityTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/model/OwningEntityTest.java
@@ -2,49 +2,13 @@ package org.onap.vid.aai.model;
 
 import org.junit.Test;
 
-public class OwningEntityTest {
-
-    private OwningEntity createTestSubject() {
-        return new OwningEntity();
-    }
-
-    @Test
-    public void testGetOwningEntityId() throws Exception {
-        OwningEntity testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getOwningEntityId();
-    }
-
-    @Test
-    public void testSetOwningEntityId() throws Exception {
-        OwningEntity testSubject;
-        String owningEntityId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setOwningEntityId(owningEntityId);
-    }
-
-    @Test
-    public void testGetOwningEntityName() throws Exception {
-        OwningEntity testSubject;
-        String result;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getOwningEntityName();
-    }
+public class OwningEntityTest {
 
     @Test
-    public void testSetOwningEntityName() throws Exception {
-        OwningEntity testSubject;
-        String owningEntityName = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setOwningEntityName(owningEntityName);
+    public void shouldHaveValidGettersAndSetters(){
+        assertThat(OwningEntity.class, hasValidGettersAndSetters());
     }
 }
\ No newline at end of file