Repository: oodt Updated Branches: refs/heads/avro_rpc cbd9d0d68 -> 0b861c8c9
fix test Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/0f76e461 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/0f76e461 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/0f76e461 Branch: refs/heads/avro_rpc Commit: 0f76e461a15c1054f9d466a56fb714d18b80b8da Parents: cbd9d0d Author: Tom Barber <[email protected]> Authored: Wed Jul 6 16:24:20 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Wed Jul 6 16:24:20 2016 +0100 ---------------------------------------------------------------------- filemgr/pom.xml | 3 +-- .../cas/filemgr/catalog/TestLuceneCatalog.java | 23 +++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/0f76e461/filemgr/pom.xml ---------------------------------------------------------------------- diff --git a/filemgr/pom.xml b/filemgr/pom.xml index d4b77a7..cc9a6e5 100644 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@ -275,9 +275,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkCount>0</forkCount> + <forkMode>pertest</forkMode> <!--forkMode>pertest</forkMode--> - <forkMode>none</forkMode> <!-- so we can DEBUG --> <argLine>-enableassertions</argLine> <useSystemClassLoader>false</useSystemClassLoader> http://git-wip-us.apache.org/repos/asf/oodt/blob/0f76e461/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java index 545d6bf..7faffdd 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java @@ -73,7 +73,7 @@ public class TestLuceneCatalog extends TestCase { // set the log levels URL loggingPropertiesUrl = this.getClass().getResource( "/test.logging.properties"); - properties.setProperty("java.util.logging.config.file", new File( + System.setProperty("java.util.logging.config.file", new File( loggingPropertiesUrl.getFile()).getAbsolutePath()); // first load the example configuration @@ -107,35 +107,35 @@ public class TestLuceneCatalog extends TestCase { tmpDirPath += "testCat/"; // now override the catalog ones - properties.setProperty( + System.setProperty( "org.apache.oodt.cas.filemgr.catalog.lucene.idxPath", tmpDirPath); - properties.setProperty( + System.setProperty( "org.apache.oodt.cas.filemgr.catalog.lucene.pageSize", "20"); - properties.setProperty( + System.setProperty( "org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds", "60"); - properties.setProperty( + System.setProperty( "org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds", "60"); - properties.setProperty( + System.setProperty( "org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor", "20"); - properties.setProperty( + System.setProperty( "org.apache.oodt.cas.filemgr.catalog.datasource.lenientFields", "false"); // now override the val layer ones URL examplesCoreUrl = this.getClass().getResource( "/examples/core"); - properties.setProperty("org.apache.oodt.cas.filemgr.validation.dirs", + System.setProperty("org.apache.oodt.cas.filemgr.validation.dirs", "file://" + new File(examplesCoreUrl.getFile()).getAbsolutePath()); - System.setProperties(properties); + //System.setProperties(properties); } /* @@ -173,7 +173,7 @@ public class TestLuceneCatalog extends TestCase { } } - System.setProperties(initialProperties); + // System.setProperties(initialProperties); } /** @@ -993,6 +993,9 @@ public class TestLuceneCatalog extends TestCase { public void testNullIndexPath(){ System.clearProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath"); Properties sysProps = System.getProperties(); + sysProps.remove("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath"); + + try{ LuceneCatalogFactory fact = new LuceneCatalogFactory();
