Enable junit test cases and fix defects.

[portal.git] / ecomp-portal-BE-common-test / src / main / java / org / openecomp / portalapp / portal / test / controller / PortalAdminControllerTest.java

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 2054272..4f3d179 100644 (file)
--- 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));
-       }
-       
+                       
 }