Fix lax handling of string errors and add separate lax test suite

7 files changed, 41 insertions, 10 deletions

diff --git a/tests/good/manifest.ttl b/tests/good/manifest.ttl
index dd83a7e5..9dccde7b 100644
--- a/tests/good/manifest.ttl
+++ b/tests/good/manifest.ttl
@@ -18,7 +18,6 @@
 		<#test-30>
 		<#test-a-without-whitespace>
 		<#test-backspace>
-		<#test-bad-utf8>
 		<#test-base-query>
 		<#test-blank-cont>
 		<#test-blank-in-list>
@@ -109,12 +108,6 @@
 	mf:action <test-backspace.ttl> ;
 	mf:result <test-backspace.nt> .
 
-<#test-bad-utf8>
-	rdf:type rdft:TestTurtleEval ;
-	mf:name "test-bad-utf8" ;
-	mf:action <test-bad-utf8.ttl> ;
-	mf:result <test-bad-utf8.nt> .
-
 <#test-base-query>
 	rdf:type rdft:TestTurtleEval ;
 	mf:name "test-base-query" ;
diff --git a/tests/good/test-bad-utf8.ttl b/tests/good/test-bad-utf8.ttl
deleted file mode 100644
index 2c105f5b..00000000
--- a/tests/good/test-bad-utf8.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example.org/thing> <http://example.org/comment> "Impossible bytes: þ ÿ" .
-<http://example.org/thing> <http://example.org/comment> "2 continuation bytes: €¿" .
-<http://example.org/thing> <http://example.org/comment> "Missing continuation: À" .
diff --git a/tests/lax/manifest.ttl b/tests/lax/manifest.ttl
new file mode 100644
index 00000000..e3b11ff4
--- /dev/null
+++ b/tests/lax/manifest.ttl
@@ -0,0 +1,25 @@
+@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix rdft: <http://www.w3.org/ns/rdftest#> .
+
+<>
+	rdf:type mf:Manifest ;
+	rdfs:comment "Serd lax syntax test cases" ;
+	mf:entries (
+		<#test-bad-uri>
+		<#test-bad-utf8>
+	) .
+
+<#test-bad-uri>
+	rdf:type rdft:TestTurtleNegativeSyntax ;
+	mf:name "test-bad-uri" ;
+	mf:action <test-bad-uri.ttl> ;
+	mf:result <test-bad-uri.nt> .
+
+<#test-bad-utf8>
+	rdf:type rdft:TestTurtleNegativeSyntax ;
+	mf:name "test-bad-utf8" ;
+	mf:action <test-bad-utf8.ttl> ;
+	mf:result <test-bad-utf8.nt> .
+
diff --git a/tests/lax/test-bad-uri.nt b/tests/lax/test-bad-uri.nt
new file mode 100644
index 00000000..7458e12a
--- /dev/null
+++ b/tests/lax/test-bad-uri.nt
@@ -0,0 +1,3 @@
+<http://example.org/s> <http://example.org/p> <http://example.org/goodo1> .
+<http://example.org/s> <http://example.org/p> <http://example.org/\uFFFDbado2> .
+<http://example.org/s> <http://example.org/p> <http://example.org/goodo2> .
diff --git a/tests/lax/test-bad-uri.ttl b/tests/lax/test-bad-uri.ttl
new file mode 100644
index 00000000..8f11b1d7
--- /dev/null
+++ b/tests/lax/test-bad-uri.ttl
@@ -0,0 +1,4 @@
+<http://example.org/s> <http://example.org/p> <http://example.org/	bado1> .
+<http://example.org/s> <http://example.org/p> <http://example.org/goodo1> .
+<http://example.org/s> <http://example.org/p> <http://example.org/ÿÿbado2> .
+<http://example.org/s> <http://example.org/p> <http://example.org/goodo2> .
diff --git a/tests/good/test-bad-utf8.nt b/tests/lax/test-bad-utf8.nt
index 6d73993d..09200e9d 100644
--- a/tests/good/test-bad-utf8.nt
+++ b/tests/lax/test-bad-utf8.nt
@@ -1,3 +1,6 @@
 <http://example.org/thing> <http://example.org/comment> "Impossible bytes: \uFFFD \uFFFD" .
 <http://example.org/thing> <http://example.org/comment> "2 continuation bytes: \uFFFD" .
 <http://example.org/thing> <http://example.org/comment> "Missing continuation: \uFFFD" .
+<http://example.org/thing> <http://example.org/comment> "Impossible bytes: \uFFFD \uFFFD" .
+<http://example.org/thing> <http://example.org/comment> "2 continuation bytes: \uFFFD" .
+<http://example.org/thing> <http://example.org/comment> "Missing continuation: \uFFFD" .
diff --git a/tests/lax/test-bad-utf8.ttl b/tests/lax/test-bad-utf8.ttl
new file mode 100644
index 00000000..526a171f
--- /dev/null
+++ b/tests/lax/test-bad-utf8.ttl
@@ -0,0 +1,6 @@
+<http://example.org/thing> <http://example.org/comment> "Impossible bytes: þ ÿ" .
+<http://example.org/thing> <http://example.org/comment> "2 continuation bytes: €¿" .
+<http://example.org/thing> <http://example.org/comment> "Missing continuation: À" .
+<http://example.org/thing> <http://example.org/comment> """Impossible bytes: þ ÿ""" .
+<http://example.org/thing> <http://example.org/comment> """2 continuation bytes: €¿""" .
+<http://example.org/thing> <http://example.org/comment> """Missing continuation: À""" .