Integrate TriX and RDF/Thrift into @Parameterised test suites. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2f484b65 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2f484b65 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2f484b65
Branch: refs/heads/master Commit: 2f484b65cff9b75f89dd0e7ba8fb806c82745662 Parents: b59345d Author: Andy Seaborne <[email protected]> Authored: Mon Oct 6 08:10:13 2014 +0100 Committer: Andy Seaborne <[email protected]> Committed: Mon Oct 6 08:10:13 2014 +0100 ---------------------------------------------------------------------- .../org/apache/jena/riot/system/TestFormatRegistration.java | 3 +++ .../org/apache/jena/riot/system/TestLangRegistration.java | 7 +++---- .../org/apache/jena/riot/writer/TestRiotWriterDataset.java | 3 +++ .../java/org/apache/jena/riot/writer/TestRiotWriterGraph.java | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/2f484b65/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java index ec685ff..5c74494 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java @@ -52,6 +52,9 @@ public class TestFormatRegistration extends BaseTest add("NQUADS", x, RDFFormat.NQUADS, true, true) ; add("NQ", x, RDFFormat.NQ, true, true) ; add("TRIG", x, RDFFormat.TRIG, true, true) ; + add("TRIX", x, RDFFormat.TRIX, true, true) ; + add("TRDF", x, RDFFormat.RDF_THRIFT, true, true) ; + add("TRDF", x, RDFFormat.RDF_THRIFT_VALUES, true, true) ; return x ; } http://git-wip-us.apache.org/repos/asf/jena/blob/2f484b65/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java index f01c85b..3eb853c 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java @@ -22,10 +22,7 @@ import java.util.ArrayList ; import java.util.List ; import org.apache.jena.atlas.junit.BaseTest ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.riot.RDFParserRegistry ; -import org.apache.jena.riot.RDFWriterRegistry ; +import org.apache.jena.riot.* ; import org.junit.Test ; import org.junit.runner.RunWith ; import org.junit.runners.Parameterized ; @@ -50,6 +47,8 @@ public class TestLangRegistration extends BaseTest add("NQUADS", x, Lang.NQUADS, false, true) ; add("NQ", x, Lang.NQ, false, true) ; add("TRIG", x, Lang.TRIG, false, true) ; + add("TRIX", x, Lang.TRIX, true, true) ; + add("TRDF", x, Lang.RDFTHRIFT, true, true) ; return x ; } http://git-wip-us.apache.org/repos/asf/jena/blob/2f484b65/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java index d16743c..3e4bcff 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java @@ -50,6 +50,9 @@ public class TestRiotWriterDataset extends AbstractWriterTest , { RDFFormat.NQUADS} , { RDFFormat.NQUADS_UTF8} , { RDFFormat.NQUADS_ASCII} + , { RDFFormat.RDF_THRIFT } + , { RDFFormat.RDF_THRIFT_VALUES } + , { RDFFormat.TRIX } }) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/2f484b65/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java index dbcf214..c179f8d 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java @@ -63,6 +63,10 @@ public class TestRiotWriterGraph extends AbstractWriterTest , { RDFFormat.NQUADS_UTF8} , { RDFFormat.NQUADS_ASCII} , { RDFFormat.NQUADS} + + , { RDFFormat.RDF_THRIFT } + , { RDFFormat.RDF_THRIFT_VALUES } + , { RDFFormat.TRIX } }) ; }
