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%2FPortalAdminControllerTest.java;h=4f3d179193b5069b43e9ea346b0aba6cae8ffafe;hb=e43e03d4da9bd760d67d746a949efbb7e5d102a8;hp=20542729abb33c9a36b2be28a35c5e0971fa5e79;hpb=f57e82d8c734e59977c39bc6a0139174cb7f0649;p=portal.git

diff --git a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/PortalAdminControllerTest.java b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/PortalAdminControllerTest.java
index 20542729..4f3d1791 100644
--- a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/PortalAdminControllerTest.java
+++ b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/PortalAdminControllerTest.java
@@ -151,81 +151,5 @@ public class PortalAdminControllerTest extends MockitoTestSuite{
 		assertNull(portalAdminController.createPortalAdmin(mockedRequest, sbcid, mockedResponse));
 
 	}
-
-	@Test
-	public void deletePortalAdminTest()
-	{
-		EPUser user = mockUser.mockEPUser();
-		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-	
-		FieldsValidator expectedFieldValidator = new FieldsValidator();
-		expectedFieldValidator.setHttpStatusCode((long) 200);
-		expectedFieldValidator.setFields(null);
-		expectedFieldValidator.setErrorCode(null);
-		FieldsValidator actualFieldValidator = new FieldsValidator();
-		String userInfo = "1-test";
-		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
-		Mockito.when(portalAdminService.deletePortalAdmin((long) 1)).thenReturn(expectedFieldValidator);
-		actualFieldValidator = portalAdminController.deletePortalAdmin(mockedRequest, userInfo, mockedResponse);
-       assertEquals(actualFieldValidator,expectedFieldValidator);
-
-	}
-	
-	@Test
-	public void deletePortalAdminIfUserIsSuperAdminTest()
-	{
-		EPUser user = mockUser.mockEPUser();
-		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false);
-		String userInfo = "1-test";
-		assertNull(portalAdminController.deletePortalAdmin(mockedRequest, userInfo, mockedResponse));
-
-	}
-
-	@Test
-	public void deletePortalAdminWithNoUserInfoTest()
-	{
-		EPUser user = mockUser.mockEPUser();
-		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false);
-		String userInfo = "";
-		assertNull(portalAdminController.deletePortalAdmin(mockedRequest, userInfo, mockedResponse));
-	}
-	
-	@Test
-	public void getRolesByAppIfUserNullTest()
-	{
-		EPUser user = null;
-		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Long appId = (long) 1;
-		assertNull(portalAdminController.getRolesByApp(mockedRequest, appId, mockedResponse));
-	}
-	
-	@Test
-	public void getRolesByAppTest()
-	{
-		EPUser user = mockUser.mockEPUser();;
-		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		List<EPRole> expectedRoleList = new ArrayList<EPRole>();	
-		EPRole ePRole = new EPRole();
-		expectedRoleList.add(ePRole);
-		Long appId = (long) 1;
-		Mockito.when(adminRolesService.getRolesByApp(user, appId)).thenReturn(expectedRoleList);
-		List<EPRole> actualRoleList = 	portalAdminController.getRolesByApp(mockedRequest, appId, mockedResponse);
-		assertEquals(actualRoleList,expectedRoleList);
-	}
-	
-	@Test
-	public void getRolesByAppExceptionTest()
-	{
-		EPUser user = mockUser.mockEPUser();;
-		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		List<EPRole> expectedRoleList = new ArrayList<EPRole>();	
-		EPRole ePRole = new EPRole();
-		expectedRoleList.add(ePRole);
-		Long appId = (long) 1;
-		Mockito.when(adminRolesService.getRolesByApp(user, appId)).thenThrow(nullPointerException);
-		assertNull(portalAdminController.getRolesByApp(mockedRequest, appId, mockedResponse));
-	}
-	
+			
 }