RANGER-274: Fixed failing unit test after merge from master Signed-off-by: Madhan Neethiraj <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b85b3637 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b85b3637 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b85b3637 Branch: refs/heads/tag-policy Commit: b85b36378a734a09bcc40570dba6186fa63ff2eb Parents: ec701f2 Author: Abhay Kulkarni <[email protected]> Authored: Mon Jun 22 14:28:50 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Jun 22 19:35:06 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/ranger/biz/ServiceDBStore.java | 9 +++++++-- .../org/apache/ranger/biz/TestServiceDBStore.java | 15 ++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b85b3637/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java index 326cae0..6813915 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java @@ -1068,6 +1068,11 @@ public class ServiceDBStore implements ServiceStore { xConfMap = xConfMapDao.create(xConfMap); } RangerService createdService = svcService.getPopulatedViewObject(xCreatedService); + + if (createdService == null) { + throw restErrorUtil.createRESTException("Could not create service - Internal error ", MessageEnums.ERROR_CREATING_OBJECT); + } + dataHistService.createObjectDataHistory(createdService, RangerDataHistService.ACTION_CREATE); List<XXTrxLog> trxLogList = svcService.getTransactionLog(createdService, @@ -1684,7 +1689,7 @@ public class ServiceDBStore implements ServiceStore { return ret; } - private void createDefaultPolicies(XXService createdService, VXUser vXUser) throws Exception { + void createDefaultPolicies(XXService createdService, VXUser vXUser) throws Exception { // we need to create one policy for each resource hierarchy RangerServiceDef serviceDef = getServiceDef(createdService.getType()); RangerServiceDefHelper serviceDefHelper = new RangerServiceDefHelper(serviceDef); @@ -1692,7 +1697,7 @@ public class ServiceDBStore implements ServiceStore { for (List<RangerResourceDef> aHierarchy : serviceDefHelper.getResourceHierarchies()) { createDefaultPolicy(createdService, vXUser, aHierarchy, i); i++; - } + }; } private void createDefaultPolicy(XXService createdService, VXUser vXUser, List<RangerResourceDef> resourceHierarchy, int num) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b85b3637/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 e13b862..b2fdad6 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 @@ -1167,10 +1167,6 @@ public class TestServiceDBStore { XXServiceConfigDefDao xServiceConfigDefDao = Mockito .mock(XXServiceConfigDefDao.class); XXService xService = Mockito.mock(XXService.class); - XXService xService2 = new XXService(); - xService2.setId(1L); - xService2.setName("Test"); - xService2.setType(1L); XXUser xUser = Mockito.mock(XXUser.class); RangerService rangerService = rangerService(); @@ -1210,9 +1206,6 @@ public class TestServiceDBStore { Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn( rangerService); - Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao); - Mockito.when(xServiceDao.getById(Mockito.anyLong())).thenReturn(xService2); - Mockito.when( rangerAuditFields.populateAuditFields( Mockito.isA(XXServiceConfigMap.class), @@ -1221,8 +1214,12 @@ public class TestServiceDBStore { RangerServiceDef ran = new RangerServiceDef(); ran.setName("Test"); Mockito.when(serviceDefService.read(1L)).thenReturn(ran); - - serviceDBStore.createService(rangerService); + + ServiceDBStore spy = Mockito.spy(serviceDBStore); + + Mockito.doNothing().when(spy).createDefaultPolicies(xService, vXUser); + + spy.createService(rangerService); Mockito.verify(daoManager, Mockito.atLeast(1)).getXXService(); Mockito.verify(daoManager).getXXServiceConfigMap();
