Restructure test suite to match new Turtle test suite.

git-svn-id: http://svn.drobilla.net/serd/trunk@412 490d8e77-9747-427b-9fa3-0b8f29cee8a0

108 files changed, 7 insertions, 169 deletions

diff --git a/tests/bad-00.ttl b/tests/bad/bad-00.ttl
index b1a1b361..b1a1b361 100644
--- a/tests/bad-00.ttl
+++ b/tests/bad/bad-00.ttl
diff --git a/tests/bad-01.ttl b/tests/bad/bad-01.ttl
index 533bc21d..533bc21d 100644
--- a/tests/bad-01.ttl
+++ b/tests/bad/bad-01.ttl
diff --git a/tests/bad-02.ttl b/tests/bad/bad-02.ttl
index fd2014d0..fd2014d0 100644
--- a/tests/bad-02.ttl
+++ b/tests/bad/bad-02.ttl
diff --git a/tests/bad-03.ttl b/tests/bad/bad-03.ttl
index 07a372f1..07a372f1 100644
--- a/tests/bad-03.ttl
+++ b/tests/bad/bad-03.ttl
diff --git a/tests/bad-04.ttl b/tests/bad/bad-04.ttl
index ee7246c8..ee7246c8 100644
--- a/tests/bad-04.ttl
+++ b/tests/bad/bad-04.ttl
diff --git a/tests/bad-05.ttl b/tests/bad/bad-05.ttl
index 387015fe..387015fe 100644
--- a/tests/bad-05.ttl
+++ b/tests/bad/bad-05.ttl
diff --git a/tests/bad-06.ttl b/tests/bad/bad-06.ttl
index a8f1a0fc..a8f1a0fc 100644
--- a/tests/bad-06.ttl
+++ b/tests/bad/bad-06.ttl
diff --git a/tests/bad-07.ttl b/tests/bad/bad-07.ttl
index 18ea4fa6..18ea4fa6 100644
--- a/tests/bad-07.ttl
+++ b/tests/bad/bad-07.ttl
diff --git a/tests/bad-08.ttl b/tests/bad/bad-08.ttl
index 07918f9a..07918f9a 100644
--- a/tests/bad-08.ttl
+++ b/tests/bad/bad-08.ttl
diff --git a/tests/bad-09.ttl b/tests/bad/bad-09.ttl
index d2d76c13..d2d76c13 100644
--- a/tests/bad-09.ttl
+++ b/tests/bad/bad-09.ttl
diff --git a/tests/bad-10.ttl b/tests/bad/bad-10.ttl
index b5ef1f55..b5ef1f55 100644
--- a/tests/bad-10.ttl
+++ b/tests/bad/bad-10.ttl
diff --git a/tests/bad-11.ttl b/tests/bad/bad-11.ttl
index 09e7b6a0..09e7b6a0 100644
--- a/tests/bad-11.ttl
+++ b/tests/bad/bad-11.ttl
diff --git a/tests/bad-12.ttl b/tests/bad/bad-12.ttl
index cef48ff8..cef48ff8 100644
--- a/tests/bad-12.ttl
+++ b/tests/bad/bad-12.ttl
diff --git a/tests/bad-13.ttl b/tests/bad/bad-13.ttl
index 91accf2b..91accf2b 100644
--- a/tests/bad-13.ttl
+++ b/tests/bad/bad-13.ttl
diff --git a/tests/bad-14.ttl b/tests/bad/bad-14.ttl
index f4a7acf5..f4a7acf5 100644
--- a/tests/bad-14.ttl
+++ b/tests/bad/bad-14.ttl
diff --git a/tests/bad-base.ttl b/tests/bad/bad-base.ttl
index 85421999..85421999 100644
--- a/tests/bad-base.ttl
+++ b/tests/bad/bad-base.ttl
diff --git a/tests/bad-blank.ttl b/tests/bad/bad-blank.ttl
index a6543f2d..a6543f2d 100644
--- a/tests/bad-blank.ttl
+++ b/tests/bad/bad-blank.ttl
diff --git a/tests/bad-datatype.ttl b/tests/bad/bad-datatype.ttl
index 0dd6018f..0dd6018f 100644
--- a/tests/bad-datatype.ttl
+++ b/tests/bad/bad-datatype.ttl
diff --git a/tests/bad-eof-in-blank.ttl b/tests/bad/bad-eof-in-blank.ttl
index 08c13ae9..08c13ae9 100644
--- a/tests/bad-eof-in-blank.ttl
+++ b/tests/bad/bad-eof-in-blank.ttl
diff --git a/tests/bad-eof-in-escape.ttl b/tests/bad/bad-eof-in-escape.ttl
index d3af9c93..d3af9c93 100644
--- a/tests/bad-eof-in-escape.ttl
+++ b/tests/bad/bad-eof-in-escape.ttl
diff --git a/tests/bad-eof-in-lang-suffix.ttl b/tests/bad/bad-eof-in-lang-suffix.ttl
index 8e3002cb..8e3002cb 100644
--- a/tests/bad-eof-in-lang-suffix.ttl
+++ b/tests/bad/bad-eof-in-lang-suffix.ttl
diff --git a/tests/bad-eof-in-lang.ttl b/tests/bad/bad-eof-in-lang.ttl
index 54db417f..54db417f 100644
--- a/tests/bad-eof-in-lang.ttl
+++ b/tests/bad/bad-eof-in-lang.ttl
diff --git a/tests/bad-eof-in-list.ttl b/tests/bad/bad-eof-in-list.ttl
index ca6c352f..ca6c352f 100644
--- a/tests/bad-eof-in-list.ttl
+++ b/tests/bad/bad-eof-in-list.ttl
diff --git a/tests/bad-eof-in-object-list.ttl b/tests/bad/bad-eof-in-object-list.ttl
index 9bbcd17a..9bbcd17a 100644
--- a/tests/bad-eof-in-object-list.ttl
+++ b/tests/bad/bad-eof-in-object-list.ttl
diff --git a/tests/bad-eof-in-object-list2.ttl b/tests/bad/bad-eof-in-object-list2.ttl
index 9186fb9f..9186fb9f 100644
--- a/tests/bad-eof-in-object-list2.ttl
+++ b/tests/bad/bad-eof-in-object-list2.ttl
diff --git a/tests/bad-eof-in-predicate-list.ttl b/tests/bad/bad-eof-in-predicate-list.ttl
index eab5b05b..eab5b05b 100644
--- a/tests/bad-eof-in-predicate-list.ttl
+++ b/tests/bad/bad-eof-in-predicate-list.ttl
diff --git a/tests/bad-eof-in-string.ttl b/tests/bad/bad-eof-in-string.ttl
index d3a1aa55..d3a1aa55 100644
--- a/tests/bad-eof-in-string.ttl
+++ b/tests/bad/bad-eof-in-string.ttl
diff --git a/tests/bad-eof-in-triple-quote.ttl b/tests/bad/bad-eof-in-triple-quote.ttl
index d60acd15..d60acd15 100644
--- a/tests/bad-eof-in-triple-quote.ttl
+++ b/tests/bad/bad-eof-in-triple-quote.ttl
diff --git a/tests/bad-eof-in-uri.ttl b/tests/bad/bad-eof-in-uri.ttl
index 9bd2a64d..9bd2a64d 100644
--- a/tests/bad-eof-in-uri.ttl
+++ b/tests/bad/bad-eof-in-uri.ttl
diff --git a/tests/bad-escape.ttl b/tests/bad/bad-escape.ttl
index c03f395f..c03f395f 100644
--- a/tests/bad-escape.ttl
+++ b/tests/bad/bad-escape.ttl
diff --git a/tests/bad-hex-digit.ttl b/tests/bad/bad-hex-digit.ttl
index 85816ced..85816ced 100644
--- a/tests/bad-hex-digit.ttl
+++ b/tests/bad/bad-hex-digit.ttl
diff --git a/tests/bad-id-clash.ttl b/tests/bad/bad-id-clash.ttl
index 55ab23e3..55ab23e3 100644
--- a/tests/bad-id-clash.ttl
+++ b/tests/bad/bad-id-clash.ttl
diff --git a/tests/bad-lang.ttl b/tests/bad/bad-lang.ttl
index 01e04328..01e04328 100644
--- a/tests/bad-lang.ttl
+++ b/tests/bad/bad-lang.ttl
diff --git a/tests/bad-list.ttl b/tests/bad/bad-list.ttl
index 5606658e..5606658e 100644
--- a/tests/bad-list.ttl
+++ b/tests/bad/bad-list.ttl
diff --git a/tests/bad-list2.ttl b/tests/bad/bad-list2.ttl
index b5242de2..b5242de2 100644
--- a/tests/bad-list2.ttl
+++ b/tests/bad/bad-list2.ttl
diff --git a/tests/bad-namespace.ttl b/tests/bad/bad-namespace.ttl
index 0dd78d33..0dd78d33 100644
--- a/tests/bad-namespace.ttl
+++ b/tests/bad/bad-namespace.ttl
diff --git a/tests/bad-ns.ttl b/tests/bad/bad-ns.ttl
index 4410573e..4410573e 100644
--- a/tests/bad-ns.ttl
+++ b/tests/bad/bad-ns.ttl
diff --git a/tests/bad-num.ttl b/tests/bad/bad-num.ttl
index 7685f0e0..7685f0e0 100644
--- a/tests/bad-num.ttl
+++ b/tests/bad/bad-num.ttl
diff --git a/tests/bad-object.ttl b/tests/bad/bad-object.ttl
index 9fc6da18..9fc6da18 100644
--- a/tests/bad-object.ttl
+++ b/tests/bad/bad-object.ttl
diff --git a/tests/bad-object2.ttl b/tests/bad/bad-object2.ttl
index 9293d168..9293d168 100644
--- a/tests/bad-object2.ttl
+++ b/tests/bad/bad-object2.ttl
diff --git a/tests/bad-prefix.ttl b/tests/bad/bad-prefix.ttl
index 6c286355..6c286355 100644
--- a/tests/bad-prefix.ttl
+++ b/tests/bad/bad-prefix.ttl
diff --git a/tests/bad-string.ttl b/tests/bad/bad-string.ttl
index 0bdea42c..0bdea42c 100644
--- a/tests/bad-string.ttl
+++ b/tests/bad/bad-string.ttl
diff --git a/tests/bad-uri-escape.ttl b/tests/bad/bad-uri-escape.ttl
index 16c63754..16c63754 100644
--- a/tests/bad-uri-escape.ttl
+++ b/tests/bad/bad-uri-escape.ttl
diff --git a/tests/bad-verb.ttl b/tests/bad/bad-verb.ttl
index 56a134f3..56a134f3 100644
--- a/tests/bad-verb.ttl
+++ b/tests/bad/bad-verb.ttl
diff --git a/tests/base.nt b/tests/base.nt
new file mode 100644
index 00000000..abfc02b5
--- /dev/null
+++ b/tests/base.nt
@@ -0,0 +1 @@
+<http://www.w3.org/2001/sw/DataAccess/df1/tests/foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2001/sw/DataAccess/df1/tests/Bar> .
diff --git a/tests/base.out b/tests/base.out
deleted file mode 100644
index 18717b81..00000000
--- a/tests/base.out
+++ /dev/null
@@ -1 +0,0 @@
-<foo> a <Bar> .
\ No newline at end of file
diff --git a/tests/manifest-bad.ttl b/tests/manifest-bad.ttl
deleted file mode 100644
index e8c5ba8f..00000000
--- a/tests/manifest-bad.ttl
+++ /dev/null
@@ -1,88 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:comment "Turtle bad syntax test cases (must fail)" ;
-    mf:entries
-    (
-
-     [  mf:name      "bad-00" ;
-        rdfs:comment "prefix name must end in a :" ;
-        mf:action [ qt:data   <bad-00.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-01" ;
-        rdfs:comment "blank predicate forbidden" ;
-        mf:action [ qt:data   <bad-01.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-02" ;
-        rdfs:comment "blank predicate forbidden" ;
-        mf:action [ qt:data   <bad-02.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-03" ;
-        rdfs:comment "a forbidden as subject" ;
-        mf:action [ qt:data   <bad-03.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-04" ;
-        rdfs:comment ", not allowed in collections" ;
-        mf:action [ qt:data   <bad-04.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-05" ;
-        rdfs:comment "{} not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-05.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-06" ;
-        rdfs:comment "is and of not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-06.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-07" ;
-        rdfs:comment "paths not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-07.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-08" ;
-        rdfs:comment "@keywords not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-08.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-09" ;
-        rdfs:comment "=> not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-09.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-10" ;
-        rdfs:comment "= not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-10.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-11" ;
-        rdfs:comment "@forAll not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-11.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-12" ;
-        rdfs:comment "@forSome not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-12.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-13" ;
-        rdfs:comment "<= not allowed in Turtle" ;
-        mf:action [ qt:data   <bad-13.ttl> ] ;
-     ]
-
-     [  mf:name      "bad-14" ;
-        rdfs:comment "long literal with missing end" ;
-        mf:action [ qt:data   <bad-14.ttl> ] ;
-     ]
-
-
-    # End of tests
-   ).
diff --git a/tests/rdf-schema.out b/tests/rdf-schema.nt
index 94e14045..94e14045 100644
--- a/tests/rdf-schema.out
+++ b/tests/rdf-schema.nt
diff --git a/tests/rdfq-results.out b/tests/rdfq-results.out
deleted file mode 100644
index fb254293..00000000
--- a/tests/rdfq-results.out
+++ /dev/null
@@ -1,36 +0,0 @@
-_:genid1 <http://jena.hpl.hp.com/2003/03/result-set#variable> "x" .
-_:genid1 <http://jena.hpl.hp.com/2003/03/result-set#value> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
-_:genid2 <http://jena.hpl.hp.com/2003/03/result-set#variable> "y" .
-_:genid2 <http://jena.hpl.hp.com/2003/03/result-set#value> <http://example.com/resource1> .
-_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://jena.hpl.hp.com/2003/03/result-set#ResultSolution> .
-_:genid3 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid1 .
-_:genid3 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid2 .
-_:genid4 <http://jena.hpl.hp.com/2003/03/result-set#variable> "x" .
-_:genid4 <http://jena.hpl.hp.com/2003/03/result-set#value> "2003-01-21" .
-_:genid5 <http://jena.hpl.hp.com/2003/03/result-set#variable> "y" .
-_:genid5 <http://jena.hpl.hp.com/2003/03/result-set#value> <http://example.com/resource2> .
-_:genid6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://jena.hpl.hp.com/2003/03/result-set#ResultSolution> .
-_:genid6 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid4 .
-_:genid6 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid5 .
-_:genid7 <http://jena.hpl.hp.com/2003/03/result-set#variable> "x" .
-_:genid7 <http://jena.hpl.hp.com/2003/03/result-set#value> "anon1" .
-_:genid8 <http://jena.hpl.hp.com/2003/03/result-set#variable> "y" .
-_:genid8 <http://jena.hpl.hp.com/2003/03/result-set#value> _:a .
-_:genid9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://jena.hpl.hp.com/2003/03/result-set#ResultSolution> .
-_:genid9 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid7 .
-_:genid9 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid8 .
-_:genid10 <http://jena.hpl.hp.com/2003/03/result-set#variable> "x" .
-_:genid10 <http://jena.hpl.hp.com/2003/03/result-set#value> "anon2" .
-_:genid11 <http://jena.hpl.hp.com/2003/03/result-set#variable> "y" .
-_:genid11 <http://jena.hpl.hp.com/2003/03/result-set#value> _:a .
-_:genid12 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://jena.hpl.hp.com/2003/03/result-set#ResultSolution> .
-_:genid12 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid10 .
-_:genid12 <http://jena.hpl.hp.com/2003/03/result-set#binding> _:genid11 .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://jena.hpl.hp.com/2003/03/result-set#ResultSet> .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#size> "4"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#resultVariable> "x" .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#resultVariable> "y" .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#solution> _:genid3 .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#solution> _:genid6 .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#solution> _:genid9 .
-<http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl> <http://jena.hpl.hp.com/2003/03/result-set#solution> _:genid12 .
diff --git a/tests/rdfq-results.ttl b/tests/rdfq-results.ttl
deleted file mode 100644
index c6e72aa7..00000000
--- a/tests/rdfq-results.ttl
+++ /dev/null
@@ -1,39 +0,0 @@
-# from http://www.w3.org/2003/03/rdfqr-tests/recording-query-results.html
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://jena.hpl.hp.com/2003/03/result-set#> .
-
-
-<>  rdf:type rs:ResultSet ;
-    rs:size 4 ;
-    rs:resultVariable "x" ; rs:resultVariable "y" ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ;
-          rs:binding [ rs:variable "x" ; rs:value 123 ] ;
-          rs:binding [ rs:variable "y" ; rs:value <http://example.com/resource1> ]
-        ] ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ;
-          rs:binding [ rs:variable "x" ;
-                      rs:value "2003-01-21" ] ;
-          rs:binding [ rs:variable "y" ;
-                      rs:value <http://example.com/resource2> ]
-        ] ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ;
-          rs:binding [ rs:variable "x" ;
-                      rs:value "anon1" ] ;
-          rs:binding [ rs:variable "y" ;
-                      rs:value _:a ]
-        ] ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ;
-          rs:binding [ rs:variable "x" ;
-                      rs:value "anon2" ] ;
-          rs:binding [ rs:variable "y" ;
-                      rs:value _:a ]
-        ] ;
-    .
diff --git a/tests/rdfs-namespace.out b/tests/rdfs-namespace.nt
index 4696f8cf..4696f8cf 100644
--- a/tests/rdfs-namespace.out
+++ b/tests/rdfs-namespace.nt
diff --git a/tests/test-00.out b/tests/test-00.nt
index 7f8b717e..7f8b717e 100644
--- a/tests/test-00.out
+++ b/tests/test-00.nt
diff --git a/tests/test-01.out b/tests/test-01.nt
index 5ccb5bd2..5ccb5bd2 100644
--- a/tests/test-01.out
+++ b/tests/test-01.nt
diff --git a/tests/test-02.out b/tests/test-02.nt
index 99732ab3..99732ab3 100644
--- a/tests/test-02.out
+++ b/tests/test-02.nt
diff --git a/tests/test-03.out b/tests/test-03.nt
index d6ce9e8f..d6ce9e8f 100644
--- a/tests/test-03.out
+++ b/tests/test-03.nt
diff --git a/tests/test-04.out b/tests/test-04.nt
index 414e4b84..414e4b84 100644
--- a/tests/test-04.out
+++ b/tests/test-04.nt
diff --git a/tests/test-05.out b/tests/test-05.nt
index bf904178..bf904178 100644
--- a/tests/test-05.out
+++ b/tests/test-05.nt
diff --git a/tests/test-06.out b/tests/test-06.nt
index 49961ea6..49961ea6 100644
--- a/tests/test-06.out
+++ b/tests/test-06.nt
diff --git a/tests/test-07.out b/tests/test-07.nt
index e17cc7be..e17cc7be 100644
--- a/tests/test-07.out
+++ b/tests/test-07.nt
diff --git a/tests/test-08.out b/tests/test-08.nt
index a77939cd..a77939cd 100644
--- a/tests/test-08.out
+++ b/tests/test-08.nt
diff --git a/tests/test-09.out b/tests/test-09.nt
index 5fdb9099..5fdb9099 100644
--- a/tests/test-09.out
+++ b/tests/test-09.nt
diff --git a/tests/test-10.out b/tests/test-10.nt
index ff88aa6f..ff88aa6f 100644
--- a/tests/test-10.out
+++ b/tests/test-10.nt
diff --git a/tests/test-11.out b/tests/test-11.nt
index f936a5b6..f936a5b6 100644
--- a/tests/test-11.out
+++ b/tests/test-11.nt
diff --git a/tests/test-12.out b/tests/test-12.nt
index 67404a59..67404a59 100644
--- a/tests/test-12.out
+++ b/tests/test-12.nt
diff --git a/tests/test-13.out b/tests/test-13.nt
index 9feb5ad0..9feb5ad0 100644
--- a/tests/test-13.out
+++ b/tests/test-13.nt
diff --git a/tests/test-14.out b/tests/test-14.nt
index 791b3a7a..791b3a7a 100644
--- a/tests/test-14.out
+++ b/tests/test-14.nt
diff --git a/tests/test-15.out b/tests/test-15.nt
index c0604b3b..c0604b3b 100644
--- a/tests/test-15.out
+++ b/tests/test-15.nt
diff --git a/tests/test-16.out b/tests/test-16.nt
index c0604b3b..c0604b3b 100644
--- a/tests/test-16.out
+++ b/tests/test-16.nt
diff --git a/tests/test-17.out b/tests/test-17.nt
index 466edbb2..466edbb2 100644
--- a/tests/test-17.out
+++ b/tests/test-17.nt
diff --git a/tests/test-18.out b/tests/test-18.nt
index 4ff4b95b..4ff4b95b 100644
--- a/tests/test-18.out
+++ b/tests/test-18.nt
diff --git a/tests/test-19.out b/tests/test-19.nt
index 2e2dbe40..2e2dbe40 100644
--- a/tests/test-19.out
+++ b/tests/test-19.nt
diff --git a/tests/test-20.out b/tests/test-20.nt
index fff2da56..fff2da56 100644
--- a/tests/test-20.out
+++ b/tests/test-20.nt
diff --git a/tests/test-21.out b/tests/test-21.nt
index d5dca690..d5dca690 100644
--- a/tests/test-21.out
+++ b/tests/test-21.nt
diff --git a/tests/test-22.out b/tests/test-22.nt
index 3d0f970e..3d0f970e 100644
--- a/tests/test-22.out
+++ b/tests/test-22.nt
diff --git a/tests/test-23.out b/tests/test-23.nt
index fde31312..fde31312 100644
--- a/tests/test-23.out
+++ b/tests/test-23.nt
diff --git a/tests/test-24.out b/tests/test-24.nt
index 5a70bff1..5a70bff1 100644
--- a/tests/test-24.out
+++ b/tests/test-24.nt
diff --git a/tests/test-25.out b/tests/test-25.nt
index 1a38415f..1a38415f 100644
--- a/tests/test-25.out
+++ b/tests/test-25.nt
diff --git a/tests/test-26.out b/tests/test-26.nt
index ad105cf4..ad105cf4 100644
--- a/tests/test-26.out
+++ b/tests/test-26.nt
diff --git a/tests/test-27.out b/tests/test-27.nt
index 7da0635b..7da0635b 100644
--- a/tests/test-27.out
+++ b/tests/test-27.nt
diff --git a/tests/test-29.out b/tests/test-29.nt
index 612052d3..612052d3 100644
--- a/tests/test-29.out
+++ b/tests/test-29.nt
diff --git a/tests/test-30.out b/tests/test-30.nt
index ce5c67d0..ce5c67d0 100644
--- a/tests/test-30.out
+++ b/tests/test-30.nt
diff --git a/tests/test-backspace.out b/tests/test-backspace.nt
index ad4806cf..ad4806cf 100644
--- a/tests/test-backspace.out
+++ b/tests/test-backspace.nt
diff --git a/tests/test-bad-utf8.out b/tests/test-bad-utf8.nt
index 6d73993d..6d73993d 100644
--- a/tests/test-bad-utf8.out
+++ b/tests/test-bad-utf8.nt
diff --git a/tests/test-base-query.out b/tests/test-base-query.nt
index d40c2f6b..d40c2f6b 100644
--- a/tests/test-base-query.out
+++ b/tests/test-base-query.nt
diff --git a/tests/test-blank-cont.out b/tests/test-blank-cont.nt
index d64e3e46..d64e3e46 100644
--- a/tests/test-blank-cont.out
+++ b/tests/test-blank-cont.nt
diff --git a/tests/test-blank-in-list.out b/tests/test-blank-in-list.nt
index 2e0c0eb0..2e0c0eb0 100644
--- a/tests/test-blank-in-list.out
+++ b/tests/test-blank-in-list.nt
diff --git a/tests/test-bom.out b/tests/test-bom.nt
index aea1655b..aea1655b 100644
--- a/tests/test-bom.out
+++ b/tests/test-bom.nt
diff --git a/tests/test-cr.out b/tests/test-cr.nt
index aea1655b..aea1655b 100644
--- a/tests/test-cr.out
+++ b/tests/test-cr.nt
diff --git a/tests/test-delete.out b/tests/test-delete.nt
index 41ac8062..41ac8062 100644
--- a/tests/test-delete.out
+++ b/tests/test-delete.nt
diff --git a/tests/test-digit-start-pname.out b/tests/test-digit-start-pname.nt
index 66eab7db..66eab7db 100644
--- a/tests/test-digit-start-pname.out
+++ b/tests/test-digit-start-pname.nt
diff --git a/tests/test-eof-at-page-end.out b/tests/test-eof-at-page-end.nt
index 64d24586..64d24586 100644
--- a/tests/test-eof-at-page-end.out
+++ b/tests/test-eof-at-page-end.nt
diff --git a/tests/test-escapes.out b/tests/test-escapes.nt
index 725b832c..725b832c 100644
--- a/tests/test-escapes.out
+++ b/tests/test-escapes.nt
diff --git a/tests/test-id.out b/tests/test-id.nt
index 722fc6d1..722fc6d1 100644
--- a/tests/test-id.out
+++ b/tests/test-id.nt
diff --git a/tests/test-lang.out b/tests/test-lang.nt
index 61daecb3..61daecb3 100644
--- a/tests/test-lang.out
+++ b/tests/test-lang.nt
diff --git a/tests/test-list-in-blank.out b/tests/test-list-in-blank.nt
index 76023a8b..76023a8b 100644
--- a/tests/test-list-in-blank.out
+++ b/tests/test-list-in-blank.nt
diff --git a/tests/test-list-subject.out b/tests/test-list-subject.nt
index 9a853774..9a853774 100644
--- a/tests/test-list-subject.out
+++ b/tests/test-list-subject.nt
diff --git a/tests/test-list.out b/tests/test-list.nt
index 3a27a5a6..3a27a5a6 100644
--- a/tests/test-list.out
+++ b/tests/test-list.nt
diff --git a/tests/test-long-string.out b/tests/test-long-string.nt
index ba6be49c..ba6be49c 100644
--- a/tests/test-long-string.out
+++ b/tests/test-long-string.nt
diff --git a/tests/test-no-spaces.out b/tests/test-no-spaces.nt
index 3619a5f0..3619a5f0 100644
--- a/tests/test-no-spaces.out
+++ b/tests/test-no-spaces.nt
diff --git a/tests/test-num.out b/tests/test-num.nt
index 54263d46..54263d46 100644
--- a/tests/test-num.out
+++ b/tests/test-num.nt
diff --git a/tests/test-out-of-range-unicode.out b/tests/test-out-of-range-unicode.nt
index 5def9e31..5def9e31 100644
--- a/tests/test-out-of-range-unicode.out
+++ b/tests/test-out-of-range-unicode.nt
diff --git a/tests/test-prefix.out b/tests/test-prefix.nt
index bcfdd4b6..bcfdd4b6 100644
--- a/tests/test-prefix.out
+++ b/tests/test-prefix.nt
diff --git a/tests/test-pretty.out b/tests/test-pretty.nt
index c61f7c22..c61f7c22 100644
--- a/tests/test-pretty.out
+++ b/tests/test-pretty.nt
diff --git a/tests/test-rel.out b/tests/test-rel.nt
index 01c18c2f..01c18c2f 100644
--- a/tests/test-rel.out
+++ b/tests/test-rel.nt
diff --git a/tests/test-semi-dot.out b/tests/test-semi-dot.nt
index aea1655b..aea1655b 100644
--- a/tests/test-semi-dot.out
+++ b/tests/test-semi-dot.nt
diff --git a/tests/test-uri.out b/tests/test-uri.nt
index 6c56f594..6c56f594 100644
--- a/tests/test-uri.out
+++ b/tests/test-uri.nt
diff --git a/tests/test-utf8-uri.out b/tests/test-utf8-uri.nt
index b8a73a88..b8a73a88 100644
--- a/tests/test-utf8-uri.out
+++ b/tests/test-utf8-uri.nt
diff --git a/wscript b/wscript
index 71b85c76..a0b5f532 100644
--- a/wscript
+++ b/wscript
@@ -267,7 +267,7 @@ def file_equals(patha, pathb, subst_from='', subst_to=''):
 def test(ctx):
     blddir = autowaf.build_dir(APPNAME, 'tests')
     try:
-        os.makedirs(blddir)
+        os.makedirs(os.path.join(blddir, 'bad'))
     except:
         pass
 
@@ -279,10 +279,11 @@ def test(ctx):
 
     os.chdir(srcdir)
 
-    good_tests = glob.glob('tests/test-*.ttl')
+    good_tests = glob.glob('tests/*.ttl')
     good_tests.sort()
+    good_tests.remove('tests/manifest.ttl')
 
-    bad_tests = glob.glob('tests/bad-*.ttl')
+    bad_tests = glob.glob('tests/bad/*.ttl')
     bad_tests.sort()
 
     os.chdir(orig_dir)
@@ -339,7 +340,7 @@ def test(ctx):
         out_filename = test + '.out'
         if not os.access(out_filename, os.F_OK):
             Logs.pprint('RED', 'FAIL: %s output is missing' % test)
-        elif not file_equals(srcdir + '/' + test.replace('.ttl', '.out'),
+        elif not file_equals(srcdir + '/' + test.replace('.ttl', '.nt'),
                              test + '.out'):
             Logs.pprint('RED', 'FAIL: %s is incorrect' % out_filename)
         else:
@@ -381,7 +382,7 @@ def test(ctx):
         out_filename = test + '.thru'
         if not os.access(out_filename, os.F_OK):
             Logs.pprint('RED', 'FAIL: %s output is missing' % test)
-        elif not file_equals(srcdir + '/' + test.replace('.ttl', '.out'),
+        elif not file_equals(srcdir + '/' + test.replace('.ttl', '.nt'),
                              test + '.thru',
                              '_:docid', '_:genid'):
             Logs.pprint('RED', 'FAIL: %s is incorrect' % out_filename)