Skip to content

Commit 3367028

Browse files
abrokenjesterabrokenjester
authored
Merge pull request #746 from eclipse/issues/#643-inferencer-name
Fix #643: class names shortened and number of tests trimmed a bit
2 parents aacfa19 + ae72799 commit 3367028

8 files changed

Lines changed: 45 additions & 151 deletions

compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java renamed to compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest;
1212
import org.eclipse.rdf4j.repository.Repository;
1313
import org.eclipse.rdf4j.repository.sail.SailRepository;
14-
import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
14+
import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
1515
import org.eclipse.rdf4j.sail.memory.MemoryStore;
1616

17-
public class ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest
17+
public class SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest
1818
extends RDFSchemaRepositoryConnectionTest
1919
{
2020

21-
public ForwardChainingSchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest(
21+
public SchemaCachingRDFSInferencerRDFSchemaMemoryRepositoryConnectionTest(
2222
IsolationLevel level)
2323
{
2424
super(level);
2525
}
2626

2727
@Override
2828
protected Repository createRepository() {
29-
return new SailRepository(new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true));
29+
return new SailRepository(new SchemaCachingRDFSInferencer(new MemoryStore(), true));
3030
}
3131

3232
}

‎compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/memory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java renamed to compliance/store/src/test/java/org/eclipse/rdf4j/repository/sail/nativerdf/SchemaCachingRDFSInferencerNativeRepositoryConnectionTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
import org.eclipse.rdf4j.repository.RDFSchemaRepositoryConnectionTest;
1616
import org.eclipse.rdf4j.repository.Repository;
1717
import org.eclipse.rdf4j.repository.sail.SailRepository;
18-
import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
18+
import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
1919
import org.eclipse.rdf4j.sail.nativerdf.NativeStore;
2020

21-
public class ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest
21+
public class SchemaCachingRDFSInferencerNativeRepositoryConnectionTest
2222
extends RDFSchemaRepositoryConnectionTest
2323
{
2424

2525
private File dataDir;
2626

27-
public ForwardChainingSchemaCachingRDFSInferencerNativeRepositoryConnectionTest(IsolationLevel level) {
27+
public SchemaCachingRDFSInferencerNativeRepositoryConnectionTest(IsolationLevel level) {
2828
super(level);
2929
}
3030

@@ -34,7 +34,7 @@ protected Repository createRepository()
3434
{
3535
dataDir = FileUtil.createTempDir("nativestore");
3636
return new SailRepository(
37-
new ForwardChainingSchemaCachingRDFSInferencer(new NativeStore(dataDir, "spoc"), true));
37+
new SchemaCachingRDFSInferencer(new NativeStore(dataDir, "spoc"), true));
3838
}
3939

4040
@Override

compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest.java renamed to compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSInferencerMemInferencingTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
import org.eclipse.rdf4j.repository.sail.SailRepository;
1818
import org.eclipse.rdf4j.sail.InferencingTest;
1919
import org.eclipse.rdf4j.sail.Sail;
20-
import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
20+
import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
2121
import org.junit.Test;
2222

2323
import java.lang.reflect.InvocationTargetException;
2424

2525
import static junit.framework.TestCase.assertFalse;
2626
import static junit.framework.TestCase.assertTrue;
2727

28-
public class ForwardChainingSchemaCachingRDFSInferencerMemInferencingTest extends InferencingTest {
28+
public class SchemaCachingRDFSInferencerMemInferencingTest extends InferencingTest {
2929

3030
@Override
3131
protected Sail createSail() {
32-
Sail sailStack = new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true);
32+
Sail sailStack = new SchemaCachingRDFSInferencer(new MemoryStore(), true);
3333
return sailStack;
3434
}
3535

@@ -127,8 +127,8 @@ public void testFastInstantiate()
127127
}
128128

129129
SailRepository sailRepository1 = new SailRepository(
130-
ForwardChainingSchemaCachingRDFSInferencer.fastInstantiateFrom(
131-
(ForwardChainingSchemaCachingRDFSInferencer)sail, new MemoryStore()));
130+
SchemaCachingRDFSInferencer.fastInstantiateFrom(
131+
(SchemaCachingRDFSInferencer)sail, new MemoryStore()));
132132
sailRepository1.initialize();
133133

134134
try (RepositoryConnection connection = sailRepository1.getConnection()) {

compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest.java renamed to compliance/store/src/test/java/org/eclipse/rdf4j/sail/memory/SchemaCachingRDFSMemoryStoreConcurrencyTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import org.eclipse.rdf4j.sail.Sail;
1111
import org.eclipse.rdf4j.sail.SailConcurrencyTest;
1212
import org.eclipse.rdf4j.sail.SailException;
13-
import org.eclipse.rdf4j.sail.inferencer.fc.ForwardChainingSchemaCachingRDFSInferencer;
13+
import org.eclipse.rdf4j.sail.inferencer.fc.SchemaCachingRDFSInferencer;
1414
import org.junit.Ignore;
1515
import org.junit.Test;
1616

1717
/**
1818
* An extension of {@link SailConcurrencyTest} for testing the class {@link MemoryStore}.
1919
*/
20-
public class ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest extends SailConcurrencyTest {
20+
public class SchemaCachingRDFSMemoryStoreConcurrencyTest extends SailConcurrencyTest {
2121

2222
/*---------*
2323
* Methods *
@@ -27,7 +27,7 @@ public class ForwardChainingSchemaCachingRDFSMemoryStoreConcurrencyTest extends
2727
protected Sail createSail()
2828
throws SailException
2929
{
30-
Sail sailStack = new ForwardChainingSchemaCachingRDFSInferencer(new MemoryStore(), true);
30+
Sail sailStack = new SchemaCachingRDFSInferencer(new MemoryStore(), true);
3131
return sailStack;
3232
}
3333

‎compliance/store/src/test/java/org/eclipse/rdf4j/sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)