diff options
author | 2019-08-30 15:42:52 +0900 | |
---|---|---|
committer | 2019-08-30 20:22:38 +0900 | |
commit | 8fbf2846655dbad0e19789e510c51127ad35104d (patch) | |
tree | f557623501afe667ee12318e071e4dc3d38a8f02 /ecomp-portal-BE-common/src/test | |
parent | d13dacf060ff58d36f7d8995d185d78085bfd669 (diff) |
Reduce number of parameters
Constructor has 12 parameters, which is greater than 7 authorized
Issue-ID: PORTAL-562
Change-Id: Ie2007420ab2b3d3b304e0b8dddd8afa7314a79ff
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
Diffstat (limited to 'ecomp-portal-BE-common/src/test')
5 files changed, 32 insertions, 50 deletions
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 3d30f9f5..6b06ee22 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 @@ -417,7 +417,7 @@ public class ExternalAccessRolesControllerTest { CentralRole expectedCentralRole = null; List<EPApp> 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); @@ -438,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); @@ -461,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<EPApp> 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); @@ -486,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); @@ -1286,7 +1286,7 @@ public class ExternalAccessRolesControllerTest { Mockito.when(externalAccessRolesService.getNameSpaceIfExists(app)).thenReturn(response); Mockito.doNothing().when(externalAccessRolesService).syncApplicationRolesWithEcompDB(app); List<CentralV2Role> 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); diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java index 9673cb2c..b004a4a1 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java @@ -41,7 +41,6 @@ package org.onap.portalapp.portal.controller; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -55,10 +54,8 @@ import java.util.List; import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.json.simple.JSONObject; import org.junit.Before; import org.junit.Test; @@ -96,7 +93,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.mock.web.DelegatingServletInputStream; import org.springframework.web.servlet.ModelAndView; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -186,7 +182,7 @@ public class RoleManageControllerTest { Mockito.when(externalAccessRolesService.getApp(CentralApp().getUebKey())).thenReturn(apps); ResponseEntity<String> result = new ResponseEntity<>(HttpStatus.OK); Mockito.when(externalAccessRolesService.getNameSpaceIfExists(apps.get(0))).thenReturn(result); - CentralV2Role answer = new CentralV2Role(); + CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); Mockito.when(externalAccessRolesService.getRoleInfo((long) 1, "test")).thenReturn(answer); List<CentralV2RoleFunction> finalRoleFunctionList = new ArrayList<>(); Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenReturn(finalRoleFunctionList); @@ -205,7 +201,7 @@ public class RoleManageControllerTest { @Test(expected = Exception.class) public void getRoleExceptionTest() throws Exception { Mockito.when(appService.getApp((long) 1)).thenReturn(mockApp()); - CentralV2Role answer = new CentralV2Role(); + CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); Mockito.when(externalAccessRolesService.getRoleInfo((long) 1, "test")).thenReturn(answer); Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenThrow(nullPointerException); roleManageController.getRole(mockedRequest, mockedResponse, (long) 1, null); @@ -215,16 +211,16 @@ public class RoleManageControllerTest { @Test public void getRoleIfRoleIdNotNullTest() throws Exception { Mockito.when(appService.getApp((long) 1)).thenReturn(CentralApp()); - CentralV2Role answer = new CentralV2Role(); + CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); Mockito.when(externalAccessRolesService.getRoleInfo((long) 1, "test")).thenReturn(answer); List<CentralV2RoleFunction> finalRoleFunctionList = new ArrayList<>(); Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenReturn(finalRoleFunctionList); StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw); Mockito.when(mockedResponse.getWriter()).thenReturn(writer); - CentralV2Role currentRole = new CentralV2Role(); + CentralV2Role currentRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); SortedSet<CentralV2Role> parentRoles = new TreeSet<>(); - CentralV2Role centralV2Role = new CentralV2Role(); + CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); centralV2Role.setName("test"); parentRoles.add(centralV2Role); currentRole.setParentRoles(parentRoles); @@ -714,7 +710,8 @@ public class RoleManageControllerTest { .thenReturn(externalRequestFieldsValidator); Map<String, Object> actual = roleManageController.saveRole(mockedRequest, mockedResponse, CentralApp().getId()); final Map<String, Object> expected = new HashMap<>(); - expected.put("role", new CentralV2Role(null, "test")); + expected.put("role", + new CentralV2Role.CentralV2RoleBuilder().setId(null).setName("test").createCentralV2Role()); expected.put("status", "Success"); assertEquals(expected, actual); } @@ -765,7 +762,8 @@ public class RoleManageControllerTest { ExternalRequestFieldsValidator externalRequestFieldsValidator = new ExternalRequestFieldsValidator(true, ""); Mockito.when(externalAccessRolesService.saveRoleForApplication(Matchers.any(), Matchers.any())) .thenReturn(externalRequestFieldsValidator); - CentralV2Role cenV2Role = new CentralV2Role(1l, "test1"); + CentralV2Role cenV2Role = + new CentralV2Role.CentralV2RoleBuilder().setId(1l).setName("test1").createCentralV2Role(); cenV2Role.setActive(true); Mockito.when(externalAccessRolesService.getRoleInfo(Matchers.anyLong(), Matchers.any())).thenReturn(cenV2Role); Map<String, Object> actual = roleManageController.saveRole(mockedRequest, mockedResponse, CentralApp().getId()); @@ -860,7 +858,7 @@ public class RoleManageControllerTest { Mockito.when(externalAccessRolesService.getApp(Matchers.anyString())).thenReturn(appList); ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK); Mockito.when(externalAccessRolesService.getNameSpaceIfExists(Matchers.anyObject())).thenReturn(response); - CentralV2Role role = new CentralV2Role(1l, "test"); + CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().setId(1l).setName("test").createCentralV2Role(); role.setActive(true); Role currentRole = new Role(); currentRole.setName("test"); @@ -927,7 +925,7 @@ public class RoleManageControllerTest { Mockito.when(externalAccessRolesService.getApp(Matchers.anyString())).thenReturn(appList); ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK); Mockito.when(externalAccessRolesService.getNameSpaceIfExists(Matchers.anyObject())).thenReturn(response); - CentralV2Role role = new CentralV2Role(1l, "test"); + CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().setId(1l).setName("test").createCentralV2Role(); role.setActive(true); Role currentRole = new Role(); currentRole.setName("test"); diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java index 0e59d643..0331633c 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java @@ -82,16 +82,7 @@ import org.onap.portalapp.portal.ecomp.model.UploadRoleFunctionExtSystem; import org.onap.portalapp.portal.exceptions.InactiveApplicationException; import org.onap.portalapp.portal.exceptions.InvalidUserException; import org.onap.portalapp.portal.framework.MockitoTestSuite; -import org.onap.portalapp.portal.transport.BulkUploadRoleFunction; -import org.onap.portalapp.portal.transport.BulkUploadUserRoles; -import org.onap.portalapp.portal.transport.CentralRole; -import org.onap.portalapp.portal.transport.CentralUser; -import org.onap.portalapp.portal.transport.CentralV2Role; -import org.onap.portalapp.portal.transport.CentralizedAppRoles; -import org.onap.portalapp.portal.transport.EcompUserRoles; -import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator; -import org.onap.portalapp.portal.transport.GlobalRoleWithApplicationRoleFunction; -import org.onap.portalapp.portal.transport.LocalRole; +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; @@ -820,8 +811,8 @@ public class ExternalAccessRolesServiceImplTest { globalRoles.add(globalRole); Mockito.when(dataAccessService.executeNamedQuery("getGlobalRolesOfPortal", null, null)).thenReturn(globalRoles); List<CentralV2Role> expected = new ArrayList<>(); - CentralV2Role cenV2Role = new CentralV2Role(); - CentralV2Role cenV2Role2 = new CentralV2Role(); + CentralV2Role cenV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); + CentralV2Role cenV2Role2 = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); expected.add(cenV2Role); expected.add(cenV2Role2); List<CentralV2Role> actual = externalAccessRolesServiceImpl.getRolesForApp(app.getUebKey()); @@ -2366,7 +2357,7 @@ public class ExternalAccessRolesServiceImplTest { @Test public void convertV2CentralRoleListToOldVerisonCentralRoleListTest() { List<CentralV2Role> v2CenRoleList = new ArrayList<>(); - CentralV2Role cenV2Role = new CentralV2Role(2l, "test1"); + CentralV2Role cenV2Role = new CentralV2Role.CentralV2RoleBuilder().setId(2l).setName("test1").createCentralV2Role(); CentralV2RoleFunction CentralV2Role = new CentralV2RoleFunction("testcode", "test_name"); SortedSet<CentralV2RoleFunction> setV2RoleFuncs = new TreeSet<>(); setV2RoleFuncs.add(CentralV2Role); diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java index 4d07c792..785522d4 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java @@ -82,18 +82,7 @@ import org.onap.portalapp.portal.domain.EPUserAppRoles; import org.onap.portalapp.portal.domain.EPUserAppRolesRequest; import org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail; import org.onap.portalapp.portal.domain.ExternalSystemAccess; -import org.onap.portalapp.portal.transport.AppWithRolesForUser; -import org.onap.portalapp.portal.transport.CentralV2Role; -import org.onap.portalapp.portal.transport.EPUserAppCurrentRoles; -import org.onap.portalapp.portal.transport.EcompUserAppRoles; -import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator; -import org.onap.portalapp.portal.transport.FieldsValidator; -import org.onap.portalapp.portal.transport.FunctionalMenuItem; -import org.onap.portalapp.portal.transport.FunctionalMenuRole; -import org.onap.portalapp.portal.transport.RemoteRole; -import org.onap.portalapp.portal.transport.RemoteUserWithRoles; -import org.onap.portalapp.portal.transport.RoleInAppForUser; -import org.onap.portalapp.portal.transport.UserApplicationRoles; +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; @@ -204,10 +193,14 @@ public class UserRolesCommonServiceImplTest { Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp); List<RoleInAppForUser> mockRoleInAppForUserList = getMockedRoleInAppUserList(); List<CentralV2Role> mockCenV2Role = new ArrayList<>(); - CentralV2Role cenV2Role = new CentralV2Role(1l, null, null, null, null, null, "test1", true, null, - new TreeSet<>(), new TreeSet<>(), new TreeSet<>()); - CentralV2Role cenV2Role2 = new CentralV2Role(16l, null, null, null, null, null, "test2", true, null, - new TreeSet<>(), new TreeSet<>(), new TreeSet<>()); + CentralV2Role cenV2Role = new CentralV2Role.CentralV2RoleBuilder().setId(1l).setCreated(null).setModified(null) + .setCreatedId(null).setModifiedId(null).setRowNum(null).setName("test1").setActive(true) + .setPriority(null).setRoleFunctions(new TreeSet<>()).setChildRoles(new TreeSet<>()) + .setParentRoles(new TreeSet<>()).createCentralV2Role(); + CentralV2Role cenV2Role2 = new CentralV2Role.CentralV2RoleBuilder().setId(16l).setCreated(null) + .setModified(null).setCreatedId(null).setModifiedId(null).setRowNum(null).setName("test2") + .setActive(true).setPriority(null).setRoleFunctions(new TreeSet<>()).setChildRoles(new TreeSet<>()) + .setParentRoles(new TreeSet<>()).createCentralV2Role(); mockCenV2Role.add(cenV2Role); mockCenV2Role.add(cenV2Role2); Mockito.when(externalAccessRolesServiceImpl.getRolesForApp(mockApp.getUebKey())).thenReturn(mockCenV2Role); diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java index 57b1ab73..2240f9cf 100644 --- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java +++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java @@ -91,7 +91,7 @@ public class CentralUserAppTest { .setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST).setUebTopicName(TEST) .createCentralApp(); - CentralV2Role role = new CentralV2Role(); + CentralV2Role role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); centralV2UserApp.setUserId((long) 1); centralV2UserApp.setApp(app); @@ -112,7 +112,7 @@ public class CentralUserAppTest { .setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST).setUebTopicName(TEST) .createCentralApp(); - CentralV2Role role1 = new CentralV2Role(); + CentralV2Role role1 = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); assertEquals(centralV2UserApp.getUserId(), new Long(1)); assertEquals(centralV2UserApp.getPriority(), new Integer((Integer) 123)); |