Remove use of DatasetLib for DatasetGraphFactory operations. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/659f777d Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/659f777d Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/659f777d
Branch: refs/heads/master Commit: 659f777da219c990f3ac13e7d99d071d4afa05a2 Parents: 1bc8142 Author: Andy Seaborne <[email protected]> Authored: Tue Sep 23 14:45:44 2014 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Sep 23 14:45:44 2014 +0100 ---------------------------------------------------------------------- .../org/apache/jena/riot/TestSyntaxDetermination.java | 2 +- .../java/org/apache/jena/riot/lang/TestLangNQuads.java | 8 +++----- .../test/java/org/apache/jena/riot/lang/TestLangTrig.java | 7 +++---- .../org/apache/jena/riot/system/TestJsonLDReadWrite.java | 10 +++++----- 4 files changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/659f777d/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java b/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java index 5b68117..446ccc9 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java @@ -92,7 +92,7 @@ public class TestSyntaxDetermination extends BaseTest { { test(url, contentType, hintLang, expected) ; } static void test(String url, String ct, Lang hint, Lang expected) { - ContentType x = WebContent.determineCT(url, ct, hint) ; + ContentType x = WebContent.determineCT(ct, hint, url) ; Lang lang = RDFDataMgr.determineLang(url, ct, hint) ; assertEquals(expected, lang) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/659f777d/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java index 60f3a6e..65b5447 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java @@ -18,10 +18,8 @@ package org.apache.jena.riot.lang; -import org.apache.jena.riot.RiotReader ; import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ; -import org.apache.jena.riot.lang.LangRIOT ; -import org.apache.jena.riot.lang.StreamRDFCounting ; +import org.apache.jena.riot.RiotReader ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; import org.apache.jena.riot.tokens.Tokenizer ; @@ -29,7 +27,7 @@ import org.junit.Test ; import com.hp.hpl.jena.graph.NodeFactory ; import com.hp.hpl.jena.sparql.core.DatasetGraph ; -import com.hp.hpl.jena.sparql.lib.DatasetLib ; +import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ; /** Test of syntax by a quads parser (does not include node validitiy checking) */ @@ -82,7 +80,7 @@ public class TestLangNQuads extends TestLangNTuples private DatasetGraph parseToDataset(String string) { - DatasetGraph dsg = DatasetLib.createDatasetGraphMem() ; + DatasetGraph dsg = DatasetGraphFactory.createMem() ; StreamRDF dest = StreamRDFLib.dataset(dsg) ; parse(dest, string) ; return dsg ; http://git-wip-us.apache.org/repos/asf/jena/blob/659f777d/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java index e737c15..914a3f3 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java @@ -21,10 +21,9 @@ package org.apache.jena.riot.lang; import org.apache.jena.atlas.junit.BaseTest ; import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.riot.ErrorHandlerTestLib ; -import org.apache.jena.riot.RiotReader ; import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ; import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ; -import org.apache.jena.riot.lang.LangTriG ; +import org.apache.jena.riot.RiotReader ; import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.riot.system.StreamRDFLib ; import org.apache.jena.riot.tokens.Tokenizer ; @@ -33,7 +32,7 @@ import org.junit.Test ; import com.hp.hpl.jena.graph.Triple ; import com.hp.hpl.jena.sparql.core.DatasetGraph ; -import com.hp.hpl.jena.sparql.lib.DatasetLib ; +import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ; import com.hp.hpl.jena.sparql.sse.SSE ; /** Test the behaviour of the RIOT reader for TriG. TriG includes checking of terms */ @@ -91,7 +90,7 @@ public class TestLangTrig extends BaseTest private static DatasetGraph parse(String... strings) { String string = StrUtils.strjoin("\n", strings) ; - DatasetGraph dsg = DatasetLib.createDatasetGraphMem() ; + DatasetGraph dsg = DatasetGraphFactory.createMem() ; StreamRDF sink = StreamRDFLib.dataset(dsg) ; Tokenizer tokenizer = TokenizerFactory.makeTokenizerString(string) ; LangTriG parser = RiotReader.createParserTriG(tokenizer, "http://base/";, sink) ; http://git-wip-us.apache.org/repos/asf/jena/blob/659f777d/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java index 777a147..14e754d 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java @@ -22,20 +22,20 @@ import static org.apache.jena.riot.RDFLanguages.JSONLD ; import java.io.ByteArrayInputStream ; import java.io.ByteArrayOutputStream ; -import java.util.Iterator; -import java.util.Map; +import java.util.Iterator ; +import java.util.Map ; import org.apache.jena.atlas.junit.BaseTest ; import org.apache.jena.riot.RDFDataMgr ; -import org.junit.Assert; +import org.junit.Assert ; import org.junit.Test ; import com.hp.hpl.jena.query.Dataset ; import com.hp.hpl.jena.query.DatasetFactory ; import com.hp.hpl.jena.rdf.model.Model ; import com.hp.hpl.jena.rdf.model.ModelFactory ; -import com.hp.hpl.jena.sparql.lib.DatasetLib ; import com.hp.hpl.jena.sparql.sse.SSE ; +import com.hp.hpl.jena.sparql.util.IsoMatcher ; /** tests : JSONLD->RDF ; JSONLD->RDF->JSONLD */ public class TestJsonLDReadWrite extends BaseTest @@ -138,7 +138,7 @@ public class TestJsonLDReadWrite extends BaseTest private static boolean isIsomorphic(Dataset ds1, Dataset ds2) { - return DatasetLib.isomorphic(ds1, ds2) ; + return IsoMatcher.isomorphic(ds1.asDatasetGraph(), ds2.asDatasetGraph()) ; } private static void checkNamespaces(Model m, Map<String, String> namespaces) {
