Updated from N-Triples tests in Mercurial

26 files changed, 263 insertions, 46 deletions

diff --git a/tests/ntriples-2013/comment_following_triple.nt b/tests/ntriples-2013/comment_following_triple.nt
new file mode 100644
index 00000000..5619459a
--- /dev/null
+++ b/tests/ntriples-2013/comment_following_triple.nt
@@ -0,0 +1,5 @@
+<http://example/s> <http://example/p> <http://example/o> . # comment
+<http://example/s> <http://example/p> _:o . # comment
+<http://example/s> <http://example/p> "o" . # comment
+<http://example/s> <http://example/p> "o"^^<http://example/dt> . # comment
+<http://example/s> <http://example/p> "o"@en . # comment
diff --git a/tests/ntriples-2013/langtagged_string.nt b/tests/ntriples-2013/langtagged_string.nt
new file mode 100644
index 00000000..1bddb04e
--- /dev/null
+++ b/tests/ntriples-2013/langtagged_string.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "chat"@en .
diff --git a/tests/ntriples-2013/lantag_with_subtag.nt b/tests/ntriples-2013/lantag_with_subtag.nt
new file mode 100644
index 00000000..629cbf42
--- /dev/null
+++ b/tests/ntriples-2013/lantag_with_subtag.nt
@@ -0,0 +1 @@
+<http://example.org/ex#a> <http://example.org/ex#b> "Cheers"@en-UK .
diff --git a/tests/ntriples-2013/literal.nt b/tests/ntriples-2013/literal.nt
new file mode 100644
index 00000000..3aba89e4
--- /dev/null
+++ b/tests/ntriples-2013/literal.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "x" .
diff --git a/tests/ntriples-2013/literal_all_controls.nt b/tests/ntriples-2013/literal_all_controls.nt
new file mode 100644
index 00000000..91c8af14
--- /dev/null
+++ b/tests/ntriples-2013/literal_all_controls.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\t\u000B\u000C\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" .
diff --git a/tests/ntriples-2013/literal_all_punctuation.nt b/tests/ntriples-2013/literal_all_punctuation.nt
new file mode 100644
index 00000000..c25d818f
--- /dev/null
+++ b/tests/ntriples-2013/literal_all_punctuation.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> " !\"#$%&():;<=>?@[]^_`{|}~" .
diff --git a/tests/ntriples-2013/literal_ascii_boundaries.nt b/tests/ntriples-2013/literal_ascii_boundaries.nt
new file mode 100644
index 00000000..7a4dc717
--- /dev/null
+++ b/tests/ntriples-2013/literal_ascii_boundaries.nt
diff --git a/tests/ntriples-2013/literal_false.nt b/tests/ntriples-2013/literal_false.nt
new file mode 100644
index 00000000..5bbbae84
--- /dev/null
+++ b/tests/ntriples-2013/literal_false.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
diff --git a/tests/ntriples-2013/literal_true.nt b/tests/ntriples-2013/literal_true.nt
new file mode 100644
index 00000000..054b229f
--- /dev/null
+++ b/tests/ntriples-2013/literal_true.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
diff --git a/tests/ntriples-2013/literal_with_2_dquotes.nt b/tests/ntriples-2013/literal_with_2_dquotes.nt
new file mode 100644
index 00000000..3e69dc10
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_2_dquotes.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "x\"\"y" .
diff --git a/tests/ntriples-2013/literal_with_2_squotes.nt b/tests/ntriples-2013/literal_with_2_squotes.nt
new file mode 100644
index 00000000..8ddc52e8
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_2_squotes.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "x''y" .
diff --git a/tests/ntriples-2013/literal_with_BACKSPACE.nt b/tests/ntriples-2013/literal_with_BACKSPACE.nt
new file mode 100644
index 00000000..339013df
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_BACKSPACE.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\b" .
diff --git a/tests/ntriples-2013/literal_with_CARRIAGE_RETURN.nt b/tests/ntriples-2013/literal_with_CARRIAGE_RETURN.nt
new file mode 100644
index 00000000..91b85c89
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_CARRIAGE_RETURN.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\r" .
diff --git a/tests/ntriples-2013/literal_with_CHARACTER_TABULATION.nt b/tests/ntriples-2013/literal_with_CHARACTER_TABULATION.nt
new file mode 100644
index 00000000..a6a9d9f0
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_CHARACTER_TABULATION.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\t" .
diff --git a/tests/ntriples-2013/literal_with_FORM_FEED.nt b/tests/ntriples-2013/literal_with_FORM_FEED.nt
new file mode 100644
index 00000000..10d2c6d7
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_FORM_FEED.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\f" .
diff --git a/tests/ntriples-2013/literal_with_LINE_FEED.nt b/tests/ntriples-2013/literal_with_LINE_FEED.nt
new file mode 100644
index 00000000..462f97ac
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_LINE_FEED.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\n" .
diff --git a/tests/ntriples-2013/literal_with_REVERSE_SOLIDUS.nt b/tests/ntriples-2013/literal_with_REVERSE_SOLIDUS.nt
new file mode 100644
index 00000000..ebc846ed
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_REVERSE_SOLIDUS.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\\" .
diff --git a/tests/ntriples-2013/literal_with_REVERSE_SOLIDUS2.nt b/tests/ntriples-2013/literal_with_REVERSE_SOLIDUS2.nt
new file mode 100644
index 00000000..586e364d
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_REVERSE_SOLIDUS2.nt
@@ -0,0 +1 @@
+<http://example.org/ns#s> <http://example.org/ns#p1> "test-\\" .
diff --git a/tests/ntriples-2013/literal_with_UTF8_boundaries.nt b/tests/ntriples-2013/literal_with_UTF8_boundaries.nt
new file mode 100644
index 00000000..0e1616db
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_UTF8_boundaries.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "€߿ࠀ࿿က쿿퀀퟿�𐀀𿿽񀀀󿿽􀀀􏿽" .
diff --git a/tests/ntriples-2013/literal_with_dquote.nt b/tests/ntriples-2013/literal_with_dquote.nt
new file mode 100644
index 00000000..05a1fd3a
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_dquote.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "x\"y" .
diff --git a/tests/ntriples-2013/literal_with_numeric_escape4.nt b/tests/ntriples-2013/literal_with_numeric_escape4.nt
new file mode 100644
index 00000000..16f0a036
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_numeric_escape4.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\u006F" .
diff --git a/tests/ntriples-2013/literal_with_numeric_escape8.nt b/tests/ntriples-2013/literal_with_numeric_escape8.nt
new file mode 100644
index 00000000..e909a79d
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_numeric_escape8.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "\U0000006F" .
diff --git a/tests/ntriples-2013/literal_with_squote.nt b/tests/ntriples-2013/literal_with_squote.nt
new file mode 100644
index 00000000..acf7f58f
--- /dev/null
+++ b/tests/ntriples-2013/literal_with_squote.nt
@@ -0,0 +1 @@
+<http://a.example/s> <http://a.example/p> "x'y" .
diff --git a/tests/ntriples-2013/manifest.ttl b/tests/ntriples-2013/manifest.ttl
index 236c7c99..f48e5a28 100644
--- a/tests/ntriples-2013/manifest.ttl
+++ b/tests/ntriples-2013/manifest.ttl
@@ -8,7 +8,7 @@
 @prefix rdft:   <http://www.w3.org/ns/rdftest#> .
 
 <>  rdf:type mf:Manifest ;
-    rdfs:comment "N-Triples tests" ;
+    mf:name "N-Triples tests" ;
     mf:entries
     (
     <#nt-syntax-file-01>
@@ -26,6 +26,7 @@
     <#nt-syntax-str-esc-03>
     <#nt-syntax-bnode-01>
     <#nt-syntax-bnode-02>
+    <#nt-syntax-bnode-03>
     <#nt-syntax-datatypes-01>
     <#nt-syntax-datatypes-02>
     <#nt-syntax-bad-uri-01>
@@ -56,274 +57,456 @@
     <#nt-syntax-bad-num-02>
     <#nt-syntax-bad-num-03>
     <#nt-syntax-subm-01>
+    <#comment_following_triple>
+    <#literal>
+    <#literal_all_controls>
+    <#literal_all_punctuation>
+    <#literal_ascii_boundaries>
+    <#literal_with_2_dquotes>
+    <#literal_with_2_squotes>
+    <#literal_with_BACKSPACE>
+    <#literal_with_CARRIAGE_RETURN>
+    <#literal_with_CHARACTER_TABULATION>
+    <#literal_with_dquote>
+    <#literal_with_FORM_FEED>
+    <#literal_with_LINE_FEED>
+    <#literal_with_numeric_escape4>
+    <#literal_with_numeric_escape8>
+    <#literal_with_REVERSE_SOLIDUS>
+    <#literal_with_REVERSE_SOLIDUS2>
+    <#literal_with_squote>
+    <#literal_with_UTF8_boundaries>
+    <#langtagged_string>
+    <#lantag_with_subtag>
+    <#minimal_whitespace>
     ) .
 
-<#nt-syntax-file-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-file-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-file-01" ;
    rdfs:comment "Empty file" ;
    mf:action    <nt-syntax-file-01.nt> ;
    .
 
-<#nt-syntax-file-02> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-file-02> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-file-02" ;
    rdfs:comment "Only comment" ;
    mf:action    <nt-syntax-file-02.nt> ;
    .
 
-<#nt-syntax-file-03> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-file-03> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-file-03" ;
    rdfs:comment "One comment, one empty line" ;
    mf:action    <nt-syntax-file-03.nt> ;
    .
 
-<#nt-syntax-uri-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-uri-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-uri-01" ;
    rdfs:comment "Only IRIs" ;
    mf:action    <nt-syntax-uri-01.nt> ;
    .
 
-<#nt-syntax-uri-02> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-uri-02> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-uri-02" ;
    rdfs:comment "IRIs with Unicode escape" ;
    mf:action    <nt-syntax-uri-02.nt> ;
    .
 
-<#nt-syntax-uri-03> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-uri-03> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-uri-03" ;
    rdfs:comment "IRIs with long Unicode escape" ;
    mf:action    <nt-syntax-uri-03.nt> ;
    .
 
-<#nt-syntax-uri-04> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-uri-04> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-uri-04" ;
    rdfs:comment "Legal IRIs" ;
    mf:action    <nt-syntax-uri-04.nt> ;
    .
 
-<#nt-syntax-string-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-string-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-string-01" ;
    rdfs:comment "string literal" ;
    mf:action    <nt-syntax-string-01.nt> ;
    .
 
-<#nt-syntax-string-02> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-string-02> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-string-02" ;
    rdfs:comment "langString literal" ;
    mf:action    <nt-syntax-string-02.nt> ;
    .
 
-<#nt-syntax-string-03> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-string-03> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-string-03" ;
    rdfs:comment "langString literal with region" ;
    mf:action    <nt-syntax-string-03.nt> ;
    .
 
-<#nt-syntax-str-esc-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-str-esc-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-str-esc-01" ;
    rdfs:comment "string literal with escaped newline" ;
    mf:action    <nt-syntax-str-esc-01.nt> ;
    .
 
-<#nt-syntax-str-esc-02> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-str-esc-02> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-str-esc-02" ;
    rdfs:comment "string literal with Unicode escape" ;
    mf:action    <nt-syntax-str-esc-02.nt> ;
    .
 
-<#nt-syntax-str-esc-03> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-str-esc-03> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-str-esc-03" ;
    rdfs:comment "string literal with long Unicode escape" ;
    mf:action    <nt-syntax-str-esc-03.nt> ;
    .
 
-<#nt-syntax-bnode-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-bnode-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-bnode-01" ;
    rdfs:comment "bnode subject" ;
    mf:action    <nt-syntax-bnode-01.nt> ;
    .
 
-<#nt-syntax-bnode-02> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-bnode-02> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-bnode-02" ;
    rdfs:comment "bnode object" ;
    mf:action    <nt-syntax-bnode-02.nt> ;
    .
 
-<#nt-syntax-datatypes-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-bnode-03> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name    "nt-syntax-bnode-03" ;
+   rdfs:comment "Blank node labels may start with a digit" ;
+   mf:action    <nt-syntax-bnode-03.nt> ;
+   .
+
+<#nt-syntax-datatypes-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-datatypes-01" ;
    rdfs:comment "xsd:byte literal" ;
    mf:action    <nt-syntax-datatypes-01.nt> ;
    .
 
-<#nt-syntax-datatypes-02> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-datatypes-02> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-datatypes-02" ;
    rdfs:comment "integer as xsd:string" ;
    mf:action    <nt-syntax-datatypes-02.nt> ;
    .
 
-<#nt-syntax-bad-uri-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-01" ;
    rdfs:comment "Bad IRI : space (negative test)" ;
    mf:action    <nt-syntax-bad-uri-01.nt> ;
    .
 
-<#nt-syntax-bad-uri-02> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-02> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-02" ;
    rdfs:comment "Bad IRI : bad escape (negative test)" ;
    mf:action    <nt-syntax-bad-uri-02.nt> ;
    .
 
-<#nt-syntax-bad-uri-03> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-03> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-03" ;
    rdfs:comment "Bad IRI : bad long escape (negative test)" ;
    mf:action    <nt-syntax-bad-uri-03.nt> ;
    .
 
-<#nt-syntax-bad-uri-04> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-04> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-04" ;
    rdfs:comment "Bad IRI : character escapes not allowed (negative test)" ;
    mf:action    <nt-syntax-bad-uri-04.nt> ;
    .
 
-<#nt-syntax-bad-uri-05> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-05> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-05" ;
    rdfs:comment "Bad IRI : character escapes not allowed (2) (negative test)" ;
    mf:action    <nt-syntax-bad-uri-05.nt> ;
    .
 
-<#nt-syntax-bad-uri-06> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-06> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-06" ;
    rdfs:comment "Bad IRI : relative IRI not allowed in subject (negative test)" ;
    mf:action    <nt-syntax-bad-uri-06.nt> ;
    .
 
-<#nt-syntax-bad-uri-07> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-07> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-07" ;
    rdfs:comment "Bad IRI : relative IRI not allowed in predicate (negative test)" ;
    mf:action    <nt-syntax-bad-uri-07.nt> ;
    .
 
-<#nt-syntax-bad-uri-08> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-08> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-08" ;
    rdfs:comment "Bad IRI : relative IRI not allowed in object (negative test)" ;
    mf:action    <nt-syntax-bad-uri-08.nt> ;
    .
 
-<#nt-syntax-bad-uri-09> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-uri-09> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-uri-09" ;
    rdfs:comment "Bad IRI : relative IRI not allowed in datatype (negative test)" ;
    mf:action    <nt-syntax-bad-uri-09.nt> ;
    .
 
-<#nt-syntax-bad-prefix-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-prefix-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-prefix-01" ;
    rdfs:comment "@prefix not allowed in n-triples (negative test)" ;
    mf:action    <nt-syntax-bad-prefix-01.nt> ;
    .
 
-<#nt-syntax-bad-base-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-base-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-base-01" ;
    rdfs:comment "@base not allowed in N-Triples (negative test)" ;
    mf:action    <nt-syntax-bad-base-01.nt> ;
    .
 
-<#nt-syntax-bad-struct-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-struct-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-struct-01" ;
    rdfs:comment "N-Triples does not have objectList (negative test)" ;
    mf:action    <nt-syntax-bad-struct-01.nt> ;
    .
 
-<#nt-syntax-bad-struct-02> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-struct-02> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-struct-02" ;
    rdfs:comment "N-Triples does not have predicateObjectList (negative test)" ;
    mf:action    <nt-syntax-bad-struct-02.nt> ;
    .
 
-<#nt-syntax-bad-lang-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-lang-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-lang-01" ;
    rdfs:comment "langString with bad lang (negative test)" ;
    mf:action    <nt-syntax-bad-lang-01.nt> ;
    .
 
-<#nt-syntax-bad-esc-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-esc-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-esc-01" ;
    rdfs:comment "Bad string escape (negative test)" ;
    mf:action    <nt-syntax-bad-esc-01.nt> ;
    .
 
-<#nt-syntax-bad-esc-02> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-esc-02> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-esc-02" ;
    rdfs:comment "Bad string escape (negative test)" ;
    mf:action    <nt-syntax-bad-esc-02.nt> ;
    .
 
-<#nt-syntax-bad-esc-03> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-esc-03> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-esc-03" ;
    rdfs:comment "Bad string escape (negative test)" ;
    mf:action    <nt-syntax-bad-esc-03.nt> ;
    .
 
-<#nt-syntax-bad-string-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-01" ;
    rdfs:comment "mismatching string literal open/close (negative test)" ;
    mf:action    <nt-syntax-bad-string-01.nt> ;
    .
 
-<#nt-syntax-bad-string-02> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-02> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-02" ;
    rdfs:comment "mismatching string literal open/close (negative test)" ;
    mf:action    <nt-syntax-bad-string-02.nt> ;
    .
 
-<#nt-syntax-bad-string-03> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-03> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-03" ;
    rdfs:comment "single quotes (negative test)" ;
    mf:action    <nt-syntax-bad-string-03.nt> ;
    .
 
-<#nt-syntax-bad-string-04> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-04> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-04" ;
    rdfs:comment "long single string literal (negative test)" ;
    mf:action    <nt-syntax-bad-string-04.nt> ;
    .
 
-<#nt-syntax-bad-string-05> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-05> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-05" ;
    rdfs:comment "long double string literal (negative test)" ;
    mf:action    <nt-syntax-bad-string-05.nt> ;
    .
 
-<#nt-syntax-bad-string-06> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-06> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-06" ;
    rdfs:comment "string literal with no end (negative test)" ;
    mf:action    <nt-syntax-bad-string-06.nt> ;
    .
 
-<#nt-syntax-bad-string-07> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-string-07> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-string-07" ;
    rdfs:comment "string literal with no start (negative test)" ;
    mf:action    <nt-syntax-bad-string-07.nt> ;
    .
 
-<#nt-syntax-bad-num-01> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-num-01> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-num-01" ;
    rdfs:comment "no numbers in N-Triples (integer) (negative test)" ;
    mf:action    <nt-syntax-bad-num-01.nt> ;
    .
 
-<#nt-syntax-bad-num-02> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-num-02> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-num-02" ;
    rdfs:comment "no numbers in N-Triples (decimal) (negative test)" ;
    mf:action    <nt-syntax-bad-num-02.nt> ;
    .
 
-<#nt-syntax-bad-num-03> rdf:type rdft:TestNTriplesNegativeSyntax, rdft:TestNQuadsNegativeSyntax ;
+<#nt-syntax-bad-num-03> rdf:type rdft:TestNTriplesNegativeSyntax ;
    mf:name    "nt-syntax-bad-num-03" ;
    rdfs:comment "no numbers in N-Triples (float) (negative test)" ;
    mf:action    <nt-syntax-bad-num-03.nt> ;
    .
 
-<#nt-syntax-subm-01> rdf:type rdft:TestNTriplesPositiveSyntax, rdft:TestNQuadsPositiveSyntax ;
+<#nt-syntax-subm-01> rdf:type rdft:TestNTriplesPositiveSyntax ;
    mf:name    "nt-syntax-subm-01" ;
    rdfs:comment "Submission test from Original RDF Test Cases" ;
    mf:action    <nt-syntax-subm-01.nt> ;
    .
+
+<#comment_following_triple> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "comment_following_triple" ;
+   rdfs:comment "Tests comments after a triple" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <comment_following_triple.nt> ;
+   .
+
+<#literal_ascii_boundaries> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_ascii_boundaries" ;
+   rdfs:comment "literal_ascii_boundaries '\\x00\\x26\\x28...'" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_ascii_boundaries.nt> ;
+   .
+
+<#literal_with_UTF8_boundaries> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_UTF8_boundaries" ;
+   rdfs:comment "literal_with_UTF8_boundaries '\\x80\\x7ff\\x800\\xfff...'" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_UTF8_boundaries.nt> ;
+   .
+
+<#literal_all_controls> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_all_controls" ;
+   rdfs:comment "literal_all_controls '\\x00\\x01\\x02\\x03\\x04...'" ;
+   rdft:approval rdft:Approved ;
+   mf:action   <literal_all_controls.nt> ;
+   .
+
+<#literal_all_punctuation> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_all_punctuation" ;
+   rdfs:comment "literal_all_punctuation '!\"#$%&()...'" ;
+   rdft:approval rdft:Approved ;
+   mf:action    <literal_all_punctuation.nt> ;
+   .
+
+<#literal_with_squote> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_squote" ;
+   rdfs:comment "literal with squote \"x'y\"" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_squote.nt> ;
+   .
+
+<#literal_with_2_squotes> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_2_squotes" ;
+   rdfs:comment "literal with 2 squotes \"x''y\"" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_2_squotes.nt> ;
+   .
+
+<#literal> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal" ;
+   rdfs:comment "literal \"\"\"x\"\"\"" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal.nt> ;
+   .
+
+<#literal_with_dquote> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_dquote" ;
+   rdfs:comment 'literal with dquote "x\"y"' ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_dquote.nt> ;
+   .
+
+<#literal_with_2_dquotes> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_2_dquotes" ;
+   rdfs:comment "literal with 2 squotes \"\"\"a\"\"b\"\"\"" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_2_dquotes.nt> ;
+   .
+
+<#literal_with_REVERSE_SOLIDUS2> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name    "literal_with_REVERSE_SOLIDUS2" ;
+   rdfs:comment "REVERSE SOLIDUS at end of literal" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_REVERSE_SOLIDUS2.nt> ;
+   .
+
+<#literal_with_CHARACTER_TABULATION> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_CHARACTER_TABULATION" ;
+   rdfs:comment "literal with CHARACTER TABULATION" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_CHARACTER_TABULATION.nt> ;
+   .
+
+<#literal_with_BACKSPACE> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_BACKSPACE" ;
+   rdfs:comment "literal with BACKSPACE" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_BACKSPACE.nt> ;
+   .
+
+<#literal_with_LINE_FEED> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_LINE_FEED" ;
+   rdfs:comment "literal with LINE FEED" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_LINE_FEED.nt> ;
+   .
+
+<#literal_with_CARRIAGE_RETURN> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_CARRIAGE_RETURN" ;
+   rdfs:comment "literal with CARRIAGE RETURN" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_CARRIAGE_RETURN.nt> ;
+   .
+
+<#literal_with_FORM_FEED> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_FORM_FEED" ;
+   rdfs:comment "literal with FORM FEED" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_FORM_FEED.nt> ;
+   .
+
+<#literal_with_REVERSE_SOLIDUS> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_REVERSE_SOLIDUS" ;
+   rdfs:comment "literal with REVERSE SOLIDUS" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_REVERSE_SOLIDUS.nt> ;
+   .
+
+<#literal_with_numeric_escape4> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_numeric_escape4" ;
+   rdfs:comment "literal with numeric escape4 \\u" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_numeric_escape4.nt> ;
+   .
+
+<#literal_with_numeric_escape8> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "literal_with_numeric_escape8" ;
+   rdfs:comment "literal with numeric escape8 \\U" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <literal_with_numeric_escape8.nt> ;
+   .
+
+<#langtagged_string> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "langtagged_string" ;
+   rdfs:comment "langtagged string \"x\"@en" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <langtagged_string.nt> ;
+   .
+
+<#lantag_with_subtag> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "lantag_with_subtag" ;
+   rdfs:comment "lantag with subtag \"x\"@en-us" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <lantag_with_subtag.nt> ;
+   .
+
+<#minimal_whitespace> rdf:type rdft:TestNTriplesPositiveSyntax ;
+   mf:name      "minimal_whitespace" ;
+   rdfs:comment "tests absense of whitespace between subject, predicate, object and end-of-statement" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <minimal_whitespace.nt> ;
+   .
diff --git a/tests/ntriples-2013/minimal_whitespace.nt b/tests/ntriples-2013/minimal_whitespace.nt
new file mode 100644
index 00000000..e9e3a801
--- /dev/null
+++ b/tests/ntriples-2013/minimal_whitespace.nt
@@ -0,0 +1,6 @@
+<http://example/s><http://example/p><http://example/o>.
+<http://example/s><http://example/p>"Alice".
+<http://example/s><http://example/p>_:o.
+_:s<http://example/p><http://example/o>.
+_:s<http://example/p>"Alice".
+_:s<http://example/p>_:bnode1.
diff --git a/tests/ntriples-2013/nt-syntax-bnode-03.nt b/tests/ntriples-2013/nt-syntax-bnode-03.nt
new file mode 100644
index 00000000..1a1f1c9f
--- /dev/null
+++ b/tests/ntriples-2013/nt-syntax-bnode-03.nt
@@ -0,0 +1,2 @@
+<http://example/s> <http://example/p> _:1a .
+_:1a  <http://example/p> <http://example/o> .