X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FExternalAccessRolesControllerTest.java;h=b40b8db69070faf36b2442a50bb8ff5a29e431af;hb=cfc431ee10a83ccc0a170ec4f8e674f6ccb63a8d;hp=b476a72d4802ca65519ae4558e1ffe69262648b5;hpb=a70761c096192e38800bf38d6c7f61f52bf72007;p=portal.git
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
index b476a72d..b40b8db6 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
@@ -68,11 +68,7 @@ import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
import org.onap.portalapp.portal.framework.MockitoTestSuite;
import org.onap.portalapp.portal.service.ExternalAccessRolesService;
import org.onap.portalapp.portal.service.ExternalAccessRolesServiceImpl;
-import org.onap.portalapp.portal.transport.CentralRole;
-import org.onap.portalapp.portal.transport.CentralRoleFunction;
-import org.onap.portalapp.portal.transport.CentralUser;
-import org.onap.portalapp.portal.transport.CentralV2Role;
-import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator;
+import org.onap.portalapp.portal.transport.*;
import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
import org.onap.portalapp.portal.utils.EcompPortalUtils;
import org.onap.portalapp.portal.utils.PortalConstants;
@@ -103,7 +99,7 @@ public class ExternalAccessRolesControllerTest {
@Mock
ExternalAccessRolesService externalAccessRolesService = new ExternalAccessRolesServiceImpl();
@InjectMocks
- ExternalAccessRolesController externalAccessRolesController = new ExternalAccessRolesController();
+ ExternalAccessRolesController externalAccessRolesController;
@Mock
UserService userservice = new UserServiceCentalizedImpl();
@Mock
@@ -151,11 +147,20 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getUserTest() throws Exception {
- CentralUser expectedCentralUser = new CentralUser(null, null, null, null, null, null, null, null, loginId,
- loginId, loginId, loginId, loginId, loginId, loginId, null, loginId, loginId, loginId, loginId, loginId,
- loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId,
- loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId, loginId,
- loginId, null, false, false, null, null, false, loginId, null);
+ CentralUser expectedCentralUser =
+ new CentralUser.CentralUserBuilder().setId(null).setCreated(null).setModified(null).setCreatedId(null)
+ .setModifiedId(null).setRowNum(null).setOrgId(null).setManagerId(null).setFirstName(loginId)
+ .setMiddleInitial(loginId).setLastName(loginId).setPhone(loginId).setFax(loginId)
+ .setCellular(loginId).setEmail(loginId).setAddressId(null).setAlertMethodCd(loginId)
+ .setHrid(loginId).setOrgUserId(loginId).setOrgCode(loginId).setAddress1(loginId)
+ .setAddress2(loginId).setCity(loginId).setState(loginId).setZipCode(loginId).setCountry(loginId)
+ .setOrgManagerUserId(loginId).setLocationClli(loginId).setBusinessCountryCode(loginId)
+ .setBusinessCountryName(loginId).setBusinessUnit(loginId).setBusinessUnitName(loginId)
+ .setDepartment(loginId).setDepartmentName(loginId).setCompanyCode(loginId).setCompany(loginId)
+ .setZipCodeSuffix(loginId).setJobTitle(loginId).setCommandChain(loginId).setSiloStatus(loginId)
+ .setCostCenter(loginId).setFinancialLocCode(loginId).setLoginId(loginId).setLoginPwd(loginId)
+ .setLastLoginDate(null).setActive(false).setInternal(false).setSelectedProfileId(null)
+ .setTimeZoneId(null).setOnline(false).setChatId(loginId).setUserApps(null).createCentralUser();
String loginId = "test";
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
@@ -185,6 +190,18 @@ public class ExternalAccessRolesControllerTest {
assertEquals(reason, result);
}
+ @Test
+ public void getUserXSSTest() throws Exception {
+ String loginId = "";
+ String expected = getXSSKeyJson();
+ StringWriter sw = new StringWriter();
+ PrintWriter writer = new PrintWriter(sw);
+ Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+ externalAccessRolesController.getUser(mockedRequest, mockedResponse, loginId);
+ String actual = sw.getBuffer().toString().trim();
+ assertEquals(expected, actual);
+ }
+
@Test
public void getV2UserListTest() throws Exception {
String expectedCentralUser = "test";
@@ -223,8 +240,8 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getRolesForAppCentralRoleTest() throws Exception {
- List expectedCentralRoleList = new ArrayList();
- List applicationList = new ArrayList();
+ List expectedCentralRoleList = new ArrayList<>();
+ List applicationList = new ArrayList<>();
List centralV2RoleList = new ArrayList<>();
List centralRoleList = new ArrayList<>();
EPApp app = mockApp();
@@ -246,7 +263,7 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void getRolesForAppCentralRoleExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
List centralV2RoleList = new ArrayList<>();
List centralRoleList = new ArrayList<>();
EPApp app = mockApp();
@@ -268,8 +285,8 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getV2RolesForAppTest() throws Exception {
- List expectedCentralRoleList = new ArrayList();
- List applicationList = new ArrayList();
+ List expectedCentralRoleList = new ArrayList<>();
+ List applicationList = new ArrayList<>();
List centralV2Role = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
@@ -288,8 +305,8 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void getV2RolesForAppExceptionTest() throws Exception {
- List expectedCentralRoleList = new ArrayList();
- List applicationList = new ArrayList();
+ List expectedCentralRoleList = new ArrayList<>();
+ List applicationList = new ArrayList<>();
List centralV2Role = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
@@ -308,7 +325,7 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void getRolesForAppTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
List answer = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
@@ -320,7 +337,7 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void getRolesForAppExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
@@ -332,9 +349,9 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getRoleFunctionsListTest() throws Exception {
- List expectedCentralRoleList = new ArrayList();
- List roleFuncList = new ArrayList();
- List applicationList = new ArrayList();
+ List expectedCentralRoleList = new ArrayList<>();
+ List roleFuncList = new ArrayList<>();
+ List applicationList = new ArrayList<>();
List centralV2RoleFunction = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
@@ -366,8 +383,8 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getV2RoleFunctionsListTest() throws Exception {
- List expectedCentralV2RoleFunctionList = new ArrayList();
- List applicationList = new ArrayList();
+ List expectedCentralV2RoleFunctionList = new ArrayList<>();
+ List applicationList = new ArrayList<>();
List centralV2RoleFunction = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
@@ -398,9 +415,9 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getRoleInfoValidationTest() throws Exception {
CentralRole expectedCentralRole = null;
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
long roleId = 1;
- CentralV2Role centralV2Role = new CentralV2Role();
+ CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
EPApp app = mockApp();
app.setCentralAuth(true);
applicationList.add(app);
@@ -421,7 +438,7 @@ public class ExternalAccessRolesControllerTest {
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
- CentralV2Role answer = new CentralV2Role();
+ CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
long roleId = 1;
Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
.thenReturn(answer);
@@ -444,11 +461,11 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getV2RoleInfoValidationTest() throws Exception {
- CentralV2Role expectedCentralRole = new CentralV2Role();
+ CentralV2Role expectedCentralRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
expectedCentralRole.setActive(false);
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
long roleId = 1;
- CentralV2Role centralV2Role = new CentralV2Role();
+ CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
EPApp app = mockApp();
app.setCentralAuth(true);
applicationList.add(app);
@@ -469,7 +486,7 @@ public class ExternalAccessRolesControllerTest {
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
- CentralV2Role answer = new CentralV2Role();
+ CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
long roleId = 1;
Mockito.when(externalAccessRolesService.getRoleInfo(roleId, mockedRequest.getHeader(uebKey)))
.thenReturn(answer);
@@ -491,10 +508,10 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void getV2RoleFunctionTest() throws HttpClientErrorException, Exception {
+ public void getV2RoleFunctionTest() throws Exception {
CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
expectedCentralV2RoleFunction.setCode("test");
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
String code = "test";
CentralV2RoleFunction centralV2RoleFunction = new CentralV2RoleFunction();
centralV2RoleFunction.setCode("test");
@@ -512,10 +529,11 @@ public class ExternalAccessRolesControllerTest {
assertEquals(actualCentralV2RoleFunction.getCode(), expectedCentralV2RoleFunction.getCode());
}
+
@Test
- public void getV2RoleFunctionNullCheckTest() throws HttpClientErrorException, Exception {
+ public void getV2RoleFunctionNullCheckTest() throws Exception {
CentralV2RoleFunction expectedCentralV2RoleFunction = new CentralV2RoleFunction();
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
String code = "test";
CentralV2RoleFunction centralV2RoleFunction = null;
EPApp app = mockApp();
@@ -585,14 +603,41 @@ public class ExternalAccessRolesControllerTest {
assertEquals(reason, result);
}
+ @Test
+ public void getRoleFunctionXSSTest() throws Exception {
+ String expected = getXSSKeyJson();
+ EPApp mockApp = mockApp();
+ mockApp.setCentralAuth(true);
+ List mockAppList = new ArrayList<>();
+ mockAppList.add(mockApp);
+ StringWriter sw = new StringWriter();
+ PrintWriter writer = new PrintWriter(sw);
+ Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
+ CentralV2RoleFunction roleFunction1 = new CentralV2RoleFunction();
+ CentralRoleFunction roleFunction2 = new CentralRoleFunction();
+ roleFunction1.setCode("test2");
+ String code = "";
+ Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+ Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(mockAppList);
+ ResponseEntity response = new ResponseEntity<>(HttpStatus.FOUND);
+ Mockito.when(externalAccessRolesService.getNameSpaceIfExists(mockAppList.get(0))).thenReturn(response);
+ Mockito.when(externalAccessRolesService.getRoleFunction(code, mockedRequest.getHeader("uebkey")))
+ .thenReturn(roleFunction1);
+ CentralRoleFunction returnedValue = externalAccessRolesController.getRoleFunction(mockedRequest, mockedResponse,
+ code);
+ assertEquals(returnedValue, roleFunction2);
+ String result = sw.getBuffer().toString().trim();
+ assertEquals(expected, result);
+ }
+
@Test
public void saveRoleFunctionIfIsNotDeletedTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage(null);
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -609,14 +654,14 @@ public class ExternalAccessRolesControllerTest {
@Test
public void saveRoleFunctionExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
- expectedportalRestResponse.setMessage(null);
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
+ expectedportalRestResponse.setMessage("argument \"content\" is null");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
@@ -627,10 +672,9 @@ public class ExternalAccessRolesControllerTest {
assertEquals(portalRestResponse, expectedportalRestResponse);
}
- @SuppressWarnings("static-access")
@Test
public void saveRoleFunctionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPUser user = mockUser.mockEPUser();
List userList = new ArrayList<>();
userList.add(user);
@@ -648,7 +692,7 @@ public class ExternalAccessRolesControllerTest {
saveRoleFunc.setAppId(app.getId());
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully saved!");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -669,6 +713,47 @@ public class ExternalAccessRolesControllerTest {
assertEquals(portalRestResponse, expectedportalRestResponse);
}
+ @Test
+ public void saveRoleFunctionXSSTest() throws Exception {
+ List applicationList = new ArrayList<>();
+ EPUser user = mockUser.mockEPUser();
+ List userList = new ArrayList<>();
+ userList.add(user);
+ EPApp app = mockApp();
+ app.setCentralAuth(true);
+ applicationList.add(app);
+ JSONObject roleFunc = new JSONObject();
+ roleFunc.put("type", " ");
+ roleFunc.put("code", "test_instance");
+ roleFunc.put("action", "test_action");
+ roleFunc.put("name", "test_name");
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ CentralV2RoleFunction saveRoleFunc = mapper.readValue(roleFunc.toString(), CentralV2RoleFunction.class);
+ saveRoleFunc.setAppId(app.getId());
+ Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
+ PortalRestResponse portalRestResponse = null;
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
+ expectedportalRestResponse.setMessage("Failed to roleFunc, not valid data.");
+ expectedportalRestResponse.setResponse("Failed");
+ expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+ Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+ Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(applicationList);
+ ResponseEntity response = new ResponseEntity<>(HttpStatus.FOUND);
+ Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
+ Mockito.when(externalAccessRolesService.getRoleFunction("test_type|test_instance|test_action", app.getUebKey()))
+ .thenReturn(null);
+ Mockito.when(externalAccessRolesService.saveCentralRoleFunction(Matchers.any(CentralV2RoleFunction.class),
+ Matchers.any(EPApp.class))).thenReturn(true);
+ Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader(Matchers.anyString())))
+ .thenReturn(userList);
+ Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(Matchers.anyString())))
+ .thenReturn(applicationList);
+ portalRestResponse = externalAccessRolesController.saveRoleFunction(mockedRequest, mockedResponse,
+ roleFunc.toString());
+ assertEquals(expectedportalRestResponse, portalRestResponse);
+ }
+
@Test
public void deleteRoleFunctionTest() throws Exception {
PowerMockito.mockStatic(EcompPortalUtils.class);
@@ -676,7 +761,7 @@ public class ExternalAccessRolesControllerTest {
PowerMockito.mockStatic(EPCommonSystemProperties.class);
PowerMockito.mockStatic(PortalConstants.class);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully Deleted");
expectedportalRestResponse.setResponse("Success");
EPUser user = mockUser.mockEPUser();
@@ -699,6 +784,36 @@ public class ExternalAccessRolesControllerTest {
assertEquals(portalRestResponse, expectedportalRestResponse);
}
+ @Test
+ public void deleteRoleFunctionXSSTest() throws Exception {
+ PowerMockito.mockStatic(EcompPortalUtils.class);
+ PowerMockito.mockStatic(SystemProperties.class);
+ PowerMockito.mockStatic(EPCommonSystemProperties.class);
+ PowerMockito.mockStatic(PortalConstants.class);
+ PortalRestResponse portalRestResponse = null;
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
+ expectedportalRestResponse.setMessage("Failed to deleteRoleFunction, not valid data.");
+ expectedportalRestResponse.setResponse("Failed");
+ expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+ EPUser user = mockUser.mockEPUser();
+ List userList = new ArrayList<>();
+ userList.add(user);
+ EPApp app = mockApp();
+ app.setCentralAuth(true);
+ List appList = new ArrayList<>();
+ appList.add(app);
+ String code = "";
+ Mockito.when(mockedRequest.getHeader("LoginId")).thenReturn("guestT");
+ Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+ Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
+ ResponseEntity response = new ResponseEntity<>(HttpStatus.FOUND);
+ Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
+ Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
+ Mockito.when(externalAccessRolesService.deleteCentralRoleFunction(code, app)).thenReturn(true);
+ portalRestResponse = externalAccessRolesController.deleteRoleFunction(mockedRequest, mockedResponse, code);
+ assertEquals(portalRestResponse, expectedportalRestResponse);
+ }
+
@Test
public void getActiveRolesTest() throws Exception {
String reason = getInvalidKeyJson();
@@ -717,9 +832,9 @@ public class ExternalAccessRolesControllerTest {
List expectedRolesList = null;
EPApp app = mockApp();
app.setCentralAuth(true);
- List appList = new ArrayList();
+ List appList = new ArrayList<>();
appList.add(app);
- List cenRoles = new ArrayList();
+ List cenRoles = new ArrayList<>();
Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
ResponseEntity response = new ResponseEntity<>(HttpStatus.FOUND);
@@ -757,10 +872,19 @@ public class ExternalAccessRolesControllerTest {
return reason;
}
+ private String getXSSKeyJson() throws JsonProcessingException {
+ final Map uebkeyResponse = new HashMap<>();
+ String reason = "";
+ ObjectMapper mapper = new ObjectMapper();
+ uebkeyResponse.put("error", "Data is not valid");
+ reason = mapper.writeValueAsString(uebkeyResponse);
+ return reason;
+ }
+
@Test
- public void deleteDependcyRoleRecordExceptionTest() throws Exception {
+ public void deleteDependcyRoleRecordExceptionTest() {
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Invalid credentials!");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -776,7 +900,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.bulkUploadFunctions(mockedRequest.getHeader(uebKey)))
.thenReturn(result);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added: 0");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -789,7 +913,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.bulkUploadFunctions(mockedRequest.getHeader(uebKey)))
.thenThrow(httpClientErrorException);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to bulkUploadFunctions");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -801,7 +925,7 @@ public class ExternalAccessRolesControllerTest {
public void bulkUploadRolesTest() throws Exception {
Integer result = 0;
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added: 0");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -815,7 +939,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.bulkUploadRoles(mockedRequest.getHeader(uebKey)))
.thenThrow(httpClientErrorException);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to bulkUploadRoles");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -827,7 +951,7 @@ public class ExternalAccessRolesControllerTest {
public void bulkUploadRoleFunctionsTest() throws Exception {
Integer result = 0;
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added: 0");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -842,7 +966,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.bulkUploadRolesFunctions(mockedRequest.getHeader(uebKey)))
.thenThrow(httpClientErrorException);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to bulkUploadRoleFunctions");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -854,7 +978,7 @@ public class ExternalAccessRolesControllerTest {
public void bulkUploadUserRolesTest() throws Exception {
Integer result = 0;
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added: 0");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -869,7 +993,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.bulkUploadUserRoles(mockedRequest.getHeader(uebKey)))
.thenThrow(httpClientErrorException);
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to bulkUploadUserRoles");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -878,9 +1002,9 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void bulkUploadPartnerFunctionsTest() throws Exception {
+ public void bulkUploadPartnerFunctionsTest() {
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added: '0' functions");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -889,9 +1013,9 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void bulkUploadPartnerRolesTest() throws Exception {
+ public void bulkUploadPartnerRolesTest() {
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -902,9 +1026,9 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void bulkUploadPartnerRolesExceptionTest() throws Exception {
+ public void bulkUploadPartnerRolesExceptionTest() {
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -942,10 +1066,10 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void saveRoleExceptionTest() throws Exception {
+ public void saveRoleExceptionTest() {
Role role = new Role();
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Invalid credentials!");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -954,10 +1078,10 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void deleteRoleExceptionTest() throws Exception {
+ public void deleteRoleExceptionTest() {
String role = "TestNew";
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Invalid credentials!");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -966,9 +1090,9 @@ public class ExternalAccessRolesControllerTest {
}
@Test
- public void bulkUploadPartnerRoleFunctionsTest() throws Exception {
+ public void bulkUploadPartnerRoleFunctionsTest() {
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully added: '0' role functions");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -986,7 +1110,7 @@ public class ExternalAccessRolesControllerTest {
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
applicationList.add(app);
@@ -1012,7 +1136,7 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void deleteRoleV2Test() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
@@ -1020,7 +1144,7 @@ public class ExternalAccessRolesControllerTest {
"Success");
Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully Deleted");
expectedportalRestResponse.setResponse("Success");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -1031,12 +1155,12 @@ public class ExternalAccessRolesControllerTest {
@Test
public void deleteRoleV2InvalidUebKeyTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey)))
.thenThrow(new Exception("Invalid credentials!"));
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Invalid credentials!");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -1047,12 +1171,12 @@ public class ExternalAccessRolesControllerTest {
@Test
public void deleteRoleV2InvalidUebKeyWithDiffErrorTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey)))
.thenThrow(new Exception("test"));
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("test");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -1063,7 +1187,7 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void deleteRoleV2ExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
@@ -1071,7 +1195,7 @@ public class ExternalAccessRolesControllerTest {
"failed");
Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to deleteRole");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -1082,7 +1206,7 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getEpUserNullTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setUebKey("uebKey");
app.setCentralAuth(true);
@@ -1095,7 +1219,7 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getEpUserTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setUebKey("uebKey");
app.setCentralAuth(true);
@@ -1103,7 +1227,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
ResponseEntity response = new ResponseEntity<>(HttpStatus.OK);
Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
- String user = "{\"id\":null,\"created\":null,\"modified\":null,\"createdId\":null,\"modifiedId\":null,\"rowNum\":null,\"auditUserId\":null,\"auditTrail\":null,\"orgId\":null,\"managerId\":null,\"firstName\":\"test\",\"middleInitial\":null,\"lastName\":null,\"phone\":null,\"fax\":null,\"cellular\":null,\"email\":null,\"addressId\":null,\"alertMethodCd\":null,\"hrid\":null,\"orgUserId\":null,\"orgCode\":null,\"address1\":null,\"address2\":null,\"city\":null,\"state\":null,\"zipCode\":null,\"country\":null,\"orgManagerUserId\":null,\"locationClli\":null,\"businessCountryCode\":null,\"businessCountryName\":null,\"businessUnit\":null,\"businessUnitName\":null,\"department\":null,\"departmentName\":null,\"companyCode\":null,\"company\":null,\"zipCodeSuffix\":null,\"jobTitle\":null,\"commandChain\":null,\"siloStatus\":null,\"costCenter\":null,\"financialLocCode\":null,\"loginId\":null,\"loginPwd\":null,\"lastLoginDate\":null,\"active\":false,\"internal\":false,\"selectedProfileId\":null,\"timeZoneId\":null,\"online\":false,\"chatId\":null,\"userApps\":[],\"pseudoRoles\":[],\"defaultUserApp\":null,\"roles\":[],\"fullName\":\"test null\"}";
+ String user = "{\"id\":null,\"created\":null,\"modified\":null,\"createdId\":null,\"modifiedId\":null,\"rowNum\":null,\"auditUserId\":null,\"auditTrail\":null,\"orgId\":null,\"managerId\":null,\"firstName\":\"test\",\"middleInitial\":null,\"lastName\":null,\"phone\":null,\"fax\":null,\"cellular\":null,\"email\":null,\"addressId\":null,\"alertMethodCd\":null,\"hrid\":null,\"orgUserId\":null,\"orgCode\":null,\"address1\":null,\"address2\":null,\"city\":null,\"state\":null,\"zipCode\":null,\"country\":null,\"orgManagerUserId\":null,\"locationClli\":null,\"businessCountryCode\":null,\"businessCountryName\":null,\"businessUnit\":null,\"businessUnitName\":null,\"department\":null,\"departmentName\":null,\"companyCode\":null,\"company\":null,\"zipCodeSuffix\":null,\"jobTitle\":null,\"commandChain\":null,\"siloStatus\":null,\"costCenter\":null,\"financialLocCode\":null,\"loginId\":null,\"loginPwd\":null,\"lastLoginDate\":null,\"active\":false,\"internal\":false,\"selectedProfileId\":null,\"timeZoneId\":null,\"online\":false,\"chatId\":null,\"userApps\":[],\"pseudoRoles\":[],\"roles\":[]}";
Mockito.when(externalAccessRolesService.getV2UserWithRoles("test12", mockedRequest.getHeader(uebKey)))
.thenReturn(user);
User EPuser = new User();
@@ -1115,7 +1239,7 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getEpUserExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
@@ -1127,7 +1251,7 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getEPRolesOfApplicationTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setUebKey("uebKey");
app.setCentralAuth(true);
@@ -1152,7 +1276,7 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getEPRolesOfApplicationNullTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setUebKey("uebKey");
app.setCentralAuth(true);
@@ -1162,7 +1286,7 @@ public class ExternalAccessRolesControllerTest {
Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response);
Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app);
List cenRoleList = new ArrayList<>();
- CentralV2Role role = new CentralV2Role();
+ CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
role.setName("test");
cenRoleList.add(role);
Mockito.when(externalAccessRolesService.getActiveRoles(mockedRequest.getHeader(uebKey))).thenReturn(null);
@@ -1171,7 +1295,7 @@ public class ExternalAccessRolesControllerTest {
@Test
public void getEPRolesOfApplicationExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
app.setCentralAuth(true);
Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
@@ -1188,7 +1312,7 @@ public class ExternalAccessRolesControllerTest {
PowerMockito.mockStatic(EPCommonSystemProperties.class);
PowerMockito.mockStatic(PortalConstants.class);
PortalRestResponse actualPortalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully Saved");
expectedportalRestResponse.setResponse("Success");
EPUser user = mockUser.mockEPUser();
@@ -1220,7 +1344,7 @@ public class ExternalAccessRolesControllerTest {
PowerMockito.mockStatic(EPCommonSystemProperties.class);
PowerMockito.mockStatic(PortalConstants.class);
PortalRestResponse actualPortalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully Saved");
expectedportalRestResponse.setResponse("Success");
EPUser user = mockUser.mockEPUser();
@@ -1252,7 +1376,7 @@ public class ExternalAccessRolesControllerTest {
PowerMockito.mockStatic(EPCommonSystemProperties.class);
PowerMockito.mockStatic(PortalConstants.class);
PortalRestResponse actualPortalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully Saved");
expectedportalRestResponse.setResponse("Failed");
EPUser user = mockUser.mockEPUser();
@@ -1279,7 +1403,7 @@ public class ExternalAccessRolesControllerTest {
@Test(expected = NullPointerException.class)
public void saveRoleNullExceptionTest() throws Exception {
- List applicationList = new ArrayList();
+ List applicationList = new ArrayList<>();
EPApp app = mockApp();
applicationList.add(app);
Role role = new Role();
@@ -1288,7 +1412,7 @@ public class ExternalAccessRolesControllerTest {
"failed");
Mockito.when(externalAccessRolesService.deleteDependencyRoleRecord(Matchers.anyLong(), Matchers.anyString(),
Matchers.anyString())).thenReturn(externalRequestFieldsValidator);
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to deleteRole");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -1304,7 +1428,7 @@ public class ExternalAccessRolesControllerTest {
PowerMockito.mockStatic(EPCommonSystemProperties.class);
PowerMockito.mockStatic(PortalConstants.class);
PortalRestResponse actualPortalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Successfully Deleted");
expectedportalRestResponse.setResponse("Success");
EPUser user = mockUser.mockEPUser();
@@ -1328,6 +1452,37 @@ public class ExternalAccessRolesControllerTest {
assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
}
+ @Test
+ public void deleteRoleXSSTest() throws Exception {
+ PowerMockito.mockStatic(EcompPortalUtils.class);
+ PowerMockito.mockStatic(SystemProperties.class);
+ PowerMockito.mockStatic(EPCommonSystemProperties.class);
+ PowerMockito.mockStatic(PortalConstants.class);
+ PortalRestResponse actualPortalRestResponse = null;
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
+ expectedportalRestResponse.setMessage("Failed to deleteRole, not valid data.");
+ expectedportalRestResponse.setResponse("Failed");
+ expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
+ EPUser user = mockUser.mockEPUser();
+ List userList = new ArrayList<>();
+ userList.add(user);
+ EPApp app = mockApp();
+ app.setCentralAuth(true);
+ List appList = new ArrayList<>();
+ appList.add(app);
+ String code = "
";
+ boolean deleteResponse = true;
+ Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
+ Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader("uebkey"))).thenReturn(appList);
+ ResponseEntity response = new ResponseEntity<>(HttpStatus.FOUND);
+ Mockito.when(externalAccessRolesService.getNameSpaceIfExists(appList.get(0))).thenReturn(response);
+ Mockito.when(externalAccessRolesService.getUser(mockedRequest.getHeader("LoginId"))).thenReturn(userList);
+ Mockito.when(externalAccessRolesService.deleteRoleForApplication(code, mockedRequest.getHeader("uebkey")))
+ .thenReturn(deleteResponse);
+ actualPortalRestResponse = externalAccessRolesController.deleteRole(mockedRequest, mockedResponse, code);
+ assertEquals(actualPortalRestResponse.getStatus(), expectedportalRestResponse.getStatus());
+ }
+
@Test
public void deleteRoleNegativeTest() throws Exception {
PowerMockito.mockStatic(EcompPortalUtils.class);
@@ -1335,7 +1490,7 @@ public class ExternalAccessRolesControllerTest {
PowerMockito.mockStatic(EPCommonSystemProperties.class);
PowerMockito.mockStatic(PortalConstants.class);
PortalRestResponse actualPortalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Failed to delete Role for 'test");
expectedportalRestResponse.setResponse("Failed");
EPUser user = mockUser.mockEPUser();
@@ -1363,13 +1518,13 @@ public class ExternalAccessRolesControllerTest {
public void deleteDependcyRoleRecordTest() throws Exception {
ExternalRequestFieldsValidator removeResult = new ExternalRequestFieldsValidator(true, "success");
PortalRestResponse portalRestResponse = null;
- PortalRestResponse expectedportalRestResponse = new PortalRestResponse();
+ PortalRestResponse expectedportalRestResponse = new PortalRestResponse<>();
expectedportalRestResponse.setMessage("Invalid credentials!");
expectedportalRestResponse.setResponse("Failed");
expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
long roleId = 123;
String LoginId = "loginId";
- List appList = new ArrayList();
+ List