RYA-398 Changed BeforeClass to Before. Closes #239. If MongEntityIndexTest gets run first, it will fail since conf hasn't been initialized yet
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a3b20420 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a3b20420 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a3b20420 Branch: refs/heads/master Commit: a3b20420c68252f6e7b21db8959173b0779b1a7e Parents: 26e9214 Author: Andrew Smith <[email protected]> Authored: Thu Oct 5 16:26:25 2017 -0400 Committer: jdasch <[email protected]> Committed: Thu Oct 12 12:55:45 2017 -0400 ---------------------------------------------------------------------- .../org/apache/rya/indexing/mongo/MongoEntityIndexTest.java | 9 +++++---- .../apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java | 7 ------- 2 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a3b20420/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexTest.java index 850640f..2fe0cb3 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoEntityIndexTest.java @@ -31,6 +31,7 @@ import org.apache.rya.indexing.entity.storage.EntityStorage; import org.apache.rya.indexing.entity.storage.TypeStorage; import org.apache.rya.mongodb.MongoTestBase; import org.junit.Assert; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.openrdf.model.vocabulary.RDF; @@ -54,11 +55,11 @@ public class MongoEntityIndexTest extends MongoTestBase { .build()); private static final RyaURI RYA_PERSON_TYPE = new RyaURI("urn:person"); - private static EntityIndexOptimizer optimizer; - private static EntityStorage entityStorage; + private EntityIndexOptimizer optimizer; + private EntityStorage entityStorage; - @BeforeClass - public static void beforeClass() throws Exception { + @Before + public void beforeClass() throws Exception { optimizer = new EntityIndexOptimizer(); optimizer.setConf(conf); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a3b20420/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java index 1c712ca..f111fd1 100644 --- a/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java +++ b/extras/indexing/src/test/java/org/apache/rya/indexing/mongo/MongoFreeTextIndexerTest.java @@ -99,11 +99,7 @@ public class MongoFreeTextIndexerTest extends MongoTestBase { f.flush(); - System.out.println("testDelete: BEFORE DELETE"); - f.deleteStatement(RdfToRyaConversions.convertStatement(statement1)); - System.out.println("testDelete: AFTER FIRST DELETION"); -// Assert.assertEquals(Sets.newHashSet(), getSet(f.queryText("this is a new hat", EMPTY_CONSTRAINTS))); Assert.assertEquals(Sets.newHashSet(statement2), getSet(f.queryText("Do you like my new hat?", EMPTY_CONSTRAINTS))); // Check that "new" didn't get deleted from the term table after "this is a new hat" @@ -111,9 +107,6 @@ public class MongoFreeTextIndexerTest extends MongoTestBase { Assert.assertEquals(Sets.newHashSet(statement2), getSet(f.queryText("new", EMPTY_CONSTRAINTS))); f.deleteStatement(RdfToRyaConversions.convertStatement(statement2)); - System.out.println("testDelete: AFTER LAST DELETION"); - - System.out.println("testDelete: DONE"); Assert.assertEquals(Sets.newHashSet(), getSet(f.queryText("this is a new hat", EMPTY_CONSTRAINTS))); Assert.assertEquals(Sets.newHashSet(), getSet(f.queryText("Do you like my new hat?", EMPTY_CONSTRAINTS))); }
