X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common-test%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Ftest%2Fcontroller%2FAppsControllerExternalRequestTest.java;h=1db55526a31855a4f8307496663673b00a379ad7;hb=1b29c0944a7eba1c88cfd25c94e4dd7ed0f82dc7;hp=ae761a144367de0b3b2410b92ff7a707b8f6a54f;hpb=627badaf69987c01811c477219fd943757a635f5;p=portal.git diff --git a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/AppsControllerExternalRequestTest.java b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/AppsControllerExternalRequestTest.java index ae761a14..1db55526 100644 --- a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/AppsControllerExternalRequestTest.java +++ b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/AppsControllerExternalRequestTest.java @@ -67,10 +67,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage("Missing required field: email, loginId, or loginPwd"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); EPUser user = mockUser.mockEPUser(); - user.setEmail("guestT@Research.att.com"); + user.setEmail("guestT@test.portal.onap.org"); Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest .postPortalAdmin(mockedRequest, mockedResponse, user); @@ -82,10 +81,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage("java.lang.NullPointerException"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); EPUser user = mockUser.mockEPUser(); - user.setEmail("guestT@Research.att.com"); + user.setEmail("guestT@test.portal.onap.org"); user.setLoginPwd("pwd"); user.setLoginId("Test"); Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); @@ -100,10 +98,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage(null); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); EPUser user = mockUser.mockEPUser(); - user.setEmail("guestT@Research.att.com"); + user.setEmail("guestT@test.portal.onap.org"); user.setLoginPwd("pwd"); user.setLoginId("Test"); List expectedList = null; @@ -120,10 +117,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage(null); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.OK); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK); EPUser user = mockUser.mockEPUser(); - user.setEmail("guestT@Research.att.com"); + user.setEmail("guestT@test.portal.onap.org"); user.setLoginPwd("pwd"); user.setLoginId("Test"); List expectedList = new ArrayList(); @@ -142,10 +138,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage(null); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.OK); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK); EPUser user = mockUser.mockEPUser(); - user.setEmail("guestT@Research.att.com"); + user.setEmail("guestT@test.portal.onap.org"); user.setLoginPwd("pwd"); user.setLoginId("Test"); List expectedList = new ArrayList(); @@ -175,10 +170,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage("FieldsValidator [httpStatusCode=500, errorCode=null, fields=null]"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); EPUser user = mockUser.mockEPUser(); - user.setEmail("guestT@Research.att.com"); + user.setEmail("guestT@test.portal.onap.org"); user.setLoginPwd("pwd"); user.setLoginId("Test"); List expectedList = new ArrayList(); @@ -210,8 +204,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage("Unexpected field: id"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); OnboardingApp expectedOnboardingApp = new OnboardingApp(); expectedOnboardingApp.id = (long) 1; @@ -227,8 +220,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { expectedportalRestResponse.setMessage( "Missing required field: name, url, restUrl, restrictedApp, isOpen, isEnabled, myLoginsAppOwner"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); OnboardingApp expectedOnboardingApp = new OnboardingApp(); expectedOnboardingApp.id = null; @@ -239,126 +231,12 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { } - @Test - public void postOnboardAppExternalNotNullTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage("Failed to find user: Test_Owener"); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = null; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(null); - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .postOnboardAppExternal(mockedRequest, mockedResponse, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - - } - - @Test - public void postOnboardAppExternalIfUSerListNotNullTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage("User lacks Portal admin role: null"); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = null; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - List userList = new ArrayList(); - EPUser user = mockUser.mockEPUser(); - userList.add(user); - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(userList); - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .postOnboardAppExternal(mockedRequest, mockedResponse, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - - } - - @Test - public void postOnboardAppExternalIfSuperAdminTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage(null); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.OK); - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = null; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - List userList = new ArrayList(); - EPUser user = mockUser.mockEPUser(); - userList.add(user); - FieldsValidator expectedFieldValidator = new FieldsValidator(); - expectedFieldValidator.setHttpStatusCode((long) 200); - expectedFieldValidator.setFields(null); - expectedFieldValidator.setErrorCode(null); - Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true); - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(userList); - Mockito.when(appService.addOnboardingApp(expectedOnboardingApp, user)).thenReturn(expectedFieldValidator); - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .postOnboardAppExternal(mockedRequest, mockedResponse, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - - } - - @Test - public void postOnboardAppExternalFieldValidatorTestTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage("FieldsValidator [httpStatusCode=500, errorCode=null, fields=null]"); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = null; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - List userList = new ArrayList(); - EPUser user = mockUser.mockEPUser(); - userList.add(user); - FieldsValidator expectedFieldValidator = new FieldsValidator(); - expectedFieldValidator.setHttpStatusCode((long) 500); - expectedFieldValidator.setFields(null); - expectedFieldValidator.setErrorCode(null); - Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true); - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(userList); - Mockito.when(appService.addOnboardingApp(expectedOnboardingApp, user)).thenReturn(expectedFieldValidator); - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .postOnboardAppExternal(mockedRequest, mockedResponse, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - - } - @Test public void putOnboardAppExternalifAppNullTest() { PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); expectedportalRestResponse.setMessage("Unexpected value for field: id"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); Long appId = null; OnboardingApp expectedOnboardingApp = new OnboardingApp(); expectedOnboardingApp.id = null; @@ -374,128 +252,10 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite { expectedportalRestResponse.setMessage( "Missing required field: name, url, restUrl, restrictedApp, isOpen, isEnabled, myLoginsAppOwner"); expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); - Long appId = (long) 1; - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = (long) 1; - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - } - - @Test - public void putOnboardAppExternalIfOnboardingIfUserListNullTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage("Failed to find user: Test_Owener"); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); + expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR); Long appId = (long) 1; OnboardingApp expectedOnboardingApp = new OnboardingApp(); expectedOnboardingApp.id = (long) 1; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(null); - - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - } - - @Test - public void putOnboardAppExternalIfOnboardingIfUserListNotNullTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage("User lacks Portal admin role: null"); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); - Long appId = (long) 1; - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = (long) 1; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - List userList = new ArrayList(); - EPUser user = mockUser.mockEPUser(); - userList.add(user); - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(userList); - Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false); - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - } - - @Test - public void putOnboardAppExternalIfOnboardingIfSuperAdminTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage(null); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.OK); - Long appId = (long) 1; - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = (long) 1; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - FieldsValidator expectedFieldValidator = new FieldsValidator(); - expectedFieldValidator.setHttpStatusCode((long) 200); - expectedFieldValidator.setFields(null); - expectedFieldValidator.setErrorCode(null); - List userList = new ArrayList(); - EPUser user = mockUser.mockEPUser(); - userList.add(user); - Mockito.when(appService.modifyOnboardingApp(expectedOnboardingApp, user)).thenReturn(expectedFieldValidator); - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(userList); - Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true); - PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest - .putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp); - assertEquals(actualPortalRestResponse, expectedportalRestResponse); - } - - @Test - public void putOnboardAppExternalIfOnboardingIfStatusNotSuccessTest() { - PortalRestResponse expectedportalRestResponse = new PortalRestResponse(); - expectedportalRestResponse.setMessage("FieldsValidator [httpStatusCode=500, errorCode=null, fields=null]"); - expectedportalRestResponse.setResponse(null); - PortalRestStatusEnum portalRestStatusEnum = null; - expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR); - Long appId = (long) 1; - OnboardingApp expectedOnboardingApp = new OnboardingApp(); - expectedOnboardingApp.id = (long) 1; - expectedOnboardingApp.name = "Test"; - expectedOnboardingApp.url = "Test"; - expectedOnboardingApp.restUrl = "Test"; - expectedOnboardingApp.myLoginsAppOwner = "Test_Owener"; - expectedOnboardingApp.restrictedApp = false; - expectedOnboardingApp.isOpen = false; - expectedOnboardingApp.isEnabled = false; - - FieldsValidator expectedFieldValidator = new FieldsValidator(); - expectedFieldValidator.setHttpStatusCode((long) 500); - expectedFieldValidator.setFields(null); - expectedFieldValidator.setErrorCode(null); - - List userList = new ArrayList(); - EPUser user = mockUser.mockEPUser(); - userList.add(user); - Mockito.when(appService.modifyOnboardingApp(expectedOnboardingApp, user)).thenReturn(expectedFieldValidator); - Mockito.when(userService.getUserByUserId(expectedOnboardingApp.myLoginsAppOwner)).thenReturn(userList); - Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true); PortalRestResponse actualPortalRestResponse = appsControllerExternalRequest .putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp); assertEquals(actualPortalRestResponse, expectedportalRestResponse);