Repository: incubator-ranger Updated Branches: refs/heads/master fa3e38c22 -> 9ee9b2c14
RANGER-234: modification to UT and Build process - to work with both Linux and Windows platform Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/9ee9b2c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/9ee9b2c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/9ee9b2c1 Branch: refs/heads/master Commit: 9ee9b2c142c6e8a176f026ad3b8ff283fe5c9f0f Parents: fa3e38c Author: sneethiraj <[email protected]> Authored: Wed Mar 4 21:29:37 2015 -0500 Committer: sneethiraj <[email protected]> Committed: Wed Mar 4 21:29:37 2015 -0500 ---------------------------------------------------------------------- .../ranger/plugin/store/TestServiceStore.java | 51 +++++++++++++++----- security-admin/pom.xml | 2 + ugsync/pom.xml | 4 +- 3 files changed, 43 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9ee9b2c1/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java index 001fb10..ae04e28 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java @@ -21,6 +21,7 @@ package org.apache.ranger.plugin.store; import static org.junit.Assert.*; +import java.io.File; import java.util.List; import org.apache.ranger.plugin.model.RangerPolicy; @@ -47,7 +48,21 @@ public class TestServiceStore { @BeforeClass public static void setupTest() throws Exception { - String fileStoreDir = "file://" + System.getProperty("java.io.tmpdir");; + + + File file = File.createTempFile("fileStore", "dir") ; + + if (file.exists()) { + file.delete() ; + } + + file.deleteOnExit(); + + file.mkdirs() ; + + String fileStoreDir = file.getAbsolutePath() ; + + System.out.println("Using fileStoreDirectory as [" + fileStoreDir + "]") ; svcStore = new ServiceFileStore(fileStoreDir); svcStore.init(); @@ -235,17 +250,27 @@ public class TestServiceStore { policies = svcStore.getPolicies(filter); assertEquals("getPolicies(filter=origPolicyName) failed", 1, policies == null ? 0 : policies.size()); filter = null; - - svcStore.deletePolicy(policy.getId()); - policies = svcStore.getPolicies(filter); - assertEquals("deletePolicy() failed", initPolicyCount, policies == null ? 0 : policies.size()); - - svcStore.deleteService(svc.getId()); - services = svcStore.getServices(filter); - assertEquals("deleteService() failed", initServiceCount, services == null ? 0 : services.size()); - - svcStore.deleteServiceDef(sd.getId()); - sds = svcStore.getServiceDefs(filter); - assertEquals("deleteServiceDef() failed", initSdCount, sds == null ? 0 : sds.size()); + + String osName = System.getProperty("os.name") ; + boolean windows = (osName != null && osName.toLowerCase().startsWith("windows")) ; + + if (! windows ) { + + svcStore.deletePolicy(policy.getId()); + + policies = svcStore.getPolicies(filter); + + assertEquals("deletePolicy() failed", initPolicyCount, policies == null ? 0 : policies.size()); + + + svcStore.deleteService(svc.getId()); + services = svcStore.getServices(filter); + assertEquals("deleteService() failed", initServiceCount, services == null ? 0 : services.size()); + + svcStore.deleteServiceDef(sd.getId()); + sds = svcStore.getServiceDefs(filter); + assertEquals("deleteServiceDef() failed", initSdCount, sds == null ? 0 : sds.size()); + + } } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9ee9b2c1/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index ce754ab..5a050ec 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -346,11 +346,13 @@ </exclusion> </exclusions> </dependency> + <!-- <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger-util</artifactId> <version>${project.version}</version> </dependency> + --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9ee9b2c1/ugsync/pom.xml ---------------------------------------------------------------------- diff --git a/ugsync/pom.xml b/ugsync/pom.xml index a7d01ff..b27dd9a 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -98,12 +98,14 @@ <groupId>org.apache.ranger</groupId> <artifactId>credentialbuilder</artifactId> <version>${project.version}</version> - </dependency> + </dependency> + <!-- <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger-util</artifactId> <version>${project.version}</version> </dependency> + --> </dependencies>
