Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix #643: class names shortened and number of tests trimmed a bit #746

Merged
merged 1 commit into from
Feb 1, 2017
Merged

Fix #643: class names shortened and number of tests trimmed a bit #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...SchemaMemoryRepositoryConnectionTest.java → ...SchemaMemoryRepositoryConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

}
71 changes: 0 additions & 71 deletions ...ory/SpinForwardChainingSchemaCachingRDFSInferencerRDFSMemoryRepositoryConnectionTest.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...rencerNativeRepositoryConnectionTest.java → ...rencerNativeRepositoryConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...hingRDFSInferencerMemInferencingTest.java → ...hingRDFSInferencerMemInferencingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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()) {
Expand Down
6 changes: 3 additions & 3 deletions ...achingRDFSMemoryStoreConcurrencyTest.java → ...achingRDFSMemoryStoreConcurrencyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand All @@ -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;
}

Expand Down
35 changes: 0 additions & 35 deletions .../sail/nativerdf/NativeStoreInferencingTestForwardChainingSchemaCachingRDFSInferencer.java
View file
Open in desktop

This file was deleted.

Loading