You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/05/10 08:41:58 UTC
[1/2] ranger git commit: RANGER-1498 - Remove unnecessary mockito
stubs
Repository: ranger
Updated Branches:
refs/heads/master 0ba3e129a -> a3a5e2a7b
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
index 5068fdc..dd9459a 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
@@ -150,14 +150,14 @@ public class TestXUserREST {
@Mock AppConstants AppConstants;
@Mock RangerConstants RangerConstants;
@Mock VXResource vXResource;
- @Mock VXResponse vXResponse;
+ @Mock VXResponse vXResponse;
@Mock XXResource xXResource;
@Mock XXAuditMap XXAuditMap;
@Mock XAuditMapService xAuditMapService;
@Mock DaoManager daoManager;
@Mock XPermMapService xPermMapService;
@Mock XXAsset XXAsset;
- @Mock RangerDaoManager rangerDaoManager;
+ @Mock RangerDaoManager rangerDaoManager;
@Mock XXPermMap XXPermMap;
@Mock Response response;
@Mock VXPermMapList vXPermMapList;
@@ -193,7 +193,7 @@ public class TestXUserREST {
@Mock RangerPolicy rangerPolicy;
@Mock RangerPolicyItem rangerPolicyItem;
@Mock RangerDataMaskPolicyItem rangerDataMaskPolicyItem;
- @Mock RangerRowFilterPolicyItem rangerRowFilterPolicyItem;
+ @Mock RangerRowFilterPolicyItem rangerRowFilterPolicyItem;
@Test
public void test1getXGroup() {
@@ -244,7 +244,7 @@ public class TestXUserREST {
assertEquals(compareTestVXGroup.getId(),retVxGroup.getId());
assertEquals(compareTestVXGroup.getName(),retVxGroup.getName());
Mockito.verify(xUserMgr).createXGroup(compareTestVXGroup);
- }
+ }
@Test
public void test5updateXGroup() {
VXGroup compareTestVXGroup=createVXGroup();
@@ -268,7 +268,7 @@ public class TestXUserREST {
assertEquals(compareTestVXGroup.getId(),retVxGroup.getId());
assertEquals(compareTestVXGroup.getName(),retVxGroup.getName());
Mockito.verify(xUserMgr).updateXGroup(compareTestVXGroup);
- }
+ }
@Test
public void test7modifyGroupsVisibility() {
HashMap<Long, Integer> groupVisibilityMap=creategroupVisibilityMap();
@@ -303,7 +303,7 @@ public class TestXUserREST {
xUserRest.deleteXGroup(id,request);
Mockito.verify(xUserMgr).deleteXGroup(id,forceDelete);
Mockito.verify(request).getParameter("forceDelete");
- }
+ }
@Test
public void test10deleteXGroupNotEmpty() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
@@ -323,7 +323,7 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "name", "group name", null)).thenReturn("");
Mockito.when(searchUtil.extractInt(request, testSearchCriteria, "isVisible", "Group Visibility")).thenReturn(1);
@@ -333,7 +333,7 @@ public class TestXUserREST {
VXGroupList outputvXGroupList=xUserRest.searchXGroups(request);
Mockito.verify(xUserMgr).searchXGroups(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "name", "group name", null);
Mockito.verify(searchUtil).extractInt(request, testSearchCriteria, "isVisible", "Group Visibility");
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "groupSource", "group source", null);
@@ -341,27 +341,27 @@ public class TestXUserREST {
assertEquals(outputvXGroupList.getTotalCount(),testvXGroupList.getTotalCount());
assertEquals(outputvXGroupList.getClass(),testvXGroupList.getClass());
- }
+ }
@SuppressWarnings("unchecked")
@Test
public void test12countXGroups() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXGroupSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXGroups(request);
Mockito.verify(xUserMgr).getXGroupSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getValue(),vXLong.getValue());
assertEquals(testvxLong.getClass(),vXLong.getClass());
- }
+ }
@Test
public void test13getXUser() {
@@ -394,7 +394,7 @@ public class TestXUserREST {
assertNotNull(gotVXUser);
assertEquals(vxUser.getId(), gotVXUser.getId());
assertEquals(vxUser.getName(), gotVXUser.getName());
- }
+ }
@Test
public void test16createXUserGroupFromMap() {
VXUserGroupInfo vXUserGroupInfo= new VXUserGroupInfo();
@@ -429,7 +429,7 @@ public class TestXUserREST {
assertNotNull(gotVXUser);
assertEquals(vxUser.getId(), gotVXUser.getId());
assertEquals(vxUser.getName(), gotVXUser.getName());
- }
+ }
@Test
public void test19secureUpdateXUser() {
@@ -443,12 +443,12 @@ public class TestXUserREST {
assertNotNull(gotVXUser);
assertEquals(vxUser.getId(), gotVXUser.getId());
assertEquals(vxUser.getName(), gotVXUser.getName());
- }
+ }
@Test
public void test20modifyUserVisibility() {
HashMap<Long, Integer> testVisibilityMap= new HashMap<Long, Integer>();
testVisibilityMap.put(1L,0);
- Mockito.doNothing().when(xUserMgr).modifyUserVisibility(testVisibilityMap);
+ Mockito.doNothing().when(xUserMgr).modifyUserVisibility(testVisibilityMap);
xUserRest.modifyUserVisibility(testVisibilityMap);
Mockito.verify(xUserMgr).modifyUserVisibility(testVisibilityMap);
}
@@ -477,7 +477,7 @@ public class TestXUserREST {
xUserRest.deleteXUser(id,request);
Mockito.verify(xUserMgr).deleteXUser(id,forceDelete);
Mockito.verify(request).getParameter("forceDelete");
- }
+ }
@Test
public void test23deleteXUserNotEmpty() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
@@ -498,7 +498,7 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyList())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,Mockito.<SortField>anyList())).thenReturn(testSearchCriteria);
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "name", "User name", null)).thenReturn("");
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "emailAddress", "Email Address",null)).thenReturn("");
@@ -517,7 +517,7 @@ public class TestXUserREST {
VXUserList gotVXUserList=xUserRest.searchXUsers(request);
Mockito.verify(xUserMgr).searchXUsers(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "name", "User name", null);
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "emailAddress", "Email Address",null);
@@ -529,21 +529,21 @@ public class TestXUserREST {
assertNotNull(gotVXUserList);
assertEquals(testVXUserList.getTotalCount(),gotVXUserList.getTotalCount());
assertEquals(testVXUserList.getClass(),gotVXUserList.getClass());
- }
+ }
@SuppressWarnings("unchecked")
@Test
public void test25countXUsers() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXUserSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXUsers(request);
Mockito.verify(xUserMgr).getXUserSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getValue(),vXLong.getValue());
@@ -560,7 +560,7 @@ public class TestXUserREST {
assertEquals(testVXGroupUser.getClass(),retVxGroupUser.getClass());
assertEquals(testVXGroupUser.getId(),retVxGroupUser.getId());
Mockito.verify(xUserMgr).getXGroupUser(id);
- }
+ }
@Test
public void test27createXGroupUser() {
VXGroupUser testVXGroupUser= createVXGroupUser();
@@ -572,7 +572,7 @@ public class TestXUserREST {
assertEquals(testVXGroupUser.getClass(),retVxGroupUser.getClass());
assertEquals(testVXGroupUser.getId(),retVxGroupUser.getId());
Mockito.verify(xUserMgr).createXGroupUser(testVXGroupUser);
- }
+ }
@Test
public void test28updateXGroupUser() {
VXGroupUser testVXGroupUser= createVXGroupUser();
@@ -601,7 +601,7 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
VXGroupUserList testVXGroupUserList=new VXGroupUserList();
VXGroupUser vXGroupUser = createVXGroupUser();
@@ -612,7 +612,7 @@ public class TestXUserREST {
VXGroupUserList outputvXGroupList=xUserRest.searchXGroupUsers(request);
Mockito.verify(xUserMgr).searchXGroupUsers(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(outputvXGroupList);
assertEquals(outputvXGroupList.getClass(),testVXGroupUserList.getClass());
@@ -625,14 +625,14 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXGroupUserSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXGroupUsers(request);
Mockito.verify(xUserMgr).getXGroupUserSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getValue(),vXLong.getValue());
@@ -672,7 +672,7 @@ public class TestXUserREST {
assertEquals(compareTestVXGroup.getClass(),retVxGroup.getClass());
assertEquals(compareTestVXGroup.getId(),retVxGroup.getId());
Mockito.verify(xUserMgr).updateXGroupGroup(compareTestVXGroup);
- }
+ }
@Test
public void test35deleteXGroupGroup() {
boolean forceDelete = false;
@@ -693,13 +693,13 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
Mockito.when(xUserMgr.searchXGroupGroups(testSearchCriteria)).thenReturn(testvXGroupGroupList);
VXGroupGroupList outputvXGroupGroupList=xUserRest.searchXGroupGroups(request);
Mockito.verify(xUserMgr).searchXGroupGroups(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(outputvXGroupGroupList);
assertEquals(outputvXGroupGroupList.getClass(),testvXGroupGroupList.getClass());
@@ -711,19 +711,19 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXGroupGroupSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXGroupGroups(request);
Mockito.verify(xUserMgr).getXGroupGroupSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getClass(),vXLong.getClass());
assertEquals(testvxLong.getValue(),vXLong.getValue());
- }
+ }
@Test
public void test38getXPermMapVXResourceNull() throws Exception{
VXPermMap permMap = testcreateXPermMap();
@@ -732,20 +732,20 @@ public class TestXUserREST {
VXResource testVxResource= new VXResource();
Mockito.when(xResourceService.readResource(null)).thenReturn(testVxResource);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject())).thenThrow(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXPermMap retVxGroup= xUserRest.getXPermMap(id);
Mockito.verify(xUserMgr).getXPermMap(id);
Mockito.verify(xResourceService).readResource(null);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject());
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any());
assertEquals(permMap.getId(),retVxGroup.getId());
assertEquals(permMap.getClass(),retVxGroup.getClass());
assertNotNull(retVxGroup);
- }
+ }
@Test
public void test39getXPermMapNotNull() throws Exception{
VXPermMap permMap = testcreateXPermMap();
@@ -777,7 +777,7 @@ public class TestXUserREST {
permMap.setResourceId(null);
Mockito.when(xUserMgr.createXPermMap(permMap)).thenReturn(permMap);
Mockito.when(xResourceService.readResource(permMap.getResourceId())).thenReturn(null);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject())).thenThrow(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXPermMap retVxGroup=xUserRest.createXPermMap(permMap);
@@ -788,8 +788,8 @@ public class TestXUserREST {
Mockito.verify(xUserMgr).createXPermMap(permMap);
Mockito.verify(xResourceService).readResource(permMap.getResourceId());
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject());
- }
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any());
+ }
@Test
public void test42createXPermMapNull() {
@@ -799,7 +799,7 @@ public class TestXUserREST {
Mockito.verify(xUserMgr).createXPermMap(null);
assertNull(retVxGroup);
- }
+ }
@Test
public void test43createXPermMapNullVXResource() {
@@ -869,7 +869,7 @@ public class TestXUserREST {
Mockito.doNothing().when(xUserMgr).deleteXPermMap(id, forceDelete);
xUserRest.deleteXPermMap(id,request);
Mockito.verify(xUserMgr).deleteXPermMap(id,forceDelete);
- }
+ }
@SuppressWarnings("unchecked")
@Test
public void test48searchXPermMaps() {
@@ -877,9 +877,9 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
- List <VXPermMap> vXPermMaps= new ArrayList<VXPermMap>();
+ List <VXPermMap> vXPermMaps= new ArrayList<VXPermMap>();
vXPermMaps.add(permMap);
VXPermMapList testvXGroupList=new VXPermMapList() ;
testvXGroupList.setTotalCount(1);
@@ -888,28 +888,28 @@ public class TestXUserREST {
VXPermMapList outputvXGroupList=xUserRest.searchXPermMaps(request);
Mockito.verify(xUserMgr).searchXPermMaps(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(outputvXGroupList);
assertEquals(outputvXGroupList.getClass(),testvXGroupList.getClass());
assertEquals(outputvXGroupList.getTotalCount(),testvXGroupList.getTotalCount());
- }
+ }
@SuppressWarnings("unchecked")
@Test
public void test49countXPermMaps() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- SearchCriteria testSearchCriteria=createsearchCriteria();
+ SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
- vXLong.setValue(1);
+ vXLong.setValue(1);
Mockito.when(xUserMgr.getXPermMapSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXPermMaps(request);
Mockito.verify(xUserMgr).getXPermMapSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
- }
+ }
@Test
public void test50getXAuditMapVXAuditMapNull() {
VXAuditMap testvXAuditMap = createVXAuditMapObj();
@@ -917,7 +917,7 @@ public class TestXUserREST {
VXResource testVxResource= createVXResource();
Mockito.when(xResourceService.readResource(null)).thenReturn(testVxResource);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject())).thenThrow(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXAuditMap retVXAuditMap=xUserRest.getXAuditMap(testvXAuditMap.getResourceId());
@@ -928,7 +928,7 @@ public class TestXUserREST {
Mockito.verify(xUserMgr).getXAuditMap(testvXAuditMap.getResourceId());
Mockito.verify(xResourceService).readResource(null);
- Mockito.verify(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject()));
+ Mockito.verify(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any()));
}
@Test
@@ -970,7 +970,7 @@ public class TestXUserREST {
Mockito.when(xUserMgr.createXAuditMap(testvXAuditMap)).thenReturn(testvXAuditMap);
VXResource testVxResource= createVXResource();
- Mockito.when(xResourceService.readResource(testvXAuditMap.getResourceId())).thenReturn(testVxResource);
+ Mockito.when(xResourceService.readResource(testvXAuditMap.getResourceId())).thenReturn(testVxResource);
VXAuditMap retvXAuditMap= xUserRest.createXAuditMap(testvXAuditMap);
assertEquals(testvXAuditMap.getId(),retvXAuditMap.getId());
assertEquals(testvXAuditMap.getClass(),retvXAuditMap.getClass());
@@ -991,7 +991,7 @@ public class TestXUserREST {
Mockito.when(xResourceService.readResource(testvXAuditMap.getResourceId())).thenReturn(null);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject())).thenThrow(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXAuditMap retvXAuditMap= xUserRest.createXAuditMap(testvXAuditMap);
@@ -1001,7 +1001,7 @@ public class TestXUserREST {
Mockito.verify(xUserMgr).createXAuditMap(testvXAuditMap);
Mockito.verify(xResourceService).readResource(testvXAuditMap.getResourceId());
- Mockito.verify(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject()));
+ Mockito.verify(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any()));
}@Test
public void test55createXAuditMapNull() {
@@ -1012,7 +1012,7 @@ public class TestXUserREST {
assertNull(retvXAuditMap);
Mockito.verify(xUserMgr).createXAuditMap(null);
- }
+ }
@Test
public void test56updateXAuditMap() {
@@ -1039,13 +1039,13 @@ public class TestXUserREST {
Mockito.when(xUserMgr.updateXAuditMap(testvXAuditMap)).thenReturn(testvXAuditMap);
Mockito.when(xResourceService.readResource(null)).thenReturn(null);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject())).thenThrow(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXAuditMap retvXAuditMap=xUserRest.updateXAuditMap(testvXAuditMap);
assertNull(retvXAuditMap);
Mockito.verify(xUserMgr).updateXAuditMap(testvXAuditMap);
Mockito.verify(xResourceService).readResource(null);
- Mockito.verify(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.anyObject()));
+ Mockito.verify(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums)Mockito.any()));
}
@Test
public void test58updateXAuditMapVXResourceNull() {
@@ -1070,39 +1070,39 @@ public class TestXUserREST {
VXAuditMap testvXAuditMap = createVXAuditMapObj();
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
- List <VXAuditMap> testvXAuditMaps= new ArrayList<VXAuditMap>();
+ List <VXAuditMap> testvXAuditMaps= new ArrayList<VXAuditMap>();
testvXAuditMaps.add(testvXAuditMap);
VXAuditMapList testVXAuditMapList=new VXAuditMapList() ;
- testVXAuditMapList.setVXAuditMaps(testvXAuditMaps);
+ testVXAuditMapList.setVXAuditMaps(testvXAuditMaps);
Mockito.when(xUserMgr.searchXAuditMaps(testSearchCriteria)).thenReturn(testVXAuditMapList);
VXAuditMapList outputVXAuditMapList=xUserRest.searchXAuditMaps(request);
Mockito.verify(xUserMgr).searchXAuditMaps(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(outputVXAuditMapList);
assertEquals(outputVXAuditMapList.getClass(),testVXAuditMapList.getClass());
assertEquals(outputVXAuditMapList.getResultSize(),testVXAuditMapList.getResultSize());
- }
+ }
@SuppressWarnings("unchecked")
@Test
public void test61countXAuditMaps() {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- SearchCriteria testSearchCriteria=createsearchCriteria();
+ SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
- vXLong.setValue(1);
+ vXLong.setValue(1);
Mockito.when(xUserMgr.getXAuditMapSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXAuditMaps(request);
Mockito.verify(xUserMgr).getXAuditMapSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertEquals(testvxLong.getClass(),vXLong.getClass());
assertEquals(testvxLong.getValue(),vXLong.getValue());
assertNotNull(testvxLong);
@@ -1270,7 +1270,7 @@ public class TestXUserREST {
assertEquals(groupList.getClass(),retVxGroupList.getClass());
assertEquals(groupList.getResultSize(),retVxGroupList.getResultSize());
Mockito.verify(xUserMgr).getXUserGroups(id);
- }
+ }
@Test
public void test73getXGroupUsers() {
@@ -1299,7 +1299,7 @@ public class TestXUserREST {
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
Mockito.when(searchUtil.extractLong(request, testSearchCriteria, "id", "Auth Session Id")).thenReturn(1L);
@@ -1328,7 +1328,7 @@ public class TestXUserREST {
VXAuthSessionList outputvXGroupList=xUserRest.getAuthSessions(request);
Mockito.verify(sessionMgr).searchAuthSessions(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
Mockito.verify(searchUtil).extractLong(request, testSearchCriteria, "id", "Auth Session Id");
Mockito.verify(searchUtil).extractLong(request, testSearchCriteria, "userId", "User Id");
Mockito.verify(searchUtil).extractInt(request, testSearchCriteria, "authStatus", "Auth Status");
@@ -1389,7 +1389,7 @@ public class TestXUserREST {
Mockito.verify(xUserMgr).getXModuleDefPermission(testVXModuleDef.getId());
- }
+ }
@Test
public void test78updateXModuleDefPermission() {
@@ -1432,7 +1432,7 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "module","modulename", null)).thenReturn("");
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "moduleDefList","id", null)).thenReturn("");
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "userName","userName", null)).thenReturn("");
@@ -1445,7 +1445,7 @@ public class TestXUserREST {
assertEquals(outputVXModuleDefList.getStartIndex(),testVXModuleDefList.getStartIndex());
Mockito.verify(xUserMgr).searchXModuleDef(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "module","modulename", null);
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "moduleDefList","id", null);
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "userName","userName", null);
@@ -1460,14 +1460,14 @@ public class TestXUserREST {
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXModuleDefSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXModuleDef(request);
Mockito.verify(xUserMgr).getXModuleDefSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getValue(),vXLong.getValue());
@@ -1475,7 +1475,7 @@ public class TestXUserREST {
}
@Test
public void test82createXUserPermission() {
- VXUserPermission testvXUserPermission = createVXUserPermission();
+ VXUserPermission testvXUserPermission = createVXUserPermission();
Mockito.doNothing().when(xUserMgr).checkAdminAccess();
Mockito.when(xUserMgr.createXUserPermission(testvXUserPermission)).thenReturn(testvXUserPermission);
@@ -1498,7 +1498,7 @@ public class TestXUserREST {
}
@Test
public void test84updateXUserPermission() {
- VXUserPermission testvXUserPermission = createVXUserPermission();
+ VXUserPermission testvXUserPermission = createVXUserPermission();
Mockito.doNothing().when(xUserMgr).checkAdminAccess();
Mockito.when(xUserMgr.updateXUserPermission(testvXUserPermission)).thenReturn(testvXUserPermission);
VXUserPermission retVXUserPermission=xUserRest.updateXUserPermission(testvXUserPermission);
@@ -1533,7 +1533,7 @@ public class TestXUserREST {
testVXUserPermissionList.setvXModuleDef(testVXUserPermissions);
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "id", "id",StringUtil.VALIDATION_NAME)).thenReturn("");
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "userPermissionList","userId", StringUtil.VALIDATION_NAME)).thenReturn("");
@@ -1545,7 +1545,7 @@ public class TestXUserREST {
assertEquals(outputVXUserPermissionList.getTotalCount(),testVXUserPermissionList.getTotalCount());
Mockito.verify(xUserMgr).searchXUserPermission(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "id", "id",StringUtil.VALIDATION_NAME);
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "userPermissionList","userId", StringUtil.VALIDATION_NAME);
@@ -1558,14 +1558,14 @@ public class TestXUserREST {
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXUserPermissionSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXUserPermission(request);
Mockito.verify(xUserMgr).getXUserPermissionSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getValue(),vXLong.getValue());
@@ -1575,7 +1575,7 @@ public class TestXUserREST {
@Test
public void test88createXGroupPermission() {
- VXGroupPermission testVXGroupPermission = createVXGroupPermission();
+ VXGroupPermission testVXGroupPermission = createVXGroupPermission();
Mockito.doNothing().when(xUserMgr).checkAdminAccess();
Mockito.when(xUserMgr.createXGroupPermission(testVXGroupPermission)).thenReturn(testVXGroupPermission);
@@ -1601,7 +1601,7 @@ public class TestXUserREST {
@Test
public void test90updateXGroupPermission() {
- VXGroupPermission testVXGroupPermission = createVXGroupPermission();
+ VXGroupPermission testVXGroupPermission = createVXGroupPermission();
Mockito.doNothing().when(xUserMgr).checkAdminAccess();
Mockito.when(xUserMgr.updateXGroupPermission(testVXGroupPermission)).thenReturn(testVXGroupPermission);
VXGroupPermission retVXGroupPermission=xUserRest.updateXGroupPermission(testVXGroupPermission);
@@ -1636,7 +1636,7 @@ public class TestXUserREST {
testVXGroupPermissionList.setvXGroupPermission(testVXGroupPermissions);
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
Mockito.when(searchUtil.extractString(request, testSearchCriteria, "id", "id",StringUtil.VALIDATION_NAME)).thenReturn("");
Mockito.when(searchUtil.extractString(request, testSearchCriteria,"groupPermissionList", "groupId", StringUtil.VALIDATION_NAME)).thenReturn("");
Mockito.when(xUserMgr.searchXGroupPermission(testSearchCriteria)).thenReturn(testVXGroupPermissionList);
@@ -1647,7 +1647,7 @@ public class TestXUserREST {
Mockito.verify(xUserMgr).searchXGroupPermission(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
Mockito.verify(searchUtil).extractString(request, testSearchCriteria, "id", "id",StringUtil.VALIDATION_NAME);
Mockito.verify(searchUtil).extractString(request, testSearchCriteria,"groupPermissionList", "groupId", StringUtil.VALIDATION_NAME);
}
@@ -1658,14 +1658,14 @@ public class TestXUserREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
SearchCriteria testSearchCriteria=createsearchCriteria();
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject())).thenReturn(testSearchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any())).thenReturn(testSearchCriteria);
vXLong.setValue(1);
Mockito.when(xUserMgr.getXGroupPermissionSearchCount(testSearchCriteria)).thenReturn(vXLong);
VXLong testvxLong=xUserRest.countXGroupPermission(request);
Mockito.verify(xUserMgr).getXGroupPermissionSearchCount(testSearchCriteria);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.anyObject() ,(List<SortField>)Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any());
assertNotNull(testvxLong);
assertEquals(testvxLong.getValue(),vXLong.getValue());
@@ -1985,7 +1985,7 @@ public class TestXUserREST {
private HashMap<Long, Integer> creategroupVisibilityMap()
{
- HashMap<Long, Integer> groupVisibilityMap=new HashMap<Long, Integer>();
+ HashMap<Long, Integer> groupVisibilityMap=new HashMap<Long, Integer>();
groupVisibilityMap.put(id, 1);
return groupVisibilityMap;
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
index d65b0d6..56109d8 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
@@ -129,21 +129,6 @@ public class TestRangerServiceDefService {
return xServiceDef;
}
- private XXPolicy policy() {
- XXPolicy xxPolicy = new XXPolicy();
- xxPolicy.setId(Id);
- xxPolicy.setName("HDFS_1-1-20150316062453");
- xxPolicy.setAddedByUserId(Id);
- xxPolicy.setCreateTime(new Date());
- xxPolicy.setDescription("test");
- xxPolicy.setIsAuditEnabled(false);
- xxPolicy.setIsEnabled(false);
- xxPolicy.setService(1L);
- xxPolicy.setUpdatedByUserId(Id);
- xxPolicy.setUpdateTime(new Date());
- return xxPolicy;
- }
-
@Test
public void test1ValidateForCreate() {
RangerServiceDef rangerServiceDef = rangerServiceDef();
@@ -167,7 +152,6 @@ public class TestRangerServiceDefService {
XXResourceDefDao xResourceDefDao = Mockito.mock(XXResourceDefDao.class);
XXAccessTypeDefDao xAccessTypeDefDao = Mockito
.mock(XXAccessTypeDefDao.class);
- XXAccessTypeDef xAccessTypeDef = Mockito.mock(XXAccessTypeDef.class);
XXPolicyConditionDefDao xPolicyConditionDefDao = Mockito
.mock(XXPolicyConditionDefDao.class);
XXServiceConfigDefDao xServiceConfigDefDao = Mockito
@@ -179,7 +163,6 @@ public class TestRangerServiceDefService {
.mock(XXEnumElementDefDao.class);
XXServiceDef serviceDef = serviceDef();
- XXPolicy policy = policy();
String name = "fdfdfds";
XXPortalUser tUser = new XXPortalUser();
@@ -312,19 +295,12 @@ public class TestRangerServiceDefService {
.thenReturn(serviceConfigDefList);
Mockito.when(daoManager.getXXResourceDef()).thenReturn(xResourceDefDao);
- Mockito.when(xResourceDefDao.findByPolicyId(policy.getId()))
- .thenReturn(resDefList);
Mockito.when(daoManager.getXXAccessTypeDef()).thenReturn(
xAccessTypeDefDao);
- Mockito.when(xAccessTypeDefDao.getById(policyItemAccess.getType()))
- .thenReturn(xAccessTypeDef);
Mockito.when(daoManager.getXXPolicyConditionDef()).thenReturn(
xPolicyConditionDefDao);
- Mockito.when(
- xPolicyConditionDefDao.findByPolicyItemId(xPolicyItem.getId()))
- .thenReturn(xConditionDefList);
Mockito.when(daoManager.getXXContextEnricherDef()).thenReturn(
xContextEnricherDefDao);
@@ -374,7 +350,6 @@ public class TestRangerServiceDefService {
XXResourceDefDao xResourceDefDao = Mockito.mock(XXResourceDefDao.class);
XXAccessTypeDefDao xAccessTypeDefDao = Mockito
.mock(XXAccessTypeDefDao.class);
- XXAccessTypeDef xAccessTypeDef = Mockito.mock(XXAccessTypeDef.class);
XXPolicyConditionDefDao xPolicyConditionDefDao = Mockito
.mock(XXPolicyConditionDefDao.class);
XXServiceConfigDefDao xServiceConfigDefDao = Mockito
@@ -401,8 +376,6 @@ public class TestRangerServiceDefService {
serviceDef.setIsEnabled(true);
xServiceDefList.add(serviceDef);
- XXPolicy policy = policy();
-
String name = "fdfdfds";
XXPortalUser tUser = new XXPortalUser();
tUser.setAddedByUserId(Id);
@@ -537,19 +510,12 @@ public class TestRangerServiceDefService {
.thenReturn(serviceConfigDefList);
Mockito.when(daoManager.getXXResourceDef()).thenReturn(xResourceDefDao);
- Mockito.when(xResourceDefDao.findByPolicyId(policy.getId()))
- .thenReturn(resDefList);
Mockito.when(daoManager.getXXAccessTypeDef()).thenReturn(
xAccessTypeDefDao);
- Mockito.when(xAccessTypeDefDao.getById(policyItemAccess.getType()))
- .thenReturn(xAccessTypeDef);
Mockito.when(daoManager.getXXPolicyConditionDef()).thenReturn(
xPolicyConditionDefDao);
- Mockito.when(
- xPolicyConditionDefDao.findByPolicyItemId(xPolicyItem.getId()))
- .thenReturn(xConditionDefList);
Mockito.when(daoManager.getXXContextEnricherDef()).thenReturn(
xContextEnricherDefDao);
@@ -593,7 +559,6 @@ public class TestRangerServiceDefService {
XXResourceDefDao xResourceDefDao = Mockito.mock(XXResourceDefDao.class);
XXAccessTypeDefDao xAccessTypeDefDao = Mockito
.mock(XXAccessTypeDefDao.class);
- XXAccessTypeDef xAccessTypeDef = Mockito.mock(XXAccessTypeDef.class);
XXPolicyConditionDefDao xPolicyConditionDefDao = Mockito
.mock(XXPolicyConditionDefDao.class);
XXContextEnricherDefDao xContextEnricherDefDao = Mockito
@@ -603,7 +568,6 @@ public class TestRangerServiceDefService {
.mock(XXEnumElementDefDao.class);
XXServiceDef serviceDef = serviceDef();
- XXPolicy policy = policy();
String name = "fdfdfds";
XXPortalUser tUser = new XXPortalUser();
tUser.setAddedByUserId(Id);
@@ -735,19 +699,12 @@ public class TestRangerServiceDefService {
.thenReturn(serviceConfigDefList);
Mockito.when(daoManager.getXXResourceDef()).thenReturn(xResourceDefDao);
- Mockito.when(xResourceDefDao.findByPolicyId(policy.getId()))
- .thenReturn(resDefList);
Mockito.when(daoManager.getXXAccessTypeDef()).thenReturn(
xAccessTypeDefDao);
- Mockito.when(xAccessTypeDefDao.getById(policyItemAccess.getType()))
- .thenReturn(xAccessTypeDef);
Mockito.when(daoManager.getXXPolicyConditionDef()).thenReturn(
xPolicyConditionDefDao);
- Mockito.when(
- xPolicyConditionDefDao.findByPolicyItemId(xPolicyItem.getId()))
- .thenReturn(xConditionDefList);
Mockito.when(daoManager.getXXContextEnricherDef()).thenReturn(
xContextEnricherDefDao);
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
index 06ac327..15857cb 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.persistence.EntityManager;
import javax.ws.rs.WebApplicationException;
import org.apache.ranger.biz.RangerBizUtil;
@@ -30,7 +29,6 @@ import org.apache.ranger.common.JSONUtil;
import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.RESTErrorUtil;
import org.apache.ranger.common.RangerSearchUtil;
-import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.UserSessionBase;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.db.RangerDaoManager;
@@ -283,8 +281,6 @@ public class TestRangerServiceDefServiceBase {
resourceDefObj.setId(Id);
Mockito.when(daoManager.getXXResourceDef()).thenReturn(xResourceDefDao);
- Mockito.when(xResourceDefDao.getById(resourceDefObj.getId()))
- .thenReturn(resourceDefObj);
RangerResourceDef dbRangerResourceDef = rangerServiceDefService
.populateXXToRangerResourceDef(resourceDefObj);
@@ -784,26 +780,14 @@ public class TestRangerServiceDefServiceBase {
@Test
public void test21searchRangerServiceDefs() {
setup();
- EntityManager entityManager = Mockito.mock(EntityManager.class);
SearchFilter searchFilter = new SearchFilter();
searchFilter.setParam(SearchFilter.POLICY_NAME, "policyName");
searchFilter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
- String searchString = "policyName";
- String sortString = "asc";
- List<SearchField> searchFieldList = new ArrayList<SearchField>();
- boolean isCountQuery = false;
-
BaseDao baseDao = Mockito.mock(BaseDao.class);
Mockito.when(daoManager.getDaoForClassName(Mockito.anyString()))
.thenReturn(baseDao);
- Mockito.when(daoManager.getEntityManager()).thenReturn(entityManager);
- Mockito.when(
- searchUtil
- .createSearchQuery(entityManager, searchString,
- sortString, searchFilter, searchFieldList,
- isCountQuery)).thenReturn(null);
RangerServiceDefList dbRangerServiceDefList = rangerServiceDefService
.searchRangerServiceDefs(searchFilter);
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
index c8cb716..f6b02a8 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
@@ -410,34 +410,20 @@ public class TestRangerServiceService {
Mockito.when(xServiceDefDao.findByName(rangerService.getType()))
.thenReturn(xServiceDef);
- String value = null;
- Map<String, String> configs = new HashMap<String, String>();
- Mockito.when(jsonUtil.readMapToString(configs)).thenReturn(value);
-
List<XXTrxLog> dbXXTrxLogList = serviceService.getTransactionLog(
rangerService, 1);
Assert.assertNotNull(dbXXTrxLogList);
}
-
+
@Test
public void test7GetTransactionLogUpdate() {
- XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
- XXServiceDef xServiceDef = Mockito.mock(XXServiceDef.class);
RangerService rangerService = rangerService();
- Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
- Mockito.when(xServiceDefDao.findByName(rangerService.getType()))
- .thenReturn(xServiceDef);
-
- String value = null;
- Map<String, String> configs = new HashMap<String, String>();
- Mockito.when(jsonUtil.readMapToString(configs)).thenReturn(value);
-
List<XXTrxLog> dbXXTrxLogList = serviceService.getTransactionLog(
rangerService, 2);
Assert.assertNull(dbXXTrxLogList);
}
-
+
@Test
public void test8GetTransactionLogDelete() {
XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
@@ -448,10 +434,6 @@ public class TestRangerServiceService {
Mockito.when(xServiceDefDao.findByName(rangerService.getType()))
.thenReturn(xServiceDef);
- String value = null;
- Map<String, String> configs = new HashMap<String, String>();
- Mockito.when(jsonUtil.readMapToString(configs)).thenReturn(value);
-
List<XXTrxLog> dbXXTrxLogList = serviceService.getTransactionLog(
rangerService, 3);
Assert.assertNotNull(dbXXTrxLogList);
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
index 216c338..54fee7d 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
@@ -16,18 +16,13 @@
*/
package org.apache.ranger.service;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import javax.persistence.EntityManager;
-
import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.common.ContextUtil;
import org.apache.ranger.common.RangerSearchUtil;
-import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.UserSessionBase;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.db.RangerDaoManager;
@@ -206,26 +201,13 @@ public class TestRangerServiceServiceBase {
@Test
public void test3searchRangerServices() {
- EntityManager entityManager = Mockito.mock(EntityManager.class);
SearchFilter searchFilter = new SearchFilter();
searchFilter.setParam(SearchFilter.POLICY_NAME, "policyName");
searchFilter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
- String searchString = "policyName";
- String sortString = "asc";
- List<SearchField> searchFieldList = new ArrayList<SearchField>();
- boolean isCountQuery = false;
-
BaseDao baseDao = Mockito.mock(BaseDao.class);
Mockito.when(daoManager.getDaoForClassName(Mockito.anyString()))
.thenReturn(baseDao);
- Mockito.when(daoManager.getEntityManager()).thenReturn(entityManager);
- Mockito.when(
- searchUtil
- .createSearchQuery(entityManager, searchString,
- sortString, searchFilter, searchFieldList,
- isCountQuery)).thenReturn(null);
- Mockito.when(bizUtil.getClassType(getClass())).thenReturn(1);
RangerServiceList dbRangerServiceList = rangerServiceService
.searchRangerServices(searchFilter);
Assert.assertNotNull(dbRangerServiceList);
[2/2] ranger git commit: RANGER-1498 - Remove unnecessary mockito
stubs
Posted by co...@apache.org.
RANGER-1498 - Remove unnecessary mockito stubs
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a3a5e2a7
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a3a5e2a7
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a3a5e2a7
Branch: refs/heads/master
Commit: a3a5e2a7bc6209f6e93b66858d1f62a44e119d4e
Parents: 0ba3e12
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue May 9 16:16:16 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 10 09:35:35 2017 +0100
----------------------------------------------------------------------
.../apache/ranger/biz/TestRangerBizUtil.java | 63 ++--
.../apache/ranger/biz/TestServiceDBStore.java | 315 +------------------
.../java/org/apache/ranger/biz/TestUserMgr.java | 6 +-
.../org/apache/ranger/biz/TestXUserMgr.java | 24 +-
.../apache/ranger/rest/TestPublicAPIsv2.java | 12 +-
.../org/apache/ranger/rest/TestServiceREST.java | 30 +-
.../org/apache/ranger/rest/TestTagREST.java | 24 +-
.../org/apache/ranger/rest/TestXAuditREST.java | 32 +-
.../org/apache/ranger/rest/TestXKeyREST.java | 16 +-
.../org/apache/ranger/rest/TestXUserREST.java | 178 +++++------
.../service/TestRangerServiceDefService.java | 43 ---
.../TestRangerServiceDefServiceBase.java | 16 -
.../service/TestRangerServiceService.java | 22 +-
.../service/TestRangerServiceServiceBase.java | 18 --
14 files changed, 184 insertions(+), 615 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
index 2554a14..fdf4dae 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
@@ -72,7 +72,7 @@ public class TestRangerBizUtil {
public void setup(){
RangerSecurityContext context = new RangerSecurityContext();
context.setUserSession(new UserSessionBase());
- RangerContextHolder.setSecurityContext(context);
+ RangerContextHolder.setSecurityContext(context);
}
@Test
@@ -80,7 +80,7 @@ public class TestRangerBizUtil {
VXResource vXResource = null;
rangerBizUtil.enableResourceAccessControl = false;
VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
- Assert.assertNotNull(resp);
+ Assert.assertNotNull(resp);
}
@Test
@@ -95,7 +95,12 @@ public class TestRangerBizUtil {
@Test
public void testHasPermission_emptyResourceName(){
VXResource vXResource = new VXResource();
+ vXResource.setAssetId(12345L);
XXPortalUser portalUser = new XXPortalUser();
+ portalUser.setId(id);
+ portalUser.setLoginId("12121");
+ RangerContextHolder.getSecurityContext().getUserSession().setXXPortalUser(portalUser);
+
XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class);
XXUser xxUser = new XXUser();
@@ -106,7 +111,7 @@ public class TestRangerBizUtil {
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(portalUser);
Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
- Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);
+ Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);
Mockito.when(daoManager.getXXResource()).thenReturn(xxResourceDao);
Mockito.when(xxResourceDao.findByAssetIdAndResourceStatus(Mockito.anyLong(),Mockito.anyInt())).thenReturn(lst);
Mockito.when(daoManager.getXXAsset()).thenReturn(xxAssetDao);
@@ -118,20 +123,20 @@ public class TestRangerBizUtil {
Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
Assert.assertNotNull(resp);
Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode());
- Assert.assertEquals("Permission Denied !", resp.getMsgDesc());
+ Assert.assertEquals("Permission Denied !", resp.getMsgDesc());
}
@Test
public void testHasPermission_isAdmin(){
VXResource vXResource = new VXResource();
vXResource.setName(resourceName);
- vXResource.setAssetId(id);
+ vXResource.setAssetId(id);
UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
currentUserSession.setUserAdmin(true);
VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
Assert.assertNotNull(resp);
Assert.assertEquals(VXResponse.STATUS_SUCCESS, resp.getStatusCode());
- }
+ }
@Test
public void testIsNotAdmin(){
@@ -145,11 +150,11 @@ public class TestRangerBizUtil {
currentUserSession.setUserAdmin(true);
boolean isAdminChk = rangerBizUtil.isAdmin();
Assert.assertTrue(isAdminChk);
- }
+ }
@Test
public void testUserSessionNull_forIsAdmin(){
- RangerContextHolder.setSecurityContext(null);
+ RangerContextHolder.setSecurityContext(null);
boolean isAdminChk = rangerBizUtil.isAdmin();
Assert.assertFalse(isAdminChk);
}
@@ -165,8 +170,12 @@ public class TestRangerBizUtil {
public void testGetXUserId_NoUser(){
RangerSecurityContext context = new RangerSecurityContext();
context.setUserSession(new UserSessionBase());
- RangerContextHolder.setSecurityContext(context);
+ RangerContextHolder.setSecurityContext(context);
XXPortalUser xxPortalUser = new XXPortalUser();
+ xxPortalUser.setId(id);
+ xxPortalUser.setLoginId("12121");
+ context.getUserSession().setXXPortalUser(xxPortalUser);
+
XXUser xxUser = new XXUser();
XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
@@ -179,13 +188,14 @@ public class TestRangerBizUtil {
Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
Mockito.verify(daoManager).getXXUser();
Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
- Assert.assertNull(chk);
+ Assert.assertNull(chk);
}
@Test
public void testGetXUserId(){
XXPortalUser xxPortalUser = new XXPortalUser();
xxPortalUser.setId(id);
+ xxPortalUser.setLoginId("12121");
XXUser xxUser = new XXUser();
xxUser.setId(id);
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
@@ -195,17 +205,17 @@ public class TestRangerBizUtil {
userSessionBase.setUserAdmin(true);
context.setUserSession(userSessionBase);
userSessionBase.setXXPortalUser(xxPortalUser);
- RangerContextHolder.setSecurityContext(context);
+ RangerContextHolder.setSecurityContext(context);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser);
Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
- Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);
+ Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);
Long chk = rangerBizUtil.getXUserId();
Mockito.verify(daoManager).getXXPortalUser();
Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
Mockito.verify(daoManager).getXXUser();
Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
- Assert.assertEquals(chk, id);
+ Assert.assertEquals(chk, id);
}
@Test
@@ -240,7 +250,7 @@ public class TestRangerBizUtil {
}
@Test
- public void testGeneratePublicName(){
+ public void testGeneratePublicName(){
String firstName = "Test123456789123456789";
String lastName = "Unit";
String publicNameChk = rangerBizUtil.generatePublicName(firstName, lastName);
@@ -248,7 +258,7 @@ public class TestRangerBizUtil {
}
@Test
- public void testGeneratePublicName_fNameLessThanMax(){
+ public void testGeneratePublicName_fNameLessThanMax(){
String firstName = "Test";
String lastName = "";
String publicNameChk = rangerBizUtil.generatePublicName(firstName, lastName);
@@ -348,13 +358,13 @@ public class TestRangerBizUtil {
@Test
public void testGetMimeType_ForJPG(){
String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_JPEG);
- Assert.assertEquals("jpg",mimeTypeChk);
+ Assert.assertEquals("jpg",mimeTypeChk);
}
@Test
public void testGetMimeType_ForPNG(){
String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_PNG);
- Assert.assertEquals("png",mimeTypeChk);
+ Assert.assertEquals("png",mimeTypeChk);
}
@Test
@@ -402,8 +412,8 @@ public class TestRangerBizUtil {
@Test
public void testGetMimeTypeInt_ForPNG(){
int mimeTypeChk = rangerBizUtil.getMimeTypeInt("png");
- Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
- }
+ Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
+ }
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
@@ -425,17 +435,17 @@ public class TestRangerBizUtil {
@Test
public void testGetMObject_VXDataObject(){
VXAsset vXDataObject = new VXAsset();
- vXDataObject.setId(id);
+ vXDataObject.setId(id);
BaseDao baseDao = Mockito.mock(BaseDao.class);
Mockito.when(daoManager.getDaoForClassType(vXDataObject.getMyClassType())).thenReturn(baseDao);
Mockito.when(baseDao.getById(vXDataObject.getId())).thenReturn(new XXAsset());
- XXDBBase xXDBaseChk = rangerBizUtil.getMObject(vXDataObject);
+ XXDBBase xXDBaseChk = rangerBizUtil.getMObject(vXDataObject);
Assert.assertNotNull(xXDBaseChk);
}
@Test
public void testGetMObject_NOVXDataObject(){
- XXDBBase xXDBaseChk = rangerBizUtil.getMObject(null);
+ XXDBBase xXDBaseChk = rangerBizUtil.getMObject(null);
Assert.assertNull(xXDBaseChk);
}
@@ -443,7 +453,7 @@ public class TestRangerBizUtil {
public void testGetVObject_NOObjId(){
VXDataObject objchk = rangerBizUtil.getVObject(RangerConstants.CLASS_TYPE_USER_PROFILE, null);
Assert.assertNull(objchk);
- }
+ }
@Test
public void testMatchHdfsPolicy_NoResourceName(){
@@ -481,7 +491,6 @@ public class TestRangerBizUtil {
xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
xResourceList.add(xXResource);
- Mockito.when(stringUtil.isEmpty(resourceName)).thenReturn(true);
Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
boolean bnlChk = rangerBizUtil.matchHbasePolicy("/*/*/*", xResourceList, vXResponse, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString());
@@ -527,7 +536,7 @@ public class TestRangerBizUtil {
xResourceList.add(xXResource);
Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
boolean bnlChk = rangerBizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 0);
- Assert.assertFalse(bnlChk);
+ Assert.assertFalse(bnlChk);
}
@Test
@@ -542,6 +551,6 @@ public class TestRangerBizUtil {
Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
boolean bnlChk = rangerBizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 17);
Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString());
- Assert.assertFalse(bnlChk);
- }
+ Assert.assertFalse(bnlChk);
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
index 3015f97..eb2f417 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
@@ -41,7 +41,6 @@ import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerAccessTypeDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerContextEnricherDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerEnumDef;
-import org.apache.ranger.plugin.model.RangerServiceDef.RangerEnumElementDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerPolicyConditionDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerServiceConfigDef;
@@ -63,7 +62,6 @@ import org.apache.ranger.view.RangerPolicyList;
import org.apache.ranger.view.RangerServiceDefList;
import org.apache.ranger.view.RangerServiceList;
import org.apache.ranger.view.VXString;
-import org.apache.ranger.view.VXUser;
import org.junit.Assert;
import org.junit.FixMethodOrder;
import org.junit.Rule;
@@ -290,123 +288,44 @@ public class TestServiceDBStore {
.mock(XXServiceConfigDefDao.class);
XXAccessTypeDefDao xAccessTypeDefDao = Mockito
.mock(XXAccessTypeDefDao.class);
- XXAccessTypeDefGrantsDao xAccessTypeDefGrantsDao = Mockito
- .mock(XXAccessTypeDefGrantsDao.class);
XXPolicyConditionDefDao xPolicyConditionDefDao = Mockito
.mock(XXPolicyConditionDefDao.class);
XXContextEnricherDefDao xContextEnricherDefDao = Mockito
.mock(XXContextEnricherDefDao.class);
XXEnumDefDao xEnumDefDao = Mockito.mock(XXEnumDefDao.class);
- XXEnumElementDefDao xEnumElementDefDao = Mockito
- .mock(XXEnumElementDefDao.class);
XXServiceDef xServiceDef = Mockito.mock(XXServiceDef.class);
XXResourceDef xResourceDef = Mockito.mock(XXResourceDef.class);
- XXServiceConfigDef xServiceConfigDef = Mockito
- .mock(XXServiceConfigDef.class);
- XXPolicyConditionDef xPolicyConditionDef = Mockito
- .mock(XXPolicyConditionDef.class);
- XXContextEnricherDef xContextEnricherDef = Mockito
- .mock(XXContextEnricherDef.class);
- XXEnumDef xEnumDef = Mockito.mock(XXEnumDef.class);
XXAccessTypeDef xAccessTypeDef = Mockito.mock(XXAccessTypeDef.class);
- XXEnumElementDef xEnumElementDef = Mockito.mock(XXEnumElementDef.class);
- XXAccessTypeDefGrants xAccessTypeDefGrants = Mockito
- .mock(XXAccessTypeDefGrants.class);
List<XXAccessTypeDef> xAccessTypeDefs = new ArrayList<XXAccessTypeDef>();
xAccessTypeDefs.add(xAccessTypeDef);
List<XXResourceDef> xResourceDefs = new ArrayList<XXResourceDef>();
xResourceDefs.add(xResourceDef);
- RangerServiceConfigDef rangerServiceConfigDef = Mockito
- .mock(RangerServiceConfigDef.class);
- RangerResourceDef rangerResourceDef = Mockito
- .mock(RangerResourceDef.class);
- RangerAccessTypeDef rangerAccessTypeDef = Mockito
- .mock(RangerAccessTypeDef.class);
- RangerPolicyConditionDef rangerPolicyConditionDef = Mockito
- .mock(RangerPolicyConditionDef.class);
- RangerContextEnricherDef rangerContextEnricherDef = Mockito
- .mock(RangerContextEnricherDef.class);
- RangerEnumDef rangerEnumDef = Mockito.mock(RangerEnumDef.class);
- RangerEnumElementDef rangerEnumElementDef = Mockito
- .mock(RangerEnumElementDef.class);
-
RangerServiceDef serviceDef = new RangerServiceDef();
Mockito.when(serviceDefService.create(serviceDef)).thenReturn(
serviceDef);
Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
- Mockito.when(xServiceDefDao.findByName("HDFS_1")).thenReturn(
- xServiceDef);
Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
Mockito.when(xServiceDefDao.getById(null)).thenReturn(xServiceDef);
Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
xServiceConfigDefDao);
- Mockito.when(
- serviceDefService.populateRangerServiceConfigDefToXX(
- rangerServiceConfigDef, xServiceConfigDef, xServiceDef,
- 1)).thenReturn(xServiceConfigDef);
- Mockito.when(xServiceConfigDefDao.create(xServiceConfigDef))
- .thenReturn(xServiceConfigDef);
Mockito.when(daoManager.getXXResourceDef()).thenReturn(xResourceDefDao);
- Mockito.when(
- serviceDefService.populateRangerResourceDefToXX(
- rangerResourceDef, xResourceDef, xServiceDef, 1))
- .thenReturn(xResourceDef);
- Mockito.when(xResourceDefDao.create(xResourceDef)).thenReturn(
- xResourceDef);
Mockito.when(xResourceDefDao.findByServiceDefId(xServiceDef.getId())).thenReturn(xResourceDefs);
Mockito.when(daoManager.getXXAccessTypeDef()).thenReturn(
xAccessTypeDefDao);
- Mockito.when(
- serviceDefService.populateRangerAccessTypeDefToXX(
- rangerAccessTypeDef, xAccessTypeDef, xServiceDef, 1))
- .thenReturn(xAccessTypeDef);
- Mockito.when(xAccessTypeDefDao.create(xAccessTypeDef)).thenReturn(
- xAccessTypeDef);
Mockito.when(xAccessTypeDefDao.findByServiceDefId(xServiceDef.getId())).thenReturn(xAccessTypeDefs);
- Mockito.when(daoManager.getXXAccessTypeDefGrants()).thenReturn(
- xAccessTypeDefGrantsDao);
- Mockito.when(xAccessTypeDefGrantsDao.create(xAccessTypeDefGrants))
- .thenReturn(xAccessTypeDefGrants);
-
Mockito.when(daoManager.getXXPolicyConditionDef()).thenReturn(
xPolicyConditionDefDao);
- Mockito.when(
- serviceDefService.populateRangerPolicyConditionDefToXX(
- rangerPolicyConditionDef, xPolicyConditionDef,
- xServiceDef, 1)).thenReturn(xPolicyConditionDef);
- Mockito.when(xPolicyConditionDefDao.create(xPolicyConditionDef))
- .thenReturn(xPolicyConditionDef);
-
Mockito.when(daoManager.getXXContextEnricherDef()).thenReturn(
xContextEnricherDefDao);
- Mockito.when(
- serviceDefService.populateRangerContextEnricherDefToXX(
- rangerContextEnricherDef, xContextEnricherDef,
- xServiceDef, 1)).thenReturn(xContextEnricherDef);
- Mockito.when(xContextEnricherDefDao.create(xContextEnricherDef))
- .thenReturn(xContextEnricherDef);
Mockito.when(daoManager.getXXEnumDef()).thenReturn(xEnumDefDao);
- Mockito.when(
- serviceDefService.populateRangerEnumDefToXX(rangerEnumDef,
- xEnumDef, xServiceDef, 1)).thenReturn(xEnumDef);
- Mockito.when(xEnumDefDao.create(xEnumDef)).thenReturn(xEnumDef);
-
- Mockito.when(daoManager.getXXEnumElementDef()).thenReturn(
- xEnumElementDefDao);
- Mockito.when(
- serviceDefService.populateRangerEnumElementDefToXX(
- rangerEnumElementDef, xEnumElementDef, xEnumDef, 1))
- .thenReturn(xEnumElementDef);
- Mockito.when(xEnumElementDefDao.create(xEnumElementDef)).thenReturn(
- xEnumElementDef);
Mockito.when(serviceDefService.getPopulatedViewObject(xServiceDef))
.thenReturn(serviceDef);
@@ -542,34 +461,21 @@ public class TestServiceDBStore {
Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
xServiceConfigDefDao);
- Mockito.when(xServiceConfigDefDao.findByServiceDefId(serviceDefId))
- .thenReturn(svcConfDefList);
Mockito.when(daoManager.getXXResourceDef()).thenReturn(xResourceDefDao);
- Mockito.when(xResourceDefDao.findByServiceDefId(serviceDefId))
- .thenReturn(resDefList);
Mockito.when(daoManager.getXXAccessTypeDef()).thenReturn(
xAccessTypeDefDao);
- Mockito.when(xAccessTypeDefDao.findByServiceDefId(serviceDefId))
- .thenReturn(accessTypeDefList);
Mockito.when(daoManager.getXXPolicyConditionDef()).thenReturn(
xPolicyConditionDefDao);
- Mockito.when(xPolicyConditionDefDao.findByServiceDefId(serviceDefId))
- .thenReturn(policyConditionDefList);
Mockito.when(daoManager.getXXContextEnricherDef()).thenReturn(
xContextEnricherDefDao);
- Mockito.when(xContextEnricherDefDao.findByServiceDefId(serviceDefId))
- .thenReturn(contextEnricherDefList);
Mockito.when(daoManager.getXXEnumDef()).thenReturn(xEnumDefDao);
- Mockito.when(xEnumDefDao.findByServiceDefId(serviceDefId)).thenReturn(
- enumDefList);
Mockito.when(daoManager.getXXDataMaskTypeDef()).thenReturn(xDataMaskDefDao);
- Mockito.when(xDataMaskDefDao.findByServiceDefId(serviceDefId)).thenReturn(new ArrayList<XXDataMaskTypeDef>());
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.findByServiceDefId(serviceDefId)).thenReturn(null);
@@ -627,19 +533,9 @@ public class TestServiceDBStore {
.mock(XXPolicyResourceMapDao.class);
XXServiceConfigDefDao xServiceConfigDefDao = Mockito
.mock(XXServiceConfigDefDao.class);
- XXPolicyDao xPolicyDao = Mockito.mock(XXPolicyDao.class);
- XXPolicyItemDao xPolicyItemDao = Mockito.mock(XXPolicyItemDao.class);
- XXPolicyItemGroupPermDao xPolicyItemGroupPermDao = Mockito
- .mock(XXPolicyItemGroupPermDao.class);
- XXPolicyItemUserPermDao policyItemUserPermDao = Mockito
- .mock(XXPolicyItemUserPermDao.class);
- XXServiceConfigMapDao xServiceConfigMapDao = Mockito
- .mock(XXServiceConfigMapDao.class);
- XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
RangerServiceDef rangerServiceDef = rangerServiceDef();
RangerService rangerService = rangerService();
- RangerPolicy rangerPolicy = rangerPolicy();
String name = "fdfdfds";
Long serviceDefId = rangerServiceDef.getId();
@@ -834,7 +730,6 @@ public class TestServiceDBStore {
policyItem.setUpdateTime(new Date());
policyItemList.add(policyItem);
- List<XXServiceConfigMap> svcConfigMapList = new ArrayList<XXServiceConfigMap>();
XXServiceConfigMap xConfMap = new XXServiceConfigMap();
xConfMap.setAddedByUserId(null);
xConfMap.setConfigkey(name);
@@ -945,71 +840,18 @@ public class TestServiceDBStore {
Mockito.when(xServiceConfigDefDao.findByServiceDefId(serviceDefId))
.thenReturn(serviceConfigDefList);
- Mockito.when(svcService.read(Id)).thenReturn(rangerService);
-
- Mockito.when(daoManager.getXXPolicy()).thenReturn(xPolicyDao);
- Mockito.when(xPolicyDao.findByServiceId(rangerService.getId()))
- .thenReturn(policiesList);
-
- Mockito.when(policyService.read(Id)).thenReturn(rangerPolicy);
-
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
- Mockito.when(xServiceDao.findByName("HDFS_1-1-20150316062453"))
- .thenReturn(xService);
- Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn(
- rangerService);
-
- Mockito.when(daoManager.getXXPolicyItem()).thenReturn(xPolicyItemDao);
- Mockito.when(xPolicyItemDao.findByPolicyId(rangerPolicy.getId()))
- .thenReturn(policyItemList);
-
- Mockito.when(daoManager.getXXPolicyItemGroupPerm()).thenReturn(
- xPolicyItemGroupPermDao);
- Mockito.when(
- xPolicyItemGroupPermDao.findByPolicyItemId(policyItem.getId()))
- .thenReturn(policyItemGroupPermlist);
-
- Mockito.when(daoManager.getXXPolicyItemUserPerm()).thenReturn(
- policyItemUserPermDao);
- Mockito.when(
- policyItemUserPermDao.findByPolicyItemId(policyItem.getId()))
- .thenReturn(policyItemUserPermList);
svcServiceWithAssignedId.setPopulateExistingBaseFields(true);
- Mockito.when(svcServiceWithAssignedId.update(rangerService))
- .thenReturn(rangerService);
-
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
- Mockito.when(xServiceDao.getById(rangerService.getId())).thenReturn(
- xService);
Mockito.when(xServiceDao.findByServiceDefId(serviceDefId)).thenReturn(null);
- Mockito.when(svcService.update(rangerService))
- .thenReturn(rangerService);
-
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
- Mockito.when(xServiceDao.getById(rangerService.getId())).thenReturn(
- xService);
-
- Mockito.when(daoManager.getXXServiceConfigMap()).thenReturn(
- xServiceConfigMapDao);
- Mockito.when(
- xServiceConfigMapDao.findByServiceId(rangerService.getId()))
- .thenReturn(svcConfigMapList);
Mockito.when(daoManager.getXXDataMaskTypeDef()).thenReturn(xDataMaskDefDao);
Mockito.when(xDataMaskDefDao.findByServiceDefId(serviceDefId)).thenReturn(new ArrayList<XXDataMaskTypeDef>());
- Mockito.when(
- rangerAuditFields.populateAuditFields(
- Mockito.isA(XXServiceConfigMap.class),
- Mockito.isA(XXService.class))).thenReturn(xConfMap);
-
- Mockito.when(stringUtil.getValidUserName(name)).thenReturn(name);
- Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(name)).thenReturn(xUser);
- Mockito.when(!bizUtil.hasAccess(xService, null)).thenReturn(true);
serviceDBStore.deleteServiceDef(Id, true);
Mockito.verify(daoManager).getXXContextEnricherDef();
Mockito.verify(daoManager).getXXEnumDef();
@@ -1139,18 +981,15 @@ public class TestServiceDBStore {
@Test
public void test19createService() throws Exception {
- XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
+ XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
XXServiceConfigMapDao xServiceConfigMapDao = Mockito
.mock(XXServiceConfigMapDao.class);
XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
XXServiceConfigDefDao xServiceConfigDefDao = Mockito
.mock(XXServiceConfigDefDao.class);
XXService xService = Mockito.mock(XXService.class);
- XXUser xUser = Mockito.mock(XXUser.class);
RangerService rangerService = rangerService();
- VXUser vXUser = null;
- String userName = "admin";
List<XXServiceConfigDef> svcConfDefList = new ArrayList<XXServiceConfigDef>();
XXServiceConfigDef serviceConfigDefObj = new XXServiceConfigDef();
@@ -1159,8 +998,6 @@ public class TestServiceDBStore {
svcConfDefList.add(serviceConfigDefObj);
Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
xServiceConfigDefDao);
- Mockito.when(xServiceConfigDefDao.findByServiceDefName(userName))
- .thenReturn(svcConfDefList);
Mockito.when(svcService.create(rangerService)).thenReturn(rangerService);
@@ -1170,17 +1007,9 @@ public class TestServiceDBStore {
Mockito.when(daoManager.getXXServiceConfigMap()).thenReturn(
xServiceConfigMapDao);
- Mockito.when(stringUtil.getValidUserName(userName))
- .thenReturn(userName);
Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(userName)).thenReturn(xUser);
-
- Mockito.when(xUserService.populateViewBean(xUser)).thenReturn(vXUser);
- Mockito.when(xUserMgr.createServiceConfigUser(userName)).thenReturn(vXUser);
XXServiceConfigMap xConfMap = new XXServiceConfigMap();
- Mockito.when(rangerAuditFields.populateAuditFields(xConfMap, xService))
- .thenReturn(xConfMap);
Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn(
rangerService);
@@ -1189,10 +1018,9 @@ public class TestServiceDBStore {
rangerAuditFields.populateAuditFields(
Mockito.isA(XXServiceConfigMap.class),
Mockito.isA(XXService.class))).thenReturn(xConfMap);
-
+
RangerServiceDef ran = new RangerServiceDef();
ran.setName("Test");
- Mockito.when(serviceDefService.read(1L)).thenReturn(ran);
ServiceDBStore spy = Mockito.spy(serviceDBStore);
@@ -1215,9 +1043,7 @@ public class TestServiceDBStore {
XXServiceConfigDefDao xServiceConfigDefDao = Mockito
.mock(XXServiceConfigDefDao.class);
XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
- XXUser xUser = Mockito.mock(XXUser.class);
- VXUser vXUser = null;
RangerService rangerService = rangerService();
String name = "fdfdfds";
@@ -1239,7 +1065,6 @@ public class TestServiceDBStore {
Mockito.when(xServiceDao.getById(Id)).thenReturn(xService);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
- Mockito.when(xServiceDao.findByName(name)).thenReturn(xService);
List<XXServiceConfigDef> xServiceConfigDefList = new ArrayList<XXServiceConfigDef>();
XXServiceConfigDef serviceConfigDefObj = new XXServiceConfigDef();
@@ -1247,11 +1072,6 @@ public class TestServiceDBStore {
xServiceConfigDefList.add(serviceConfigDefObj);
Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
xServiceConfigDefDao);
- Mockito.when(xServiceConfigDefDao.findByServiceDefName(name))
- .thenReturn(xServiceConfigDefList);
-
- Mockito.when(svcService.getTransactionLog(rangerService, xService, 0))
- .thenReturn(trxLogList);
Mockito.when(svcService.update(rangerService))
.thenReturn(rangerService);
@@ -1280,17 +1100,9 @@ public class TestServiceDBStore {
Mockito.when(daoManager.getXXServiceConfigMap()).thenReturn(
xServiceConfigMapDao);
- Mockito.when(stringUtil.getValidUserName(name)).thenReturn(name);
Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(name)).thenReturn(xUser);
-
- Mockito.when(xUserService.populateViewBean(xUser)).thenReturn(vXUser);
- Mockito.when(xUserMgr.createServiceConfigUser(name)).thenReturn(vXUser);
Mockito.when(
- (XXServiceConfigMap) rangerAuditFields.populateAuditFields(
- xConfMap, xService)).thenReturn(xConfMap);
- Mockito.when(
rangerAuditFields.populateAuditFields(
Mockito.isA(XXServiceConfigMap.class),
Mockito.isA(XXService.class))).thenReturn(xConfMap);
@@ -1340,12 +1152,8 @@ public class TestServiceDBStore {
.mock(XXPolicyResourceDao.class);
XXPolicyResourceMapDao xPolicyResourceMapDao = Mockito
.mock(XXPolicyResourceMapDao.class);
- XXServiceConfigDefDao xServiceConfigDefDao = Mockito
- .mock(XXServiceConfigDefDao.class);
XXServiceConfigMapDao xServiceConfigMapDao = Mockito
.mock(XXServiceConfigMapDao.class);
- XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
- XXUser xUser = Mockito.mock(XXUser.class);
RangerService rangerService = rangerService();
RangerPolicy rangerPolicy = rangerPolicy();
@@ -1488,7 +1296,6 @@ public class TestServiceDBStore {
Mockito.when(svcService.getTransactionLog(rangerService, 3))
.thenReturn(trxLogList);
- Mockito.when(svcService.read(Id)).thenReturn(rangerService);
Mockito.when(policyService.read(Id)).thenReturn(rangerPolicy);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.findByName(name)).thenReturn(xService);
@@ -1546,14 +1353,6 @@ public class TestServiceDBStore {
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.getById(Id)).thenReturn(xService);
- Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
- xServiceConfigDefDao);
- Mockito.when(
- xServiceConfigDefDao.findByServiceDefName(rangerService
- .getType())).thenReturn(xServiceConfigDefList);
-
- Mockito.when(svcService.update(rangerService))
- .thenReturn(rangerService);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.getById(rangerService.getId())).thenReturn(
xService);
@@ -1564,12 +1363,6 @@ public class TestServiceDBStore {
xServiceConfigMapDao.findByServiceId(rangerService.getId()))
.thenReturn(xConfMapList);
- Mockito.when(
- rangerAuditFields.populateAuditFields(
- Mockito.isA(XXServiceConfigMap.class),
- Mockito.isA(XXService.class))).thenReturn(xConfMap);
- Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(name)).thenReturn(xUser);
Mockito.when(!bizUtil.hasAccess(xService, null)).thenReturn(true);
serviceDBStore.deleteService(Id);
}
@@ -1707,13 +1500,6 @@ public class TestServiceDBStore {
XXService xService = Mockito.mock(XXService.class);
XXServiceVersionInfo xServiceVersionInfo = Mockito.mock(XXServiceVersionInfo.class);
XXPolicyItemDao xPolicyItemDao = Mockito.mock(XXPolicyItemDao.class);
- XXServiceConfigDefDao xServiceConfigDefDao = Mockito
- .mock(XXServiceConfigDefDao.class);
- XXServiceConfigMapDao xServiceConfigMapDao = Mockito
- .mock(XXServiceConfigMapDao.class);
-
- XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
- XXUser xUser = Mockito.mock(XXUser.class);
XXServiceDef xServiceDef = serviceDef();
Map<String, String> configs = new HashMap<String, String>();
@@ -1878,9 +1664,6 @@ public class TestServiceDBStore {
.thenReturn(xServiceDef);
Mockito.when(daoManager.getXXPolicy()).thenReturn(xPolicyDao);
- Mockito.when(
- xPolicyDao.findByNameAndServiceId(policyName,
- rangerService.getId())).thenReturn(xPolicy);
Mockito.when(policyService.create(rangerPolicy)).thenReturn(
rangerPolicy);
@@ -1899,33 +1682,14 @@ public class TestServiceDBStore {
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.getById(Id)).thenReturn(xService);
- Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
- xServiceConfigDefDao);
- Mockito.when(xServiceConfigDefDao.findByServiceDefName(name))
- .thenReturn(xServiceConfigDefList);
-
- Mockito.when(svcService.update(rangerService))
- .thenReturn(rangerService);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.getById(Id)).thenReturn(xService);
- Mockito.when(daoManager.getXXServiceConfigMap()).thenReturn(
- xServiceConfigMapDao);
- Mockito.when(xServiceConfigMapDao.findByServiceId(Id)).thenReturn(
- xConfMapList);
-
RangerPolicyResourceSignature signature = Mockito
.mock(RangerPolicyResourceSignature.class);
Mockito.when(factory.createPolicyResourceSignature(rangerPolicy))
.thenReturn(signature);
- Mockito.when(
- rangerAuditFields.populateAuditFields(
- Mockito.isA(XXServiceConfigMap.class),
- Mockito.isA(XXService.class))).thenReturn(xConfMap);
- Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(name)).thenReturn(xUser);
-
XXResourceDefDao xResourceDefDao = Mockito.mock(XXResourceDefDao.class);
XXResourceDef xResourceDef = Mockito.mock(XXResourceDef.class);
XXPolicyResourceDao xPolicyResourceDao = Mockito
@@ -2028,12 +1792,6 @@ public class TestServiceDBStore {
.mock(XXPolicyResourceMapDao.class);
XXPolicyItemDao xPolicyItemDao = Mockito.mock(XXPolicyItemDao.class);
XXPolicyItem xPolicyItem = Mockito.mock(XXPolicyItem.class);
- XXServiceConfigDefDao xServiceConfigDefDao = Mockito
- .mock(XXServiceConfigDefDao.class);
- XXServiceConfigMapDao xServiceConfigMapDao = Mockito
- .mock(XXServiceConfigMapDao.class);
- XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
- XXUser xUser = Mockito.mock(XXUser.class);
RangerService rangerService = rangerService();
@@ -2128,30 +1886,10 @@ public class TestServiceDBStore {
Mockito.when(xServiceDao.getById(rangerService.getId())).thenReturn(
xService);
- Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
- xServiceConfigDefDao);
- Mockito.when(xServiceConfigDefDao.findByServiceDefName(name))
- .thenReturn(xServiceConfigDefList);
-
- Mockito.when(svcService.update(rangerService))
- .thenReturn(rangerService);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.getById(rangerService.getId())).thenReturn(
xService);
- Mockito.when(daoManager.getXXServiceConfigMap()).thenReturn(
- xServiceConfigMapDao);
- Mockito.when(
- xServiceConfigMapDao.findByServiceId(rangerService.getId()))
- .thenReturn(xConfMapList);
-
- Mockito.when(
- rangerAuditFields.populateAuditFields(
- Mockito.isA(XXServiceConfigMap.class),
- Mockito.isA(XXService.class))).thenReturn(xConfMap);
- Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(name)).thenReturn(xUser);
-
RangerPolicyResourceSignature signature = Mockito
.mock(RangerPolicyResourceSignature.class);
Mockito.when(factory.createPolicyResourceSignature(rangerPolicy))
@@ -2202,12 +1940,6 @@ public class TestServiceDBStore {
.mock(XXPolicyResourceDao.class);
XXPolicyResourceMapDao xPolicyResourceMapDao = Mockito
.mock(XXPolicyResourceMapDao.class);
- XXServiceConfigDefDao xServiceConfigDefDao = Mockito
- .mock(XXServiceConfigDefDao.class);
- XXServiceConfigMapDao xServiceConfigMapDao = Mockito
- .mock(XXServiceConfigMapDao.class);
- XXUserDao xUserDao = Mockito.mock(XXUserDao.class);
- XXUser xUser = Mockito.mock(XXUser.class);
RangerService rangerService = rangerService();
RangerPolicy rangerPolicy = rangerPolicy();
@@ -2225,9 +1957,6 @@ public class TestServiceDBStore {
policyItem.setUpdateTime(new Date());
policyItemList.add(policyItem);
- List<XXPolicyItemDataMaskInfo> policyItemDataMaskInfo = new ArrayList<XXPolicyItemDataMaskInfo>();
- List<XXPolicyItemRowFilterInfo> policyItemRowFilterInfo = new ArrayList<XXPolicyItemRowFilterInfo>();
-
List<XXPolicyItemCondition> policyItemConditionList = new ArrayList<XXPolicyItemCondition>();
XXPolicyItemCondition policyItemCondition = new XXPolicyItemCondition();
policyItemCondition.setAddedByUserId(Id);
@@ -2329,12 +2058,8 @@ public class TestServiceDBStore {
.thenReturn(policyItemList);
Mockito.when(daoManager.getXXPolicyItemDataMaskInfo()).thenReturn(xPolicyItemDataMaskInfoDao);
- Mockito.when(xPolicyItemDataMaskInfoDao.findByPolicyId(policyItem.getId()))
- .thenReturn(policyItemDataMaskInfo);
Mockito.when(daoManager.getXXPolicyItemRowFilterInfo()).thenReturn(xPolicyItemRowFilterInfoDao);
- Mockito.when(xPolicyItemRowFilterInfoDao.findByPolicyId(policyItem.getId()))
- .thenReturn(policyItemRowFilterInfo);
Mockito.when(daoManager.getXXPolicyItemCondition()).thenReturn(
xPolicyItemConditionDao);
@@ -2377,30 +2102,10 @@ public class TestServiceDBStore {
Mockito.when(xServiceVersionInfoDao.findByServiceId(Id)).thenReturn(xServiceVersionInfo);
Mockito.when(xServiceVersionInfoDao.update(xServiceVersionInfo)).thenReturn(xServiceVersionInfo);
- Mockito.when(daoManager.getXXServiceConfigDef()).thenReturn(
- xServiceConfigDefDao);
- Mockito.when(
- xServiceConfigDefDao.findByServiceDefName(rangerService
- .getType())).thenReturn(xServiceConfigDefList);
-
- Mockito.when(svcService.update(rangerService))
- .thenReturn(rangerService);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.getById(rangerService.getId())).thenReturn(
xService);
- Mockito.when(daoManager.getXXServiceConfigMap()).thenReturn(
- xServiceConfigMapDao);
- Mockito.when(
- xServiceConfigMapDao.findByServiceId(rangerService.getId()))
- .thenReturn(xConfMapList);
-
- Mockito.when(
- rangerAuditFields.populateAuditFields(
- Mockito.isA(XXServiceConfigMap.class),
- Mockito.isA(XXService.class))).thenReturn(xConfMap);
- Mockito.when(daoManager.getXXUser()).thenReturn(xUserDao);
- Mockito.when(xUserDao.findByUserName(name)).thenReturn(xUser);
Mockito.when(!bizUtil.hasAccess(xService, null)).thenReturn(true);
serviceDBStore.deletePolicy(Id);
@@ -2470,12 +2175,6 @@ public class TestServiceDBStore {
XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
XXServiceVersionInfoDao xServiceVersionInfoDao = Mockito.mock(XXServiceVersionInfoDao.class);
- XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
- XXServiceDef xServiceDef = Mockito.mock(XXServiceDef.class);
- RangerServiceDef rangerServiceDef = Mockito
- .mock(RangerServiceDef.class);
-
- RangerService rangerService = rangerService();
XXService xService = new XXService();
xService.setAddedByUserId(Id);
xService.setCreateTime(new Date());
@@ -2504,17 +2203,7 @@ public class TestServiceDBStore {
Mockito.when(daoManager.getXXServiceVersionInfo()).thenReturn(xServiceVersionInfoDao);
Mockito.when(xServiceDao.findByName(serviceName)).thenReturn(xService);
Mockito.when(xServiceVersionInfoDao.findByServiceName(serviceName)).thenReturn(xServiceVersionInfo);
- Mockito.when(xServiceVersionInfoDao.findByServiceId(Id)).thenReturn(xServiceVersionInfo);
- Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn(
- rangerService);
- Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
- Mockito.when(xServiceDefDao.findByName(rangerService.getType()))
- .thenReturn(xServiceDef);
- Mockito.when(serviceDefService.getPopulatedViewObject(xServiceDef))
- .thenReturn(rangerServiceDef);
-
- Mockito.when(serviceDefService.read(Id)).thenReturn(rangerServiceDef);
ServicePolicies dbServicePolicies = serviceDBStore
.getServicePoliciesIfUpdated(serviceName, lastKnownVersion);
Assert.assertNull(dbServicePolicies);
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
index 6083778..0bd39e0 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
@@ -184,7 +184,7 @@ public class TestUserMgr {
list.add(XXPortalUserRole);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.create((XXPortalUser) Mockito.anyObject()))
+ Mockito.when(userDao.create((XXPortalUser) Mockito.any()))
.thenReturn(user);
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(roleDao);
Mockito.when(roleDao.findByUserId(userId)).thenReturn(list);
@@ -237,7 +237,7 @@ public class TestUserMgr {
list.add(XXPortalUserRole);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.create((XXPortalUser) Mockito.anyObject()))
+ Mockito.when(userDao.create((XXPortalUser) Mockito.any()))
.thenReturn(user);
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(roleDao);
Mockito.when(roleDao.findByUserId(userId)).thenReturn(list);
@@ -706,7 +706,7 @@ public class TestUserMgr {
xGroupPermissionList.add(xGroupPermissionObj);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.create((XXPortalUser) Mockito.anyObject()))
+ Mockito.when(userDao.create((XXPortalUser) Mockito.any()))
.thenReturn(user);
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(roleDao);
Mockito.when(roleDao.findByUserId(Mockito.anyLong())).thenReturn(list);
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
----------------------------------------------------------------------
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 3323f11..dbe6f48 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
@@ -330,7 +330,7 @@ public class TestXUserMgr {
VXUser dbvxUser = xUserMgr.getXUser(userId);
Mockito.verify(userMgr).createDefaultAccountUser(
- (VXPortalUser) Mockito.anyObject());
+ (VXPortalUser) Mockito.any());
Mockito.verify(daoManager).getXXModuleDef();
Assert.assertNotNull(dbvxUser);
Assert.assertEquals(userId, dbvxUser.getId());
@@ -701,18 +701,18 @@ public class TestXUserMgr {
vxGroupUser.setOwner("Admin");
vxGroupUser.setUserId(userId);
vxGroupUser.setUpdatedBy("User");
- Mockito.when(xGroupUserService.searchXGroupUsers((SearchCriteria) Mockito.anyObject()))
+ Mockito.when(xGroupUserService.searchXGroupUsers((SearchCriteria) Mockito.any()))
.thenReturn(vxGroupUserList);
Mockito.when(daoManager.getXXGroupUser()).thenReturn(xGroupUserDao);
// VXPermMap
VXPermMapList vXPermMapList = new VXPermMapList();
XXPermMapDao xXPermMapDao = Mockito.mock(XXPermMapDao.class);
- Mockito.when(xPermMapService.searchXPermMaps((SearchCriteria) Mockito.anyObject())).thenReturn(vXPermMapList);
+ Mockito.when(xPermMapService.searchXPermMaps((SearchCriteria) Mockito.any())).thenReturn(vXPermMapList);
Mockito.when(daoManager.getXXPermMap()).thenReturn(xXPermMapDao);
// VXAuditMap
VXAuditMapList vXAuditMapList = new VXAuditMapList();
XXAuditMapDao xXAuditMapDao = Mockito.mock(XXAuditMapDao.class);
- Mockito.when(xAuditMapService.searchXAuditMaps((SearchCriteria) Mockito.anyObject()))
+ Mockito.when(xAuditMapService.searchXAuditMaps((SearchCriteria) Mockito.any()))
.thenReturn(vXAuditMapList);
Mockito.when(daoManager.getXXAuditMap()).thenReturn(xXAuditMapDao);
//XXGroupGroup
@@ -734,7 +734,7 @@ public class TestXUserMgr {
Mockito.when(xXPolicyDao.findByGroupId(userId)).thenReturn(xXPolicyList);
Mockito.when(policyService.getPopulatedViewObject(xXPolicy)).thenReturn(rangerPolicy);
xUserMgr.deleteXGroup(vXGroup.getId(), force);
- Mockito.verify(xGroupUserService).searchXGroupUsers((SearchCriteria) Mockito.anyObject());
+ Mockito.verify(xGroupUserService).searchXGroupUsers((SearchCriteria) Mockito.any());
}
@Test
@@ -757,18 +757,18 @@ public class TestXUserMgr {
vxGroupUser.setOwner("Admin");
vxGroupUser.setUserId(vXUser.getId());
vxGroupUser.setUpdatedBy("User");
- Mockito.when(xGroupUserService.searchXGroupUsers((SearchCriteria) Mockito.anyObject()))
+ Mockito.when(xGroupUserService.searchXGroupUsers((SearchCriteria) Mockito.any()))
.thenReturn(vxGroupUserList);
Mockito.when(daoManager.getXXGroupUser()).thenReturn(xGroupUserDao);
// VXPermMap
VXPermMapList vXPermMapList = new VXPermMapList();
XXPermMapDao xXPermMapDao = Mockito.mock(XXPermMapDao.class);
- Mockito.when(xPermMapService.searchXPermMaps((SearchCriteria) Mockito.anyObject())).thenReturn(vXPermMapList);
+ Mockito.when(xPermMapService.searchXPermMaps((SearchCriteria) Mockito.any())).thenReturn(vXPermMapList);
Mockito.when(daoManager.getXXPermMap()).thenReturn(xXPermMapDao);
// VXAuditMap
VXAuditMapList vXAuditMapList = new VXAuditMapList();
XXAuditMapDao xXAuditMapDao = Mockito.mock(XXAuditMapDao.class);
- Mockito.when(xAuditMapService.searchXAuditMaps((SearchCriteria) Mockito.anyObject()))
+ Mockito.when(xAuditMapService.searchXAuditMaps((SearchCriteria) Mockito.any()))
.thenReturn(vXAuditMapList);
Mockito.when(daoManager.getXXAuditMap()).thenReturn(xXAuditMapDao);
//XXPortalUser
@@ -800,7 +800,7 @@ public class TestXUserMgr {
Mockito.when(xXPolicyDao.findByUserId(vXUser.getId())).thenReturn(xXPolicyList);
Mockito.when(policyService.getPopulatedViewObject(xXPolicy)).thenReturn(rangerPolicy);
xUserMgr.deleteXUser(vXUser.getId(), force);
- Mockito.verify(xGroupUserService).searchXGroupUsers((SearchCriteria) Mockito.anyObject());
+ Mockito.verify(xGroupUserService).searchXGroupUsers((SearchCriteria) Mockito.any());
}
@Test
@@ -825,7 +825,7 @@ public class TestXUserMgr {
Mockito.verify(xGroupService).getGroupByGroupName(Mockito.anyString());
Mockito.verify(xUserService).getXUserByUserName(Mockito.anyString());
Mockito.verify(xGroupUserService).searchXGroupUsers(
- (SearchCriteria) Mockito.anyObject());
+ (SearchCriteria) Mockito.any());
}
@Test
@@ -998,8 +998,8 @@ public class TestXUserMgr {
Set<UserSessionBase> userSessions = new HashSet<UserSessionBase>();
userSessions.add(userSession);
- Mockito.when(xGroupPermissionService.createResource((VXGroupPermission) Mockito.anyObject())).thenReturn(vXGroupPermission);
- Mockito.when(xUserPermissionService.createResource((VXUserPermission) Mockito.anyObject())).thenReturn(vXUserPermission);
+ Mockito.when(xGroupPermissionService.createResource((VXGroupPermission) Mockito.any())).thenReturn(vXGroupPermission);
+ Mockito.when(xUserPermissionService.createResource((VXUserPermission) Mockito.any())).thenReturn(vXUserPermission);
Mockito.when(sessionMgr.getActiveUserSessionsForPortalUserId(userId)).thenReturn(userSessions);
VXModuleDef dbMuduleDef = xUserMgr
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
index 761ed03..9489274 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
@@ -472,7 +472,7 @@ public class TestPublicAPIsv2 {
String policyName = rangerPolicy.getName();
List<RangerPolicy> policies = new ArrayList<RangerPolicy>();
policies.add(rangerPolicy);
- Mockito.when(serviceREST.getPolicies((SearchFilter) Mockito.anyObject())).thenReturn(policies);
+ Mockito.when(serviceREST.getPolicies((SearchFilter) Mockito.any())).thenReturn(policies);
RangerPolicy dbRangerPolicy = publicAPIsv2.getPolicyByName(serviceName, policyName, request);
Assert.assertNotNull(dbRangerPolicy);
Assert.assertEquals(dbRangerPolicy, rangerPolicy);
@@ -480,7 +480,7 @@ public class TestPublicAPIsv2 {
rangerPolicy.getId());
Assert.assertEquals(dbRangerPolicy.getName(),
rangerPolicy.getName());
- Mockito.verify(serviceREST).getPolicies((SearchFilter) Mockito.anyObject());
+ Mockito.verify(serviceREST).getPolicies((SearchFilter) Mockito.any());
}
@Test
@@ -552,7 +552,7 @@ public class TestPublicAPIsv2 {
String serviceName = rangerService.getName();
List<RangerPolicy> policies = new ArrayList<RangerPolicy>();
policies.add(rangerPolicy);
- Mockito.when(serviceREST.getPolicies((SearchFilter) Mockito.anyObject())).thenReturn(policies);
+ Mockito.when(serviceREST.getPolicies((SearchFilter) Mockito.any())).thenReturn(policies);
Mockito.when(serviceREST.updatePolicy(rangerPolicy)).thenReturn(rangerPolicy);
RangerPolicy dbRangerPolicy = publicAPIsv2.updatePolicyByName(rangerPolicy, serviceName, policyName, request);
Assert.assertNotNull(dbRangerPolicy);
@@ -562,7 +562,7 @@ public class TestPublicAPIsv2 {
Assert.assertEquals(dbRangerPolicy.getName(),
rangerPolicy.getName());
Mockito.verify(serviceREST).updatePolicy(rangerPolicy);
- Mockito.verify(serviceREST).getPolicies((SearchFilter) Mockito.anyObject());
+ Mockito.verify(serviceREST).getPolicies((SearchFilter) Mockito.any());
}
@Test
@@ -581,10 +581,10 @@ public class TestPublicAPIsv2 {
String serviceName = rangerService.getName();
List<RangerPolicy> policies = new ArrayList<RangerPolicy>();
policies.add(rangerPolicy);
- Mockito.when(serviceREST.getPolicies((SearchFilter) Mockito.anyObject())).thenReturn(policies);
+ Mockito.when(serviceREST.getPolicies((SearchFilter) Mockito.any())).thenReturn(policies);
Mockito.doNothing().when(serviceREST).deletePolicy(Id);
publicAPIsv2.deletePolicyByName(serviceName, policyName, request);
- Mockito.verify(serviceREST).getPolicies((SearchFilter) Mockito.anyObject());
+ Mockito.verify(serviceREST).getPolicies((SearchFilter) Mockito.any());
Mockito.verify(serviceREST).deletePolicy(Id);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
index fb4f8a3..96b6702 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
@@ -474,7 +474,7 @@ public class TestServiceREST {
.thenReturn(xServiceDef);
Mockito.when(
- svcStore.createService((RangerService) Mockito.anyObject()))
+ svcStore.createService((RangerService) Mockito.any()))
.thenReturn(rangerService);
RangerService dbRangerService = serviceREST
@@ -527,8 +527,6 @@ public class TestServiceREST {
serviceDefList.setList(serviceDefsList);
Mockito.when(svcStore.getPaginatedServiceDefs(filter)).thenReturn(
serviceDefList);
- Mockito.when(serviceDefService.searchRangerServiceDefs(filter))
- .thenReturn(new RangerServiceDefList(serviceDefsList));
RangerServiceDefList dbRangerServiceDef = serviceREST
.getServiceDefs(request);
Assert.assertNotNull(dbRangerServiceDef);
@@ -551,7 +549,7 @@ public class TestServiceREST {
.thenReturn(xServiceDef);
Mockito.when(
- svcStore.updateService((RangerService) Mockito.anyObject()))
+ svcStore.updateService((RangerService) Mockito.any()))
.thenReturn(rangerService);
RangerService dbRangerService = serviceREST
@@ -668,8 +666,6 @@ public class TestServiceREST {
grantRequestObj.setGrantor("read");
grantRequestObj.setIsRecursive(true);
- Mockito.when(validatorFactory.getServiceDefValidator(svcStore))
- .thenReturn(serviceDefValidator);
Mockito.when(
serviceUtil.isValidateHttpsAuthentication(serviceName, request))
.thenReturn(false);
@@ -699,9 +695,6 @@ public class TestServiceREST {
revokeRequest.setGroups(groupList);
revokeRequest.setUsers(userList);
- Mockito.when(validatorFactory.getServiceDefValidator(svcStore))
- .thenReturn(serviceDefValidator);
-
RESTResponse restResponse = serviceREST.revokeAccess(serviceName,
revokeRequest, request);
Assert.assertNotNull(restResponse);
@@ -740,22 +733,17 @@ public class TestServiceREST {
XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
- Mockito.when(
- svcStore.getServicePoliciesIfUpdated(Mockito.anyString(),
- Mockito.anyLong())).thenReturn(servicePolicies);
Mockito.when(validatorFactory.getPolicyValidator(svcStore)).thenReturn(
policyValidator);
Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
- Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(
- userGroupsList);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.findByName(Mockito.anyString())).thenReturn(
xService);
Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
Mockito.when(xServiceDefDao.getById(xService.getType())).thenReturn(
xServiceDef);
- Mockito.when(svcStore.createPolicy((RangerPolicy) Mockito.anyObject()))
+ Mockito.when(svcStore.createPolicy((RangerPolicy) Mockito.any()))
.thenReturn(rangPolicy);
RangerPolicy dbRangerPolicy = serviceREST.createPolicy(rangerPolicy,null);
@@ -828,7 +816,6 @@ public class TestServiceREST {
policyValidator);
Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
- Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(userGroupsList);
Mockito.when(svcStore.getPolicy(Id)).thenReturn(rangerPolicy);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.findByName(Mockito.anyString())).thenReturn(xService);
@@ -863,8 +850,6 @@ public class TestServiceREST {
policyValidator);
Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
- Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(
- userGroupsList);
Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
Mockito.when(xServiceDao.findByName(Mockito.anyString())).thenReturn(xService);
Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
@@ -896,7 +881,6 @@ public class TestServiceREST {
public void test21countPolicies() throws Exception {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
- PList<RangerPolicy> ret = Mockito.mock(PList.class);
SearchFilter filter = new SearchFilter();
filter.setParam(SearchFilter.POLICY_NAME, "policyName");
filter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
@@ -904,8 +888,6 @@ public class TestServiceREST {
searchUtil.getSearchFilter(request, policyService.sortFields))
.thenReturn(filter);
- Mockito.when(svcStore.getPaginatedPolicies(filter)).thenReturn(ret);
-
Long data = serviceREST.countPolicies(request);
Assert.assertNotNull(data);
Mockito.verify(searchUtil).getSearchFilter(request,
@@ -917,7 +899,6 @@ public class TestServiceREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
RangerPolicy rangerPolicy = rangerPolicy();
- PList<RangerPolicy> ret = Mockito.mock(PList.class);
SearchFilter filter = new SearchFilter();
filter.setParam(SearchFilter.POLICY_NAME, "policyName");
filter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
@@ -925,9 +906,6 @@ public class TestServiceREST {
searchUtil.getSearchFilter(request, policyService.sortFields))
.thenReturn(filter);
- Mockito.when(svcStore.getPaginatedServicePolicies(Id, filter))
- .thenReturn(ret);
-
RangerPolicyList dbRangerPolicy = serviceREST.getServicePolicies(
rangerPolicy.getId(), request);
Assert.assertNotNull(dbRangerPolicy);
@@ -965,8 +943,6 @@ public class TestServiceREST {
Long lastKnownVersion = 1L;
String pluginId = "1";
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
-
ServicePolicies dbServicePolicies = serviceREST
.getServicePoliciesIfUpdated(serviceName, lastKnownVersion, 0L,
pluginId, "", request);
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
index 531ad9b..e269283 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
@@ -192,7 +192,7 @@ public class TestTagREST {
@Test
public void test4createTagDef() {
- RangerTagDef oldtagDef = new RangerTagDef();
+ RangerTagDef oldtagDef = new RangerTagDef();
oldtagDef.setId(id);
try {
@@ -452,7 +452,7 @@ public class TestTagREST {
@Test
public void test17createTag() {
- RangerTag oldTag = null;
+ RangerTag oldTag = null;
RangerTag newTag = new RangerTag();
newTag.setId(id);
newTag.setGuid(gId);
@@ -524,7 +524,7 @@ public class TestTagREST {
@Test
public void test19createTag(){
RangerTag oldTag = new RangerTag();
- oldTag.setId(id);
+ oldTag.setId(id);
try {
Mockito.when(validator.preCreateTag(oldTag)).thenReturn(oldTag);
@@ -953,13 +953,13 @@ public class TestTagREST {
}
}
- @Test
+ @Test
public void test35getServiceResourcesByService() {
List<RangerServiceResource> oldSRS = new ArrayList<RangerServiceResource>();
RangerServiceResource rangerServiceResource = new RangerServiceResource();
rangerServiceResource.setId(id);
rangerServiceResource.setServiceName(serviceName);
- oldSRS.add(rangerServiceResource);
+ oldSRS.add(rangerServiceResource);
try {
Mockito.when(tagStore.getServiceResourcesByService(serviceName)).thenReturn(oldSRS);
@@ -978,9 +978,9 @@ public class TestTagREST {
}
}
- @Test
+ @Test
public void test59getServiceResourcesByService() {
- List<RangerServiceResource> oldSRS = new ArrayList<RangerServiceResource>();
+ List<RangerServiceResource> oldSRS = new ArrayList<RangerServiceResource>();
try {
Mockito.when(tagStore.getServiceResourcesByService(serviceName)).thenReturn(oldSRS);
@@ -1431,11 +1431,6 @@ public class TestTagREST {
Mockito.when(tagStore.getServiceTagsIfUpdated(serviceName, lastKnownVersion)).thenReturn(oldServiceTag);
} catch (Exception e) {
}
- try {
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
-
- } catch (Exception e) {
- }
ServiceTags serviceTags = tagREST.getServiceTagsIfUpdated(serviceName, lastKnownVersion, 0L, pluginId, null);
Assert.assertEquals(serviceTags.getServiceName(), oldServiceTag.getServiceName());
Assert.assertEquals(serviceTags.getTagVersion(), oldServiceTag.getTagVersion());
@@ -1485,7 +1480,6 @@ public class TestTagREST {
try {
Mockito.when(tagStore.getServiceTagsIfUpdated(serviceName, lastKnownVersion)).thenReturn(oldServiceTag);
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
} catch (Exception e) {
}
@@ -1548,7 +1542,6 @@ public class TestTagREST {
try {
Mockito.when(tagStore.getServiceTagsIfUpdated(serviceName, lastKnownVersion)).thenReturn(oldServiceTag);
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
} catch (Exception e) {
}
@@ -1614,7 +1607,6 @@ public class TestTagREST {
Mockito.when(bizUtil.isUserAllowed(rangerService, Allowed_User_List_For_Tag_Download)).thenReturn(isAllowed);
try {
Mockito.when(tagStore.getServiceTagsIfUpdated(serviceName, lastKnownVersion)).thenReturn(oldServiceTag);
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
} catch (Exception e) {
}
@@ -1680,7 +1672,6 @@ public class TestTagREST {
Mockito.when(bizUtil.isUserAllowed(rangerService, Allowed_User_List_For_Tag_Download)).thenReturn(isAllowed);
try {
Mockito.when(tagStore.getServiceTagsIfUpdated(serviceName, lastKnownVersion)).thenReturn(oldServiceTag);
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
} catch (Exception e) {
}
@@ -1801,7 +1792,6 @@ public class TestTagREST {
Mockito.when(bizUtil.isUserAllowed(rangerService, Allowed_User_List_For_Tag_Download)).thenReturn(isAllowed);
try {
Mockito.when(tagStore.getServiceTagsIfUpdated(serviceName, lastKnownVersion)).thenReturn(oldServiceTag);
- Mockito.doNothing().when(assetMgr).createPluginInfo(serviceName, pluginId, null, 1, 1L, lastKnownVersion, 1, 0);
} catch (Exception e) {
}
Mockito.when(restErrorUtil.createRESTException(Mockito.anyInt(), Mockito.anyString(), Mockito.anyBoolean())).thenThrow(new WebApplicationException());
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
index ef59fba..8a90ac8 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
@@ -135,8 +135,8 @@ public class TestXAuditREST {
HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
searchCriteria.addParam("name", name);
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject())).thenReturn(searchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any())).thenReturn(searchCriteria);
Mockito.when(xAuditMgr.searchXTrxLogs(searchCriteria)).thenReturn(vxExpList);
VXTrxLogList vxActList = auditREST.searchXTrxLogs(request);
@@ -144,8 +144,8 @@ public class TestXAuditREST {
Assert.assertNotNull(vxActList);
Assert.assertEquals(vxExpList, vxActList);
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any());
Mockito.verify(xAuditMgr).searchXTrxLogs(searchCriteria);
}
@@ -155,8 +155,8 @@ public class TestXAuditREST {
VXLong vxLongExp = new VXLong();
vxLongExp.setValue(id);
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject())).thenReturn(searchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any())).thenReturn(searchCriteria);
Mockito.when(xAuditMgr.getXTrxLogSearchCount(searchCriteria)).thenReturn(vxLongExp);
VXLong vxLongAct = auditREST.countXTrxLogs(request);
@@ -165,8 +165,8 @@ public class TestXAuditREST {
Assert.assertEquals(vxLongExp, vxLongAct);
Assert.assertEquals(vxLongExp.getValue(), vxLongAct.getValue());
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any());
Mockito.verify(xAuditMgr).getXTrxLogSearchCount(searchCriteria);
}
@@ -178,8 +178,8 @@ public class TestXAuditREST {
VXAccessAuditList vxAAListExp = new VXAccessAuditList();
vxAAListExp.setTotalCount(6L);
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject())).thenReturn(searchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any())).thenReturn(searchCriteria);
Mockito.when(xAuditMgr.searchXAccessAudits(searchCriteria)).thenReturn(vxAAListExp);
VXAccessAuditList vxAAListAct = auditREST.searchXAccessAudits(request);
@@ -188,8 +188,8 @@ public class TestXAuditREST {
Assert.assertEquals(vxAAListExp, vxAAListAct);
Assert.assertEquals(vxAAListExp.getTotalCount(), vxAAListAct.getTotalCount());
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any());
Mockito.verify(xAuditMgr).searchXAccessAudits(searchCriteria);
}
@@ -201,8 +201,8 @@ public class TestXAuditREST {
VXLong vxLongExp = new VXLong();
vxLongExp.setValue(id);
- Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject())).thenReturn(searchCriteria);
+ Mockito.when(searchUtil.extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any())).thenReturn(searchCriteria);
Mockito.when(xAuditMgr.getXAccessAuditSearchCount(searchCriteria)).thenReturn(vxLongExp);
VXLong vxLongAct = auditREST.countXAccessAudits(request);
@@ -211,8 +211,8 @@ public class TestXAuditREST {
Assert.assertEquals(vxLongExp, vxLongAct);
Assert.assertEquals(vxLongExp.getValue(), vxLongAct.getValue());
- Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.anyObject(),
- (List<SortField>) Mockito.anyObject());
+ Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest) Mockito.any(),
+ (List<SortField>) Mockito.any());
Mockito.verify(xAuditMgr).getXAccessAuditSearchCount(searchCriteria);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/a3a5e2a7/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
index a82969c..f244b47 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
@@ -127,13 +127,13 @@ public class TestXKeyREST {
public void Test4RolloverKey() throws Exception {
VXKmsKey vxKeyExp = new VXKmsKey();
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
keyREST.rolloverKey(provider, vxKeyExp);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject());
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any());
}
@Test
@@ -147,14 +147,14 @@ public class TestXKeyREST {
@Test
public void Test6DeleteKey() throws Exception {
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
keyREST.deleteKey(nameNl, provider, request);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject());
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any());
}
@Test
@@ -195,13 +195,13 @@ public class TestXKeyREST {
public void Test8CreateKey() throws Exception {
VXKmsKey vxKeyExp = new VXKmsKey();
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXKmsKey vxKeyAct = keyREST.createKey(provider, vxKeyExp);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject());
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any());
Assert.assertNull(vxKeyAct);
}
@@ -223,7 +223,7 @@ public class TestXKeyREST {
@Test
public void Test10GetKey() throws Exception {
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
@@ -231,6 +231,6 @@ public class TestXKeyREST {
Assert.assertNull(vxKeyAct);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject());
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any());
}
}