Update Turtle test suite

This suite can't be exactly copied because it has modifications to support
exact streaming tests, but this commit incorporates some upstream changes
manually.

1 files changed, 67 insertions, 21 deletions

diff --git a/test/w3c/TurtleTests/manifest.ttl b/test/w3c/TurtleTests/manifest.ttl
index 0a24655e..5a0183ab 100644
--- a/test/w3c/TurtleTests/manifest.ttl
+++ b/test/w3c/TurtleTests/manifest.ttl
@@ -16,7 +16,7 @@
 @prefix rdft:   <http://www.w3.org/ns/rdftest#> .
 
 <>  rdf:type mf:Manifest ;
-    rdfs:comment "Turtle tests" ;
+    rdfs:label "Turtle tests" ;
     mf:entries
     (
 
@@ -59,6 +59,8 @@
     <#sole_blankNodePropertyList>
     <#blankNodePropertyList_as_subject>
     <#blankNodePropertyList_as_object>
+    <#blankNodePropertyList_as_object_containing_objectList>
+    <#blankNodePropertyList_as_object_containing_objectList_of_two_objects>
     <#blankNodePropertyList_with_multiple_triples>
     <#nested_blankNodePropertyLists>
     <#blankNodePropertyList_containing_collection>
@@ -115,6 +117,7 @@
     <#lantag_with_subtag>
     <#objectList_with_two_objects>
     <#predicateObjectList_with_two_objectLists>
+    <#predicateObjectList_with_blankNodePropertyList_as_object>
     <#repeated_semis_at_end>
     <#repeated_semis_not_at_end>
 
@@ -201,11 +204,11 @@
     <#turtle-syntax-struct-03>
     <#turtle-syntax-struct-04>
     <#turtle-syntax-struct-05>
-    <#turtle-syntax-lists-01>
-    <#turtle-syntax-lists-02>
-    <#turtle-syntax-lists-03>
-    <#turtle-syntax-lists-04>
-    <#turtle-syntax-lists-05>
+    <#turtle-eval-lists-01>
+    <#turtle-eval-lists-02>
+    <#turtle-eval-lists-03>
+    <#turtle-eval-lists-04>
+    <#turtle-eval-lists-05>
     <#turtle-syntax-bad-uri-01>
     <#turtle-syntax-bad-uri-02>
     <#turtle-syntax-bad-uri-03>
@@ -219,6 +222,8 @@
     <#turtle-syntax-bad-base-01>
     <#turtle-syntax-bad-base-02>
     <#turtle-syntax-bad-base-03>
+    <#turtle-syntax-bad-bnode-01>
+    <#turtle-syntax-bad-bnode-02>
     <#turtle-syntax-bad-struct-01>
     <#turtle-syntax-bad-struct-02>
     <#turtle-syntax-bad-struct-03>
@@ -630,6 +635,22 @@
    mf:result    <blankNodePropertyList_as_object.nt> ;
    .
 
+<#blankNodePropertyList_as_object_containing_objectList> rdf:type rdft:TestTurtleEval ;
+   mf:name      "blankNodePropertyList_as_object_containing_objectList" ;
+   rdfs:comment "blankNodePropertyList as object containing objectList <s> <p> [ <p2> <o>,<o2> ] ." ;
+   rdft:approval rdft:Approved ;
+   mf:action    <blankNodePropertyList_as_object_containing_objectList.ttl> ;
+   mf:result    <blankNodePropertyList_as_object_containing_objectList.nt> ;
+   .
+
+<#blankNodePropertyList_as_object_containing_objectList_of_two_objects> rdf:type rdft:TestTurtleEval ;
+   mf:name      "blankNodePropertyList_as_object_containing_objectList_of_two_objects" ;
+   rdfs:comment "blankNodePropertyList as object containing objectList of two objects <s> <p> [ <p2 <o> ] , <o2> ." ;
+   rdft:approval rdft:Approved ;
+   mf:action    <blankNodePropertyList_as_object_containing_objectList_of_two_objects.ttl> ;
+   mf:result    <blankNodePropertyList_as_object_containing_objectList_of_two_objects.nt> ;
+   .
+
 <#blankNodePropertyList_with_multiple_triples> rdf:type rdft:TestTurtleEval ;
    mf:name      "blankNodePropertyList_with_multiple_triples" ;
    rdfs:comment "blankNodePropertyList with multiple triples [ <s> <p> ; <s2> <p2> ]" ;
@@ -1078,6 +1099,14 @@
    mf:result    <predicateObjectList_with_two_objectLists.nt> ;
    .
 
+<#predicateObjectList_with_blankNodePropertyList_as_object> rdf:type rdft:TestTurtleEval ;
+   mf:name      "predicateObjectList_with_blankNodePropertyList_as_object" ;
+   rdfs:comment "predicateObjectList_with_blankNodePropertyList_as_object <s> <p> [ <p2> <o> ] ; <p3> [ <p4> <o2> , <o3> ] " ;
+   rdft:approval rdft:Approved ;
+   mf:action    <predicateObjectList_with_blankNodePropertyList_as_object.ttl> ;
+   mf:result    <predicateObjectList_with_blankNodePropertyList_as_object.nt> ;
+   .
+
 <#repeated_semis_at_end> rdf:type rdft:TestTurtleEval ;
    mf:name      "repeated_semis_at_end" ;
    rdfs:comment "repeated semis at end <s> <p> <o> ;; <p2> <o2> ." ;
@@ -1571,39 +1600,44 @@
    mf:action    <turtle-syntax-struct-05.ttl> ;
    .
 
-<#turtle-syntax-lists-01> rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name    "turtle-syntax-lists-01" ;
+<#turtle-eval-lists-01> rdf:type rdft:TestTurtleEval ;
+   mf:name    "turtle-eval-lists-01" ;
    rdfs:comment "empty list" ;
    rdft:approval rdft:Approved ;
-   mf:action    <turtle-syntax-lists-01.ttl> ;
+   mf:action    <turtle-eval-lists-01.ttl> ;
+   mf:result    <turtle-eval-lists-01.nt> ;
    .
 
-<#turtle-syntax-lists-02> rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name    "turtle-syntax-lists-02" ;
+<#turtle-eval-lists-02> rdf:type rdft:TestTurtleEval ;
+   mf:name    "turtle-eval-lists-02" ;
    rdfs:comment "mixed list" ;
    rdft:approval rdft:Approved ;
-   mf:action    <turtle-syntax-lists-02.ttl> ;
+   mf:action    <turtle-eval-lists-02.ttl> ;
+   mf:result    <turtle-eval-lists-02.nt> ;
    .
 
-<#turtle-syntax-lists-03> rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name    "turtle-syntax-lists-03" ;
+<#turtle-eval-lists-03> rdf:type rdft:TestTurtleEval ;
+   mf:name    "turtle-eval-lists-03" ;
    rdfs:comment "isomorphic list as subject and object" ;
    rdft:approval rdft:Approved ;
-   mf:action    <turtle-syntax-lists-03.ttl> ;
+   mf:action    <turtle-eval-lists-03.ttl> ;
+   mf:result    <turtle-eval-lists-03.nt> ;
    .
 
-<#turtle-syntax-lists-04> rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name    "turtle-syntax-lists-04" ;
+<#turtle-eval-lists-04> rdf:type rdft:TestTurtleEval ;
+   mf:name    "turtle-eval-lists-04" ;
    rdfs:comment "lists of lists" ;
    rdft:approval rdft:Approved ;
-   mf:action    <turtle-syntax-lists-04.ttl> ;
+   mf:action    <turtle-eval-lists-04.ttl> ;
+   mf:result    <turtle-eval-lists-04.nt> ;
    .
 
-<#turtle-syntax-lists-05> rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name    "turtle-syntax-lists-05" ;
+<#turtle-eval-lists-05> rdf:type rdft:TestTurtleEval ;
+   mf:name    "turtle-eval-lists-05" ;
    rdfs:comment "mixed lists with embedded lists" ;
    rdft:approval rdft:Approved ;
-   mf:action    <turtle-syntax-lists-05.ttl> ;
+   mf:action    <turtle-eval-lists-05.ttl> ;
+   mf:result    <turtle-eval-lists-05.nt> ;
    .
 
 <#turtle-syntax-bad-uri-01> rdf:type rdft:TestTurtleNegativeSyntax ;
@@ -1697,6 +1731,18 @@
    mf:action    <turtle-syntax-bad-base-03.ttl> ;
    .
 
+<#turtle-syntax-bad-bnode-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
+   mf:name      "turtle-syntax-bad-bnode-01" ;
+   rdfs:comment "Colon in bnode label not allowed (negative test)" ;
+   mf:action    <turtle-syntax-bad-bnode-01.ttl> ;
+   .
+
+<#turtle-syntax-bad-bnode-02> rdf:type rdft:TestNTriplesNegativeSyntax ;
+   mf:name      "turtle-syntax-bad-bnode-02" ;
+   rdfs:comment "Colon in bnode label not allowed (negative test)" ;
+   mf:action    <turtle-syntax-bad-bnode-02.ttl> ;
+   .
+
 <#turtle-syntax-bad-struct-01> rdf:type rdft:TestTurtleNegativeSyntax ;
    mf:name    "turtle-syntax-bad-struct-01" ;
    rdfs:comment "Turtle is not TriG (negative test)" ;