more cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/adefed44 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/adefed44 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/adefed44 Branch: refs/heads/MARMOTTA-588 Commit: adefed448a9cb1de3329f8b69b1733c1e5b38c05 Parents: 8e97ffc Author: Sergio Fernández <[email protected]> Authored: Mon Oct 12 15:40:19 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon Oct 12 15:40:19 2015 +0200 ---------------------------------------------------------------------- .../kiwi/reasoner/test/model/JustificationTest.java | 9 --------- .../kiwi/sparql/evaluation/KiWiEvaluationStrategy.java | 1 - .../apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java | 8 -------- 3 files changed, 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/adefed44/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java index f3a1cb7..c354465 100644 --- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java +++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java @@ -39,7 +39,6 @@ public class JustificationTest { protected static Random rnd = new Random(); - private KiWiTriple t1, t2, t3, t4; // base private KiWiTriple i1, i2, i3, i4; // inferred private Rule r1, r2; @@ -71,11 +70,8 @@ public class JustificationTest { i2 = new KiWiTriple(s1,p1,o2, ctx_inferred); i2.setInferred(true); i3 = new KiWiTriple(s3,p1,o3, ctx_inferred); i3.setInferred(true); i4 = new KiWiTriple(s1,p2,o1, ctx_inferred); i4.setInferred(true); - - } - @Test public void testJustificationEquals() { Justification j1 = new Justification(); @@ -107,7 +103,6 @@ public class JustificationTest { Assert.assertNotEquals(j1, j4); } - @Test public void testJustificationSet() { Set<Justification> set = new HashSet<>(); @@ -129,7 +124,6 @@ public class JustificationTest { Assert.assertEquals(1, set.size()); - // j3 differs in the inferred triple Justification j3 = new Justification(); j3.setTriple(i2); @@ -142,7 +136,6 @@ public class JustificationTest { Assert.assertEquals(2, set.size()); - // j4 differs in the supporting triples Justification j4 = new Justification(); j4.setTriple(i1); @@ -156,8 +149,6 @@ public class JustificationTest { Assert.assertEquals(3, set.size()); } - - /** * Return a random URI, with a 10% chance of returning a URI that has already been used. * @return http://git-wip-us.apache.org/repos/asf/marmotta/blob/adefed44/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java index bc9b188..6315886 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java @@ -136,7 +136,6 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{ } } - @Override public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(LeftJoin join, BindingSet bindings) throws QueryEvaluationException { if(isSupported(join)) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/adefed44/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java index 6f34750..c3a2868 100644 --- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java +++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java @@ -18,28 +18,20 @@ package org.apache.marmotta.kiwi.sparql.test; import com.google.common.base.Function; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import info.aduna.iteration.Iterations; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; -import org.apache.marmotta.commons.sesame.model.StatementCommons; -import org.apache.marmotta.commons.vocabulary.FOAF; import org.apache.marmotta.kiwi.config.KiWiConfiguration; import org.apache.marmotta.kiwi.sail.KiWiStore; -import org.apache.marmotta.kiwi.sparql.function.NativeFunctionRegistry; import org.apache.marmotta.kiwi.sparql.sail.KiWiSparqlSail; import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner; -import org.apache.marmotta.kiwi.vocabulary.FN_MARMOTTA; -import org.hamcrest.Matchers; import org.junit.*; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.junit.runner.RunWith; import org.openrdf.model.*; -import org.openrdf.model.impl.URIImpl; import org.openrdf.query.*; -import org.openrdf.query.impl.DatasetImpl; import org.openrdf.repository.Repository; import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException;
