2 files changed, 111 insertions, 50 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/roles/RoleTest.java b/vid-app-common/src/test/java/org/onap/vid/roles/RoleTest.java
new file mode 100644
index 000000000..463b29f57
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/roles/RoleTest.java
@@ -0,0 +1,60 @@
+package org.onap.vid.roles;
+
+import org.junit.Test;
+
+public class RoleTest {
+
+    private Role createTestSubject() {
+        return new Role(EcompRole.READ, "", "", "");
+    }
+
+    @Test
+    public void testGetEcompRole() throws Exception {
+        Role testSubject;
+        EcompRole result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.getEcompRole();
+    }
+
+    @Test
+    public void testGetSubscribeName() throws Exception {
+        Role testSubject;
+        String result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.getSubscribeName();
+    }
+
+    @Test
+    public void testSetSubscribeName() throws Exception {
+        Role testSubject;
+        String subscribeName = "";
+
+        // default test
+        testSubject = createTestSubject();
+        testSubject.setSubscribeName(subscribeName);
+    }
+
+    @Test
+    public void testGetServiceType() throws Exception {
+        Role testSubject;
+        String result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.getServiceType();
+    }
+
+    @Test
+    public void testGetTenant() throws Exception {
+        Role testSubject;
+        String result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.getTenant();
+    }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorTest.java b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorTest.java
index 7a1b09ac5..b303b257c 100644
--- a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorTest.java
@@ -5,54 +5,55 @@ import org.onap.vid.mso.rest.RequestDetails;
 
 public class RoleValidatorTest {
 
-	private RoleValidator createTestSubject() {
-		return new RoleValidator(null);
-	}
-
-//	@Test
-//	public void testIsSubscriberPermitted() throws Exception {
-//		RoleValidator testSubject;
-//		String subscriberName = "";
-//		boolean result;
-//
-//		// default test
-//		testSubject = createTestSubject();
-//		result = testSubject.isSubscriberPermitted(subscriberName);
-//	}
-//
-//	@Test
-//	public void testIsServicePermitted() throws Exception {
-//		RoleValidator testSubject;
-//		String subscriberName = "";
-//		String serviceType = "";
-//		boolean result;
-//
-//		// default test
-//		testSubject = createTestSubject();
-//		result = testSubject.isServicePermitted(subscriberName, serviceType);
-//	}
-
-	@Test
-	public void testIsMsoRequestValid() throws Exception {
-		RoleValidator testSubject;
-		RequestDetails mso_request = null;
-		boolean result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.isMsoRequestValid(mso_request);
-	}
-
-//	@Test
-//	public void testIsTenantPermitted() throws Exception {
-//		RoleValidator testSubject;
-//		String globalCustomerId = "";
-//		String serviceType = "";
-//		String tenant = "";
-//		boolean result;
-//
-//		// default test
-//		testSubject = createTestSubject();
-//		result = testSubject.isTenantPermitted(globalCustomerId, serviceType, tenant);
-//	}
+    private RoleValidator createTestSubject() {
+        return new RoleValidator(null);
+    }
+
+    @Test
+    public void testIsMsoRequestValid() throws Exception {
+        RoleValidator testSubject;
+        RequestDetails mso_request = null;
+        boolean result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.isMsoRequestValid(mso_request);
+    }
+
+    @Test
+    public void testIsServicePermitted() throws Exception {
+        RoleValidator testSubject;
+        String subscriberName = "";
+        String serviceType = "";
+        boolean result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.isServicePermitted(subscriberName, serviceType);
+    }
+
+    @Test
+    public void testIsSubscriberPermitted() throws Exception {
+        RoleValidator testSubject;
+        String subscriberName = "";
+        boolean result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.isSubscriberPermitted(subscriberName);
+    }
+
+    @Test
+    public void testIsTenantPermitted() throws Exception {
+        RoleValidator testSubject;
+        String globalCustomerId = "";
+        String serviceType = "";
+        String tenantName = "";
+        boolean result;
+
+        // default test
+        testSubject = createTestSubject();
+        result = testSubject.isTenantPermitted(globalCustomerId, serviceType, tenantName);
+    }
+
 }
\ No newline at end of file