Introduce WithPermissionProperties as validation-points for RoleValidator

Issue-ID: VID-758

Change-Id: Id8f1f6faeb10a92cf20ca9a17879bc7e745526b0
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 26 insertions, 162 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/model/ServiceInstanceSearchResultTest.java b/vid-app-common/src/test/java/org/onap/vid/model/ServiceInstanceSearchResultTest.java
index 5168a5c63..b777375ef 100644
--- a/vid-app-common/src/test/java/org/onap/vid/model/ServiceInstanceSearchResultTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/model/ServiceInstanceSearchResultTest.java
@@ -20,183 +20,47 @@
 
 package org.onap.vid.model;
 
-import org.junit.Test;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEqualsFor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonNodeAbsent;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonPartEquals;
+import static org.apache.commons.lang3.ArrayUtils.toArray;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.testng.annotations.Test;
 
 public class ServiceInstanceSearchResultTest {
 
-    private ServiceInstanceSearchResult createTestSubject() {
-        return new ServiceInstanceSearchResult();
-    }
-
-    @Test
-    public void testGetServiceInstanceId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getServiceInstanceId();
-    }
-
-    @Test
-    public void testSetServiceInstanceId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String serviceInstanceId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setServiceInstanceId(serviceInstanceId);
-    }
-
-    @Test
-    public void testGetGlobalCustomerId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getGlobalCustomerId();
-    }
-
-    @Test
-    public void testSetGlobalCustomerId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String globalCustomerId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setGlobalCustomerId(globalCustomerId);
-    }
-
-    @Test
-    public void testGetServiceType() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getServiceType();
-    }
-
-    @Test
-    public void testSetServiceType() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String serviceType = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setServiceType(serviceType);
-    }
-
-    @Test
-    public void testGetServiceInstanceName() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getServiceInstanceName();
-    }
-
-    @Test
-    public void testSetServiceInstanceName() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String serviceInstanceName = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setServiceInstanceName(serviceInstanceName);
-    }
-
-    @Test
-    public void testGetSubscriberName() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getSubscriberName();
-    }
-
-    @Test
-    public void testSetSubscriberName() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String subscriberName = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setSubscriberName(subscriberName);
-    }
-
     @Test
-    public void testGetAaiModelInvariantId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getAaiModelInvariantId();
-    }
-
-    @Test
-    public void testSetAaiModelInvariantId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String aaiModelInvariantId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setAaiModelInvariantId(aaiModelInvariantId);
-    }
-
-    @Test
-    public void testGetAaiModelVersionId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getAaiModelVersionId();
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(ServiceInstanceSearchResult.class, hasValidGettersAndSetters());
     }
 
     @Test
-    public void testSetAaiModelVersionId() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        String aaiModelVersionId = "";
-
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setAaiModelVersionId(aaiModelVersionId);
-    }
-
-    @Test
-    public void testGetIsPermitted() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        boolean result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.getIsPermitted();
+    public void shouldHaveValidConstructor() {
+        assertThat(ServiceInstanceSearchResult.class, hasValidBeanConstructor());
     }
 
     @Test
-    public void testSetIsPermitted() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        boolean isPermitted = false;
+    public void shouldHaveValidEqualsAndHashCode() {
+        String[] propertiesToEqualBy = toArray("serviceInstanceId");
 
-        // default test
-        testSubject = createTestSubject();
-        testSubject.setIsPermitted(isPermitted);
+        assertThat(ServiceInstanceSearchResult.class, allOf(
+            hasValidBeanHashCodeFor(propertiesToEqualBy),
+            hasValidBeanEqualsFor(propertiesToEqualBy))
+        );
     }
 
     @Test
-    public void testEquals() throws Exception {
-        ServiceInstanceSearchResult testSubject;
-        Object other = null;
-        boolean result;
+    public void subscriberId_shouldBeSerializedAsGlobalCustomerId() {
+        ServiceInstanceSearchResult underTest = new ServiceInstanceSearchResult();
+        underTest.setSubscriberId("example");
 
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.equals(other);
+        assertThat(underTest, jsonPartEquals("globalCustomerId", "example"));
+        assertThat(underTest, jsonNodeAbsent("subscriberId"));
     }
 
 }