You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ga...@apache.org on 2015/12/08 09:17:35 UTC
incubator-ranger git commit: RANGER-770 : Fix NullPointerException
Unit test cases on master branch
Repository: incubator-ranger
Updated Branches:
refs/heads/master f3467abc3 -> 8e1e54e65
RANGER-770 : Fix NullPointerException Unit test cases on master branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/8e1e54e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8e1e54e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8e1e54e6
Branch: refs/heads/master
Commit: 8e1e54e6518ea7e485cd3ec580f9ccc9ab82b4bf
Parents: f3467ab
Author: Gautam Borad <ga...@apache.org>
Authored: Tue Dec 8 10:43:13 2015 +0530
Committer: Gautam Borad <ga...@apache.org>
Committed: Tue Dec 8 13:47:20 2015 +0530
----------------------------------------------------------------------
.../apache/ranger/entity/XXTagAttributeDef.java | 4 +-
.../org/apache/ranger/rest/TestServiceREST.java | 75 ++++++++++++--------
.../TestRangerServiceDefServiceBase.java | 7 +-
3 files changed, 53 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e1e54e6/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
index c0e02e4..6459128 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
@@ -41,8 +41,8 @@ public class XXTagAttributeDef extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- @SequenceGenerator(name = "X_SERVICE_RESOURCE_ELEMENT_SEQ", sequenceName = "X_SERVICE_RESOURCE_ELEMENT_SEQ", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator = "X_SERVICE_RESOURCE_ELEMENT_SEQ")
+ @SequenceGenerator(name = "X_TAG_ATTR_DEF_SEQ", sequenceName = "X_TAG_ATTR_DEF_SEQ", allocationSize = 1)
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "X_TAG_ATTR_DEF_SEQ")
@Column(name = "id")
protected Long id;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e1e54e6/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 14b1eab..339f1e7 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
@@ -703,7 +703,6 @@ public class TestServiceREST {
@Test
public void test16createPolicyFalse() throws Exception {
-
RangerPolicy rangerPolicy = rangerPolicy();
RangerServiceDef rangerServiceDef = rangerServiceDef();
@@ -730,29 +729,36 @@ public class TestServiceREST {
rangerAccessTypeDefObj.setName("read");
rangerAccessTypeDefObj.setRbKeyLabel(null);
rangerAccessTypeDefList.add(rangerAccessTypeDefObj);
+ XXServiceDef xServiceDef = serviceDef();
+ XXService xService = xService();
+ 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(false);
+ Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(
userGroupsList);
-
- Mockito.when(restErrorUtil.createRESTException((String)null))
- .thenThrow(new WebApplicationException());
- thrown.expect(WebApplicationException.class);
+ 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()))
+ .thenReturn(rangPolicy);
RangerPolicy dbRangerPolicy = serviceREST.createPolicy(rangerPolicy);
Assert.assertNotNull(dbRangerPolicy);
- Mockito.verify(svcStore).getServicePoliciesIfUpdated(
- Mockito.anyString(), Mockito.anyLong());
- Mockito.verify(bizUtil).getCurrentUserLoginId();
- Mockito.verify(bizUtil).isAdmin();
- Mockito.verify(userMgr).getGroupsForUser(userName);
+ Mockito.verify(bizUtil, Mockito.times(2)).isAdmin();
Mockito.verify(validatorFactory).getPolicyValidator(svcStore);
+
+ Mockito.verify(daoManager).getXXService();
+ Mockito.verify(daoManager).getXXServiceDef();
}
@Test
@@ -770,16 +776,21 @@ public class TestServiceREST {
rangerAccessTypeDefObj.setName("read");
rangerAccessTypeDefObj.setRbKeyLabel(null);
rangerAccessTypeDefList.add(rangerAccessTypeDefObj);
+ XXServiceDef xServiceDef = serviceDef();
+ XXService xService = xService();
+ XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
+ XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
+
Mockito.when(validatorFactory.getPolicyValidator(svcStore)).thenReturn(
policyValidator);
- Mockito.when(bizUtil.isAdmin()).thenReturn(false);
+ Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(
userGroupsList);
-
- Mockito.when(restErrorUtil.createRESTException((String)null))
- .thenThrow(new WebApplicationException());
- thrown.expect(WebApplicationException.class);
+ 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);
RangerPolicy dbRangerPolicy = serviceREST.updatePolicy(rangerPolicy);
Assert.assertNull(dbRangerPolicy);
Mockito.verify(validatorFactory).getPolicyValidator(svcStore);
@@ -803,16 +814,20 @@ public class TestServiceREST {
rangerAccessTypeDefObj.setName("read");
rangerAccessTypeDefObj.setRbKeyLabel(null);
rangerAccessTypeDefList.add(rangerAccessTypeDefObj);
+ XXServiceDef xServiceDef = serviceDef();
+ XXService xService = xService();
+ XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
+ XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
Mockito.when(validatorFactory.getPolicyValidator(svcStore)).thenReturn(
policyValidator);
- Mockito.when(bizUtil.isAdmin()).thenReturn(false);
+ Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
- Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(
- userGroupsList);
-
- Mockito.when(restErrorUtil.createRESTException((String)null))
- .thenThrow(new WebApplicationException());
- thrown.expect(WebApplicationException.class);
+ 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);
+ Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
+ Mockito.when(xServiceDefDao.getById(xService.getType())).thenReturn(xServiceDef);
serviceREST.deletePolicy(rangerPolicy.getId());
Mockito.verify(validatorFactory).getPolicyValidator(svcStore);
}
@@ -834,16 +849,20 @@ public class TestServiceREST {
rangerAccessTypeDefObj.setName("read");
rangerAccessTypeDefObj.setRbKeyLabel(null);
rangerAccessTypeDefList.add(rangerAccessTypeDefObj);
+ XXServiceDef xServiceDef = serviceDef();
+ XXService xService = xService();
+ XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
+ XXServiceDao xServiceDao = Mockito.mock(XXServiceDao.class);
Mockito.when(validatorFactory.getPolicyValidator(svcStore)).thenReturn(
policyValidator);
- Mockito.when(bizUtil.isAdmin()).thenReturn(false);
+ Mockito.when(bizUtil.isAdmin()).thenReturn(true);
Mockito.when(bizUtil.getCurrentUserLoginId()).thenReturn(userName);
Mockito.when(userMgr.getGroupsForUser(userName)).thenReturn(
userGroupsList);
-
- Mockito.when(restErrorUtil.createRESTException((String)null))
- .thenThrow(new WebApplicationException());
- thrown.expect(WebApplicationException.class);
+ 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);
RangerPolicy dbRangerPolicy = serviceREST.getPolicy(rangerPolicy
.getId());
Assert.assertNotNull(dbRangerPolicy);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e1e54e6/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 67d1feb..b73a629 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
@@ -26,6 +26,7 @@ import javax.ws.rs.WebApplicationException;
import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.common.ContextUtil;
import org.apache.ranger.common.GUIDUtil;
+import org.apache.ranger.common.JSONUtil;
import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.RESTErrorUtil;
import org.apache.ranger.common.RangerSearchUtil;
@@ -98,6 +99,9 @@ public class TestRangerServiceDefServiceBase {
@Mock
GUIDUtil guidUtil;
+
+ @Mock
+ JSONUtil jsonUtil;
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -427,17 +431,14 @@ public class TestRangerServiceDefServiceBase {
serviceDefObj.setDescription("HDFS Repository");
serviceDefObj.setGuid("1427365526516_835_0");
serviceDefObj.setId(Id);
-
Mockito.when(
(XXPolicyConditionDef) rangerAuditFields.populateAuditFields(
policyConditionDefObj, serviceDefObj)).thenReturn(
policyConditionDefObj);
-
XXPolicyConditionDef dbPolicyConditionDef = rangerServiceDefService
.populateRangerPolicyConditionDefToXX(rangerConditionDefvObj,
policyConditionDefObj, serviceDefObj, 1);
Assert.assertNotNull(dbPolicyConditionDef);
- Assert.assertEquals(dbPolicyConditionDef, policyConditionDefObj);
Assert.assertEquals(dbPolicyConditionDef.getName(),
policyConditionDefObj.getName());
Assert.assertEquals(dbPolicyConditionDef.getDescription(),