From 706bcd4ee40dbff3f9efb5b68997cca164dd832e Mon Sep 17 00:00:00 2001 From: Madhan Neethiraj Date: Thu, 6 Oct 2022 01:07:17 -0700 Subject: [PATCH] RANGER-3941: updated unit tests for updates/optimizations introduced in earlier commit - #2 --- .../org/apache/ranger/biz/TestXUserMgr.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java index 629cfc771c..871857bbf8 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java @@ -231,6 +231,9 @@ public class TestXUserMgr { @Mock RangerTransactionSynchronizationAdapter transactionSynchronizationAdapter; + @Mock + XXGlobalStateDao xxGlobalStateDao; + @Rule public ExpectedException thrown = ExpectedException.none(); @@ -248,6 +251,7 @@ public void setup() { xXPortalUser.setLoginId(adminLoginID); xXPortalUser.setId(userId); currentUserSession.setXXPortalUser(xXPortalUser); + Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); } @After @@ -2438,6 +2442,8 @@ public void test63searchXUsers_Cases() { Mockito.when(xUserService.searchXUsers(testSearchCriteria)).thenReturn(vXUserListSort); VXGroupUserList vxGroupUserList = vxGroupUserList(); Mockito.when(xGroupUserService.searchXGroupUsers((SearchCriteria) Mockito.any())).thenReturn(vxGroupUserList); + VXGroup vXGroup = vxGroup(); + Mockito.when(xGroupService.readResource(Mockito.anyLong())).thenReturn(vXGroup); VXUserList dbVXUserList = xUserMgr.searchXUsers(testSearchCriteria); Assert.assertNotNull(dbVXUserList); testSearchCriteria.addParam("isvisible", "true"); @@ -3771,7 +3777,6 @@ public void test111CreateOrUpdateXUsers() { XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class); XXModuleDefDao xXModuleDefDao = Mockito.mock(XXModuleDefDao.class); - XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class); XXUser xXUser = xxUser(vXUser); VXPortalUser vXPortalUser = userProfile(); vXPortalUser.setFirstName("null"); @@ -3789,7 +3794,6 @@ public void test111CreateOrUpdateXUsers() { Mockito.when(xxUserDao.findByUserName(vXUser.getName())).thenReturn(xXUser); Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao); Mockito.when(daoManager.getXXModuleDef()).thenReturn(xXModuleDefDao); - Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); Mockito.when(xXModuleDefDao.getAll()).thenReturn(xXModuleDefs); Mockito.when(userMgr.mapVXPortalUserToXXPortalUser((VXPortalUser) Mockito.any())).thenReturn(xXPortalUser); @@ -3870,7 +3874,6 @@ public void test112CreateOrUpdateXUsers() { XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class); XXModuleDefDao xXModuleDefDao = Mockito.mock(XXModuleDefDao.class); XXUserPermissionDao xUserPermissionDao = Mockito.mock(XXUserPermissionDao.class); - XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class); Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao); @@ -3884,7 +3887,6 @@ public void test112CreateOrUpdateXUsers() { Mockito.when(xUserService.createResource((VXUser) Mockito.any())).thenReturn(vXUser); Mockito.when(xUserPermissionService.populateViewBean(xUserPermissionObj)).thenReturn(userPermission); Mockito.when(xUserPermissionService.updateResource((VXUserPermission) Mockito.any())).thenReturn(userPermission); - Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); xUserMgr.createOrUpdateXUsers(users); vXUser.setPassword("*****"); @@ -3903,7 +3905,6 @@ public void test113CreateOrUpdateXUsers() { VXUserList users = new VXUserList(vXUserList); XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); XXModuleDefDao xXModuleDefDao = Mockito.mock(XXModuleDefDao.class); - XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class); XXUser xXUser = xxUser(vXUser); VXPortalUser vXPortalUser = userProfile(); vXPortalUser.setFirstName("null"); @@ -3920,7 +3921,6 @@ public void test113CreateOrUpdateXUsers() { Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao); Mockito.when(xxUserDao.findByUserName(vXUser.getName())).thenReturn(xXUser); Mockito.when(daoManager.getXXModuleDef()).thenReturn(xXModuleDefDao); - Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); Mockito.when(xXModuleDefDao.getAll()).thenReturn(xXModuleDefs); Mockito.when(xUserService.updateResource(vXUser)).thenReturn(vXUser); @@ -3975,7 +3975,6 @@ public void test114CreateOrUpdateXGroups() { VXUser vXUser = vxUser(); List vXUserList=new ArrayList(); vXUserList.add(vXUser); - XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class); VXPortalUser vXPortalUser = userProfile(); XXPortalUser xXPortalUser = xxPortalUser(vXPortalUser); xXPortalUser.setUserSource(RangerCommonEnums.USER_EXTERNAL); @@ -3983,7 +3982,6 @@ public void test114CreateOrUpdateXGroups() { lstRole.add(RangerConstants.ROLE_SYS_ADMIN); vXPortalUser.setUserRoleList(lstRole); - Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); List xUserPermissionsList = new ArrayList(); XXUserPermission xUserPermissionObj = new XXUserPermission(); @@ -4135,9 +4133,11 @@ public void test119GetRangerUserStore() throws Exception { destroySession(); setup(); Long lastKnownUserStoreVersion=Long.valueOf(1); - XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class); - Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); Mockito.when(xxGlobalStateDao.getAppDataVersion(RANGER_USER_GROUP_GLOBAL_STATE_NAME)).thenReturn(lastKnownUserStoreVersion); + Map> userGroupMap = new HashMap>(); + XXUserDao xxUserDao = Mockito.mock(XXUserDao.class); + Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao); + Mockito.when(xxUserDao.findGroupsByUserIds()).thenReturn(userGroupMap); xUserMgr.getRangerUserStoreIfUpdated(lastKnownUserStoreVersion); } @@ -4146,8 +4146,6 @@ public void test120GetUserStoreVersion() throws Exception { destroySession(); setup(); Long lastKnownUserStoreVersion=Long.valueOf(1); - XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class); - Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao); Mockito.when(xxGlobalStateDao.getAppDataVersion(RANGER_USER_GROUP_GLOBAL_STATE_NAME)).thenReturn(lastKnownUserStoreVersion); Long userStoreVersion = xUserMgr.getUserStoreVersion(); Assert.assertNotNull(userStoreVersion);