Merge pull request #746 from eclipse/issues/#643-inferencer-name

Fix #643: class names shortened and number of tests trimmed a bit
eclipse-rdf4j · Feb 1, 2017 · 3367028 · 3367028
2 parents aacfa19 + ae72799
commit 3367028
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 151 deletions.
diff --git a/...SchemaMemoryRepositoryConnectionTest.java → ...SchemaMemoryRepositoryConnectionTest.java b/...SchemaMemoryRepositoryConnectionTest.java → ...SchemaMemoryRepositoryConnectionTest.java
@@ -11,22 +11,22 @@
 import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
-import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
+import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
 
-public class ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest
+public class SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest
 		extends RDFSchemaRepositoryConnectionTest
 {
 
-	public ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest(
+	public SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest(
 			IsolationLevel level)
 	{
 		super(level);
 	}
 
 	@Override
 	protected Repository createRepository() {
-		return new SailRepository(new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true));
+		return new SailRepository(new SchemaCachingRDFSInferencer(new MemoryStore(), true));
 	}
 
 }
diff --git a/...ory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java b/...ory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java
diff --git a/...rencerNativeRepositoryConnectionTest.java → ...rencerNativeRepositoryConnectionTest.java b/...rencerNativeRepositoryConnectionTest.java → ...rencerNativeRepositoryConnectionTest.java
@@ -15,16 +15,16 @@
 import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
-import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
+import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
 import org.eclipse.rdf4j.sail.nativerdf.NativeStore;
 
-public class ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest
+public class SchemaCachingRDFSInferencerNativeRepositoryConnectionTest
 		extends RDFSchemaRepositoryConnectionTest
 {
 
 	private File dataDir;
 
-	public ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest(IsolationLevel level) {
+	public SchemaCachingRDFSInferencerNativeRepositoryConnectionTest(IsolationLevel level) {
 		super(level);
 	}
 
@@ -34,7 +34,7 @@ protected Repository createRepository()
 	{
 		dataDir = FileUtil.createTempDir("nativestore");
 		return new SailRepository(
-				new ForwardChainingSchemaCachingRDFSInferencer(new NativeStore(dataDir, "spoc"), true));
+				new SchemaCachingRDFSInferencer(new NativeStore(dataDir, "spoc"), true));
 	}
 
 	@Override

diff --git a/...hingRDFSInferencerMemInferencingTest.java → ...hingRDFSInferencerMemInferencingTest.java b/...hingRDFSInferencerMemInferencingTest.java → ...hingRDFSInferencerMemInferencingTest.java
@@ -17,19 +17,19 @@
 import org.eclipse.rdf4j.repository.sail.SailRepository;
 import org.eclipse.rdf4j.sail.InferencingTest;
 import org.eclipse.rdf4j.sail.Sail;
-import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
+import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
 import org.junit.Test;
 
 import java.lang.reflect.InvocationTargetException;
 
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 
-public class ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest extends InferencingTest {
+public class SchemaCachingRDFSInferencerMemInferencingTest extends InferencingTest {
 
 	@Override
 	protected Sail createSail() {
-		Sail sailStack = new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true);
+		Sail sailStack = new SchemaCachingRDFSInferencer(new MemoryStore(), true);
 		return sailStack;
 	}
 
@@ -127,8 +127,8 @@ public void testFastInstantiate()
 		}
 
 		SailRepository sailRepository1 = new SailRepository(
-				ForwardChainingSchemaCachingRDFSInferencer.fastInstantiateFrom(
-						(ForwardChainingSchemaCachingRDFSInferencer)sail, new MemoryStore()));
+				SchemaCachingRDFSInferencer.fastInstantiateFrom(
+						(SchemaCachingRDFSInferencer)sail, new MemoryStore()));
 		sailRepository1.initialize();
 
 		try (RepositoryConnection connection = sailRepository1.getConnection()) {

diff --git a/...achingRDFSMemoryStoreConcurrencyTest.java → ...achingRDFSMemoryStoreConcurrencyTest.java b/...achingRDFSMemoryStoreConcurrencyTest.java → ...achingRDFSMemoryStoreConcurrencyTest.java
@@ -10,14 +10,14 @@
 import org.eclipse.rdf4j.sail.Sail;
 import org.eclipse.rdf4j.sail.SailConcurrencyTest;
 import org.eclipse.rdf4j.sail.SailException;
-import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
+import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
 import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * An extension of {@link SailConcurrencyTest} for testing the class {@link MemoryStore}.
  */
-public class ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest extends SailConcurrencyTest {
+public class SchemaCachingRDFSMemoryStoreConcurrencyTest extends SailConcurrencyTest {
 
 	/*---------*
 	 * Methods *
@@ -27,7 +27,7 @@ public class ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest extends
 	protected Sail createSail()
 		throws SailException
 	{
-		Sail sailStack = new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true);
+		Sail sailStack = new SchemaCachingRDFSInferencer(new MemoryStore(), true);
 		return sailStack;
 	}
 

diff --git a/.../sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java b/.../sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java