formatting
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f3cf9aaf Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f3cf9aaf Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f3cf9aaf Branch: refs/heads/master Commit: f3cf9aaf74caa355f1d26f12fa410e6a0b9de5bd Parents: 9c4587b Author: Sergio Fernández <[email protected]> Authored: Tue Dec 2 13:45:59 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Tue Dec 2 13:46:09 2014 +0100 ---------------------------------------------------------------------- .../kiwi/sparql/test/KiWiSparqlJoinTest.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f3cf9aaf/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java index a888658..a854257 100644 --- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java +++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlJoinTest.java @@ -60,12 +60,12 @@ import java.util.Set; /** * Test the KiWi SPARQL Join optimization. + * * @author Sebastian Schaffert ([email protected]) */ @RunWith(KiWiDatabaseRunner.class) public class KiWiSparqlJoinTest { - private KiWiStore store; private KiWiSparqlSail ssail; @@ -83,7 +83,6 @@ public class KiWiSparqlJoinTest { dbConfig.setFulltextLanguages(new String[] {"en"}); } - @Before public void initDatabase() throws RepositoryException, IOException, RDFParseException { store = new KiWiStore(dbConfig); @@ -139,7 +138,6 @@ public class KiWiSparqlJoinTest { } }; - /** * This method tests a simple triple join with two triple patterns. * @throws Exception @@ -272,7 +270,6 @@ public class KiWiSparqlJoinTest { testQuery("query24.sparql"); } - // simple group by @Test public void testQuery25() throws Exception { @@ -285,7 +282,6 @@ public class KiWiSparqlJoinTest { testQuery("query27.sparql"); } - // simple union @Test public void testQuery26() throws Exception { @@ -298,22 +294,18 @@ public class KiWiSparqlJoinTest { testQuery("query28.sparql"); } - // union with bind and order by @Test public void testQuery29() throws Exception { testQuery("query29.sparql"); } - - // bind with order by @Test public void testQuery30() throws Exception { testQuery("query30.sparql"); } - // subquery with outer order by @Test public void testQuery31() throws Exception { @@ -344,7 +336,6 @@ public class KiWiSparqlJoinTest { testQuery("query35.sparql"); } - // MARMOTTA-552 @Test @Ignore("test skipped because of wrong evaluation in Sesame") @@ -352,14 +343,12 @@ public class KiWiSparqlJoinTest { testQuery("query36.sparql"); } - // INSERT/UPDATE @Test public void testUpdate01() throws Exception { testUpdate("update01.sparql", FOAF.name); } - // fulltext search filter @Test public void testQuery22() throws Exception { @@ -419,7 +408,6 @@ public class KiWiSparqlJoinTest { } - private void testQuery(String filename) throws Exception { String queryString = IOUtils.toString(this.getClass().getResourceAsStream(filename), "UTF-8"); @@ -515,7 +503,6 @@ public class KiWiSparqlJoinTest { } } - private void compareResults(TupleQueryResult result1, TupleQueryResult result2) throws QueryEvaluationException { List<BindingSet> bindingSets1 = Iterations.asList(result1); List<BindingSet> bindingSets2 = Iterations.asList(result2); @@ -534,7 +521,6 @@ public class KiWiSparqlJoinTest { Assert.assertTrue(CollectionUtils.isEqualCollection(set1, set2)); } - private static class BindingSetPairFunction implements Function<BindingSet, Set<Pair>> { @Override public Set<Pair> apply(BindingSet input) { @@ -589,7 +575,7 @@ public class KiWiSparqlJoinTest { public String toString() { return key + " = " + value; } - } + } }
