You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/02/04 22:24:29 UTC
svn commit: r1564506 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/riot/ main/java/org/apache/jena/riot/adapters/
main/java/org/apache/jena/riot/system/ test/java/org/apache/jena/riot/
test/java/org/apache/jena/riot/jsonld/ test/java/org/apa...
Author: andy
Date: Tue Feb 4 21:24:29 2014
New Revision: 1564506
URL: http://svn.apache.org/r1564506
Log:
Include JSON-LD in the general tests.
Added:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java
- copied, changed from r1564316, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TestJsonLDReadWrite.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java
Removed:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TS_JenaJsonLD.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TestJenaSystem.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TestJsonLDReadWrite.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java Tue Feb 4 21:24:29 2014
@@ -25,7 +25,7 @@ public class RDFFormat {
/** Pretty printing variant */
public static RDFFormatVariant PRETTY = new RDFFormatVariant("pretty") ;
/**
- * Print in blocks, typically all triples with teh same subject in an
+ * Print in blocks, typically all triples with the same subject in an
* incoming triple/quad stream
*/
public static RDFFormatVariant BLOCKS = new RDFFormatVariant("blocks") ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java Tue Feb 4 21:24:29 2014
@@ -206,7 +206,7 @@ public class RDFWriterRegistry
return langToFormat.get(lang) ;
}
- /** Does the language have a registerdd output format? */
+ /** Does the language have a registered output format? */
public static boolean contains(Lang lang)
{
if ( ! langToFormat.containsKey(lang) ) return false ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/JenaReadersWriters.java Tue Feb 4 21:24:29 2014
@@ -30,7 +30,7 @@ public class JenaReadersWriters
public static class RDFReaderRIOT_RDFXML extends RDFReaderRIOT { public RDFReaderRIOT_RDFXML() { super("RDF/XML") ; } }
public static class RDFReaderRIOT_TTL extends RDFReaderRIOT { public RDFReaderRIOT_TTL() { super("TTL") ; } }
public static class RDFReaderRIOT_NT extends RDFReaderRIOT { public RDFReaderRIOT_NT() { super("N-TRIPLE") ; } }
- public static class RDFReaderRIOT_RDFJSONLD extends RDFReaderRIOT { public RDFReaderRIOT_RDFJSONLD() { super(JSONLD.getName()) ; } }
+ public static class RDFReaderRIOT_JSONLD extends RDFReaderRIOT { public RDFReaderRIOT_JSONLD() { super(JSONLD.getName()) ; } }
public static class RDFReaderRIOT_RDFJSON extends RDFReaderRIOT { public RDFReaderRIOT_RDFJSON() { super("RDF/JSON") ; } }
// Unused - we use the original RDF/XML writers directly to preserve property setting.
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IO_JenaReaders.java Tue Feb 4 21:24:29 2014
@@ -42,8 +42,8 @@ public class IO_JenaReaders
registerForModelRead("TURTLE", JenaReadersWriters.RDFReaderRIOT_TTL.class) ;
registerForModelRead("Turtle", JenaReadersWriters.RDFReaderRIOT_TTL.class) ;
registerForModelRead("TTL", JenaReadersWriters.RDFReaderRIOT_TTL.class) ;
- registerForModelRead("JSON-LD", JenaReadersWriters.RDFReaderRIOT_RDFJSONLD.class) ;
- registerForModelRead("JSONLD", JenaReadersWriters.RDFReaderRIOT_RDFJSONLD.class) ;
+ registerForModelRead("JSON-LD", JenaReadersWriters.RDFReaderRIOT_JSONLD.class) ;
+ registerForModelRead("JSONLD", JenaReadersWriters.RDFReaderRIOT_JSONLD.class) ;
registerForModelRead("RDF/JSON", JenaReadersWriters.RDFReaderRIOT_RDFJSON.class) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java Tue Feb 4 21:24:29 2014
@@ -19,7 +19,6 @@
package org.apache.jena.riot;
import org.apache.jena.riot.adapters.TS_RIOTAdapters ;
-import org.apache.jena.riot.jsonld.TS_JenaJsonLD ;
import org.apache.jena.riot.lang.TS_Lang ;
import org.apache.jena.riot.out.TS_Out ;
import org.apache.jena.riot.process.TS_Process ;
@@ -43,7 +42,6 @@ import org.junit.runners.Suite ;
, TS_RiotWriter.class
, TS_RiotSystem.class
, TS_RiotWeb.class
- , TS_JenaJsonLD.class // Needs merging with other tests
})
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java Tue Feb 4 21:24:29 2014
@@ -39,6 +39,9 @@ import org.junit.runners.Suite.SuiteClas
, TestPrefixMapExtended2.class
, TestIO_JenaReaders.class
, TestIO_JenaWriters.class
+ , TestLangRegistration.class
+ , TestFormatRegistration.class
+ , TestJsonLDReadWrite.class // Some simple testing of the jsonld-java engine.
// May be subject to performance vagaries, with the improvements made
// to the fast implementation this should be fairly safe
//, TestAbbreviationPerformance.class
Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java?rev=1564506&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestFormatRegistration.java Tue Feb 4 21:24:29 2014
@@ -0,0 +1,107 @@
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+import java.util.ArrayList ;
+import java.util.List ;
+
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.* ;
+import org.junit.Test ;
+// Test system integration / registration
+import org.junit.runner.RunWith ;
+import org.junit.runners.Parameterized ;
+import org.junit.runners.Parameterized.Parameters ;
+
+
+@RunWith(Parameterized.class)
+public class TestFormatRegistration extends BaseTest
+{
+ @Parameters(name = "{0} -- {1} {2} {3}")
+ public static Iterable<Object[]> data() {
+ List<Object[]> x = new ArrayList<Object[]>() ;
+ add("NULL", x, RDFFormat.RDFNULL, false, false) ;
+ add("RDFXML", x, RDFFormat.RDFXML, true, false) ;
+ add("RDFXML", x, RDFFormat.RDFXML_ABBREV, true, false) ;
+ add("RDFXML", x, RDFFormat.RDFXML_PLAIN, true, false) ;
+ add("RDFXML", x, RDFFormat.RDFXML_PLAIN, true, false) ;
+
+ add("NTRIPLES", x, RDFFormat.NTRIPLES, true, false) ;
+ add("NT", x, RDFFormat.NT, true, false) ;
+ add("TURTLE", x, RDFFormat.TURTLE, true, false) ;
+ add("TTL", x, RDFFormat.TTL, true, false) ;
+ add("JSONLD", x, RDFFormat.JSONLD, true, true) ;
+ add("RDFJSON", x, RDFFormat.RDFJSON, true, false) ;
+ add("NQUADS", x, RDFFormat.NQUADS, true, true) ;
+ add("NQ", x, RDFFormat.NQ, true, true) ;
+ add("TRIG", x, RDFFormat.TRIG, true, true) ;
+ return x ;
+ }
+
+ private static void add(String name, List<Object[]> x, RDFFormat format, boolean istriples, boolean isquads) {
+ x.add(new Object[] {name, format, istriples , isquads }) ;
+ }
+
+ private String name ;
+ private RDFFormat format ;
+ private boolean istriples ;
+ private boolean isquads ;
+
+ public TestFormatRegistration(String name, RDFFormat format, boolean istriples, boolean isquads) {
+ this.name = name ;
+ this.format = format ;
+ this.istriples = istriples ;
+ this.isquads = isquads ;
+ }
+
+ @Test public void jenaSystem_write_1() {
+ assertTrue(RDFWriterRegistry.contains(format)) ;
+ }
+
+ @Test public void jenaSystem_write_2() {
+ assertTrue(RDFWriterRegistry.registeredGraphFormats().contains(format)) ;
+ if ( istriples ) assertNotNull(RDFWriterRegistry.getWriterGraphFactory(format)) ;
+ if ( isquads ) assertNotNull(RDFWriterRegistry.getWriterDatasetFactory(format)) ;
+ }
+
+ @Test public void jenaSystem_write_3() {
+ if ( istriples ) assertNotNull(RDFDataMgr.createGraphWriter(format)) ;
+ if ( isquads ) assertNotNull(RDFDataMgr.createDatasetWriter(format)) ;
+}
+
+ // @Test public void jenaSystem_write_3() {
+//
+// assertEquals(jsonldFmt1, RDFWriterRegistry.defaultSerialization(JSONLD)) ;
+//
+// assertNotNull(RDFWriterRegistry.getWriterGraphFactory(jsonldFmt1)) ;
+// assertNotNull(RDFWriterRegistry.getWriterGraphFactory(jsonldFmt2)) ;
+//
+// assertTrue(RDFWriterRegistry.registeredGraphFormats().contains(jsonldFmt1)) ;
+// assertTrue(RDFWriterRegistry.registeredGraphFormats().contains(jsonldFmt2)) ;
+//
+// assertNotNull(RDFWriterRegistry.getWriterDatasetFactory(jsonldFmt1)) ;
+// assertNotNull(RDFWriterRegistry.getWriterDatasetFactory(jsonldFmt2)) ;
+//
+// assertTrue(RDFWriterRegistry.registeredDatasetFormats().contains(jsonldFmt1)) ;
+// assertTrue(RDFWriterRegistry.registeredDatasetFormats().contains(jsonldFmt2)) ;
+// }
+//
+}
+
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java Tue Feb 4 21:24:29 2014
@@ -27,6 +27,7 @@ import java.util.Properties ;
import org.apache.jena.riot.IO_Jena ;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_NT ;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFJSON ;
+import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_JSONLD ;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_RDFXML ;
import org.apache.jena.riot.adapters.JenaReadersWriters.RDFReaderRIOT_TTL ;
import org.apache.jena.riot.adapters.* ;
@@ -67,7 +68,10 @@ public class TestIO_JenaReaders {
assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("TURTLE").getClass());
assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("Turtle").getClass());
assertEquals(RDFReaderRIOT_TTL.class, readerF.getReader("TTL").getClass());
+ assertEquals(RDFReaderRIOT_JSONLD.class, readerF.getReader("JSON-LD").getClass());
+ assertEquals(RDFReaderRIOT_JSONLD.class, readerF.getReader("JSONLD").getClass());
assertEquals(RDFReaderRIOT_RDFJSON.class, readerF.getReader("RDF/JSON").getClass());
+
}
@Test
@@ -87,6 +91,7 @@ public class TestIO_JenaReaders {
}
// And unregistered our additional langs
+ assertEquals("", readerF.getLangToClassName().get("JSON-LD"));
assertEquals("", readerF.getLangToClassName().get("RDF/JSON"));
IO_JenaReaders.wireIntoJena();
}
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java (from r1564316, jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TestJsonLDReadWrite.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java&p1=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TestJsonLDReadWrite.java&r1=1564316&r2=1564506&rev=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/jsonld/TestJsonLDReadWrite.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java Tue Feb 4 21:24:29 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.jsonld;
+package org.apache.jena.riot.system;
import static org.apache.jena.riot.RDFLanguages.JSONLD ;
Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java?rev=1564506&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestLangRegistration.java Tue Feb 4 21:24:29 2014
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.system;
+
+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.junit.Test ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Parameterized ;
+import org.junit.runners.Parameterized.Parameters ;
+
+
+@RunWith(Parameterized.class)
+public class TestLangRegistration extends BaseTest
+{
+ @Parameters(name = "{0} -- {1} {2} {3}")
+ public static Iterable<Object[]> data() {
+ List<Object[]> x = new ArrayList<Object[]>() ;
+ add("NULL", x, Lang.RDFNULL, false, false) ;
+ add("RDFXML", x, Lang.RDFXML, true, false) ;
+ add("NTRIPLES", x, Lang.NTRIPLES, true, false) ;
+ add("NT", x, Lang.NT, true, false) ;
+ add("N3", x, Lang.N3, true, false) ;
+ add("TURTLE", x, Lang.TURTLE, true, false) ;
+ add("TTL", x, Lang.TTL, true, false) ;
+ add("JSONLD", x, Lang.JSONLD, true, true) ;
+ add("RDFJSON", x, Lang.RDFJSON, true, false) ;
+ add("NQUADS", x, Lang.NQUADS, false, true) ;
+ add("NQ", x, Lang.NQ, false, true) ;
+ add("TRIG", x, Lang.TRIG, false, true) ;
+ return x ;
+ }
+
+ private static void add(String name, List<Object[]> x, Lang lang, boolean istriples, boolean isquads) {
+ x.add(new Object[] {name, lang, istriples , isquads }) ;
+ }
+
+ private String name ;
+ private Lang lang ;
+ private boolean istriples ;
+ private boolean isquads ;
+
+ public TestLangRegistration(String name, Lang lang, boolean istriples, boolean isquads) {
+ this.name = name ;
+ this.lang = lang ;
+ this.istriples = istriples ;
+ this.isquads = isquads ;
+ }
+
+ @Test public void jenaSystem_read_1() {
+ assertTrue(RDFLanguages.isRegistered(lang)) ;
+ if ( istriples )
+ assertTrue(RDFLanguages.isTriples(lang)) ;
+ else
+ assertFalse(RDFLanguages.isTriples(lang)) ;
+ if (isquads )
+ assertTrue(RDFLanguages.isQuads(lang)) ;
+ else
+ assertFalse(RDFLanguages.isQuads(lang)) ;
+
+ }
+ @Test public void jenaSystem_read_2() {
+ if ( ! Lang.RDFNULL.equals(lang) )
+ assertNotNull(RDFParserRegistry.getFactory(lang)) ;
+ }
+
+ @Test public void jenaSystem_write_1() {
+ assertTrue(RDFWriterRegistry.contains(lang)) ;
+ }
+
+ @Test public void jenaSystem_write_2() {
+ if ( istriples ) assertNotNull(RDFWriterRegistry.getWriterGraphFactory(lang)) ;
+ if ( isquads ) assertNotNull(RDFWriterRegistry.getWriterDatasetFactory(lang)) ;
+ assertNotNull(RDFWriterRegistry.defaultSerialization(lang)) ;
+ }
+
+// @Test public void jenaSystem_write_3() {
+//
+// assertEquals(jsonldFmt1, RDFWriterRegistry.defaultSerialization(JSONLD)) ;
+//
+// assertNotNull(RDFWriterRegistry.getWriterGraphFactory(jsonldFmt1)) ;
+// assertNotNull(RDFWriterRegistry.getWriterGraphFactory(jsonldFmt2)) ;
+//
+// assertTrue(RDFWriterRegistry.registeredGraphFormats().contains(jsonldFmt1)) ;
+// assertTrue(RDFWriterRegistry.registeredGraphFormats().contains(jsonldFmt2)) ;
+//
+// assertNotNull(RDFWriterRegistry.getWriterDatasetFactory(jsonldFmt1)) ;
+// assertNotNull(RDFWriterRegistry.getWriterDatasetFactory(jsonldFmt2)) ;
+//
+// assertTrue(RDFWriterRegistry.registeredDatasetFormats().contains(jsonldFmt1)) ;
+// assertTrue(RDFWriterRegistry.registeredDatasetFormats().contains(jsonldFmt2)) ;
+// }
+//
+// @Test public void jenaSystem_write_4() {
+// assertNotNull(RDFDataMgr.createGraphWriter(jsonldFmt1)) ;
+// assertNotNull(RDFDataMgr.createGraphWriter(jsonldFmt2)) ;
+// assertNotNull(RDFDataMgr.createDatasetWriter(jsonldFmt1)) ;
+// assertNotNull(RDFDataMgr.createDatasetWriter(jsonldFmt2)) ;
+// }
+}
+
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java Tue Feb 4 21:24:29 2014
@@ -43,6 +43,9 @@ public class TestRiotWriterDataset exten
, { RDFFormat.TRIG_PRETTY }
, { RDFFormat.TRIG_BLOCKS }
, { RDFFormat.TRIG_FLAT }
+ , { RDFFormat.JSONLD }
+ , { RDFFormat.JSONLD_PRETTY }
+ , { RDFFormat.JSONLD_FLAT }
, { RDFFormat.NQUADS}
, { RDFFormat.NQUADS_UTF8}
, { RDFFormat.NQUADS_ASCII}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java?rev=1564506&r1=1564505&r2=1564506&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java Tue Feb 4 21:24:29 2014
@@ -50,6 +50,10 @@ public class TestRiotWriterGraph extends
, { RDFFormat.RDFXML }
, { RDFFormat.RDFXML_PRETTY }
, { RDFFormat.RDFXML_PLAIN }
+ // RDF 1.1 style -- "" and ""^^xsd:string are the same.
+// , { RDFFormat.JSONLD }
+// , { RDFFormat.JSONLD_PRETTY }
+// , { RDFFormat.JSONLD_FLAT }
, { RDFFormat.RDFJSON }
// graph in quad formats.