[07/16] jena git commit: JENA-1584: A Javacc Turtle parser for reference.

[an...@apache.org]

http://git-wip-us.apache.org/repos/asf/jena/blob/31dc8138/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
index 15b0158..aaa3771 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
@@ -18,13 +18,12 @@
 
 package org.apache.jena.riot.langsuite;
 
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.rdf.model.ModelFactory ;
+import org.apache.jena.graph.Graph;
 import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.DatasetGraphFactory;
+import org.apache.jena.sparql.graph.GraphFactory;
 import org.apache.jena.sparql.junit.EarlReport ;
 
 public class UnitTestSyntax extends LangTestCase
@@ -48,14 +47,16 @@ public class UnitTestSyntax extends LangTestCase
             run4() ;
     }
 
-    private void run3() {
-        Model model = ModelFactory.createDefaultModel() ;
-        RDFDataMgr.read(model, uri, uri, lang) ;
+    private void run3()
+    {
+        Graph graph = GraphFactory.createDefaultGraph(); 
+        Parse.parse(graph, uri, lang);
     }
     
-    private void run4() {
-        Dataset ds = DatasetFactory.createGeneral() ;
-        RDFDataMgr.read(ds, uri, uri, lang) ;
+    private void run4()
+    {
+        DatasetGraph dsg = DatasetGraphFactory.createGeneral() ;
+        Parse.parse(dsg, uri, lang);
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/31dc8138/jena-arq/testing/RIOT/Lang/Turtle2/manifest.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/Turtle2/manifest.ttl b/jena-arq/testing/RIOT/Lang/Turtle2/manifest.ttl
index 36f7ffc..dc3a679 100644
--- a/jena-arq/testing/RIOT/Lang/Turtle2/manifest.ttl
+++ b/jena-arq/testing/RIOT/Lang/Turtle2/manifest.ttl
@@ -15,7 +15,7 @@
 @prefix rdft:   <http://www.w3.org/ns/rdftest#> .
 
 <>  rdf:type mf:Manifest ;
-    rdfs:comment "Turtle tests" ;
+    rdfs:comment "Turtle tests (Additional tests)" ;
     mf:entries
     (
     <#turtle-eval-extra-01>

http://git-wip-us.apache.org/repos/asf/jena/blob/31dc8138/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl b/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
index 7632df4..cc07d8f 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
@@ -16,7 +16,7 @@
 @prefix rdft:   <http://www.w3.org/ns/rdftest#> .
 
 <>  rdf:type mf:Manifest ;
-    rdfs:comment "Turtle tests" ;
+    rdfs:comment "Turtle tests (RDF 1.1 Test Suite)" ;
     mf:entries
     (
 

http://git-wip-us.apache.org/repos/asf/jena/blob/31dc8138/jena-arq/testing/RIOT/Lang/TurtleSubm/manifest.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleSubm/manifest.ttl b/jena-arq/testing/RIOT/Lang/TurtleSubm/manifest.ttl
index 016b861..4ecacf1 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleSubm/manifest.ttl
+++ b/jena-arq/testing/RIOT/Lang/TurtleSubm/manifest.ttl
@@ -23,7 +23,7 @@
 @prefix rdft:   <http://www.w3.org/ns/rdftest#> .
 
 <>  rdf:type mf:Manifest ;
-    rdfs:comment "Turtle test cases - from the Turtle submission then cleaned up" ;
+    rdfs:comment "Turtle submission test cases, updated to Turtle RDF 1.1" ;
     mf:entries
     (
 ## Omit because the results depend on the base URI.