1 files changed, 12 insertions, 30 deletions

diff --git a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java
index 5e750543..9d20e02c 100644
--- a/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java
+++ b/ecomp-sdk/epsdk-aaf/src/test/java/org/onap/portalsdk/external/authorization/domain/ExternalAccessUserRoleDetailTest.java
@@ -47,6 +47,7 @@ import org.junit.Test;
 public class ExternalAccessUserRoleDetailTest {
 
 	public ExternalAccessUserRoleDetail mockExternalAccessUserRoleDetailTest() {
+		ExternalAccessRole role = new ExternalAccessRole();
 		List<ExternalAccessPerms> mockPerms = new ArrayList<>();
 		ExternalAccessPerms mockExtPermsTest = new ExternalAccessPerms();
 		mockExtPermsTest.setAction("*");
@@ -54,46 +55,27 @@ public class ExternalAccessUserRoleDetailTest {
 		mockExtPermsTest.setType("test_type");
 		mockExtPermsTest.setInstance("test_instance");
 		mockPerms.add(mockExtPermsTest);
-		ExternalRoleDescription mockRoleDesc = new ExternalRoleDescription();
+		ExternalAccessRoleDescription mockRoleDesc = new ExternalAccessRoleDescription();
 		mockRoleDesc.setActive("true");
 		mockRoleDesc.setAppId("1");
 		mockRoleDesc.setAppRoleId("1");
 		mockRoleDesc.setId("1");
 		mockRoleDesc.setPriority("1");
 		mockRoleDesc.setName("test");
-		mockRoleDesc.setPermissions(mockPerms);
-		ExternalAccessUserRoleDetail mockExtUserRoleDetailTest = new ExternalAccessUserRoleDetail();
-		mockExtUserRoleDetailTest.setName("test");
-		mockExtUserRoleDetailTest.setDescription(mockRoleDesc);
+		mockRoleDesc.setName("com.test.app.rolename");
+		role.setPerms(mockPerms);
+		role.setDescription(mockRoleDesc);
+		ExternalAccessUserRoleDetail mockExtUserRoleDetailTest = new ExternalAccessUserRoleDetail(role);
 		return mockExtUserRoleDetailTest;
 	}
 
 	@Test
 	public void externalAccessPermsTest() {
-		List<ExternalAccessPerms> perms = new ArrayList<>();
-		ExternalAccessPerms extPermsTest = new ExternalAccessPerms();
-		extPermsTest.setAction("*");
-		extPermsTest.setDescription("test_name");
-		extPermsTest.setType("test_type");
-		extPermsTest.setInstance("test_instance");
-		perms.add(extPermsTest);
-		ExternalRoleDescription roleDesc = new ExternalRoleDescription();
-		roleDesc.setActive("true");
-		roleDesc.setAppId("1");
-		roleDesc.setAppRoleId("1");
-		roleDesc.setId("1");
-		roleDesc.setPriority("1");
-		roleDesc.setName("test");
-		roleDesc.setPermissions(perms);
-		ExternalAccessUserRoleDetail extUserRoleDetailTest = new ExternalAccessUserRoleDetail();
-		extUserRoleDetailTest.setName("test");
-		extUserRoleDetailTest.setDescription(roleDesc);
-		ExternalAccessUserRoleDetail extUserRoleDetailTest2 = new ExternalAccessUserRoleDetail("test", roleDesc);
-		assertEquals(extUserRoleDetailTest.getName(), mockExternalAccessUserRoleDetailTest().getName());
-		assertEquals(extUserRoleDetailTest.getDescription(), mockExternalAccessUserRoleDetailTest().getDescription());
-		assertEquals(extUserRoleDetailTest2.getName(), mockExternalAccessUserRoleDetailTest().getName());
-		assertEquals(extUserRoleDetailTest2.getDescription(), mockExternalAccessUserRoleDetailTest().getDescription());
-		assertEquals(true, new ExternalAccessUserRoleDetail("test",roleDesc)
-				.equals(new ExternalAccessUserRoleDetail("test",roleDesc)));
+		ExternalAccessUserRoleDetail extUserRoleDetailTest2 = mockExternalAccessUserRoleDetailTest();
+		ExternalAccessRole role =  extUserRoleDetailTest2.getRole();
+		assertEquals(role.getName(), mockExternalAccessUserRoleDetailTest().getRole().getName());
+		assertEquals(role.getPerms(), mockExternalAccessUserRoleDetailTest().getRole().getPerms());
+		assertEquals(role.getDescription(), mockExternalAccessUserRoleDetailTest().getRole().getDescription());
+
 	}
 }