RANGER-3941: updated unit tests for updates/optimizations introduced …

…in earlier commit - #2

(cherry picked from commit 706bcd4)

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");
@@ -3770,7 +3776,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");
@@ -3788,7 +3793,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);
@@ -3869,7 +3873,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);
@@ -3883,7 +3886,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("*****");
@@ -3902,7 +3904,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");
@@ -3919,7 +3920,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);
 
@@ -3974,15 +3974,13 @@ public void test114CreateOrUpdateXGroups() {
 		VXUser vXUser = vxUser();
 		List<VXUser> vXUserList=new ArrayList<VXUser>();
 		vXUserList.add(vXUser);
-		XXGlobalStateDao xxGlobalStateDao = Mockito.mock(XXGlobalStateDao.class);
 		VXPortalUser vXPortalUser = userProfile();
 		XXPortalUser xXPortalUser = xxPortalUser(vXPortalUser);
 		xXPortalUser.setUserSource(RangerCommonEnums.USER_EXTERNAL);
 		List<String> lstRole = new ArrayList<String>();
 		lstRole.add(RangerConstants.ROLE_SYS_ADMIN);
 
 		vXPortalUser.setUserRoleList(lstRole);
-		Mockito.when(daoManager.getXXGlobalState()).thenReturn(xxGlobalStateDao);
 
 		List<XXUserPermission> xUserPermissionsList = new ArrayList<XXUserPermission>();
 		XXUserPermission xUserPermissionObj = new XXUserPermission();
@@ -4134,9 +4132,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<String, Set<String>> userGroupMap = new HashMap<String, Set<String>>();
+		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
+		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(xxUserDao.findGroupsByUserIds()).thenReturn(userGroupMap);
 		xUserMgr.getRangerUserStoreIfUpdated(lastKnownUserStoreVersion);
 	}
 
@@ -4145,8 +4145,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);