Simplify writer style options and write UTF-8 by default

5 files changed, 13 insertions, 10 deletions

diff --git a/test/extra/perfect/test-long-whitespace.nt b/test/extra/perfect/test-long-whitespace.nt
index 09664b37..fca880d1 100644
--- a/test/extra/perfect/test-long-whitespace.nt
+++ b/test/extra/perfect/test-long-whitespace.nt
@@ -1,2 +1,2 @@
-<http://example.org/eg#a> <http://example.org/eg#b> "\nthis \ris a \U00015678long\t\nliteral\uABCD\n" .
-<http://example.org/eg#d> <http://example.org/eg#e> "\tThis \uABCDis\r \U00015678another\n\none\n" .
+<http://example.org/eg#a> <http://example.org/eg#b> "\nthis \ris a 𕙸long\t\nliteralꯍ\n" .
+<http://example.org/eg#d> <http://example.org/eg#e> "\tThis ꯍis\r 𕙸another\n\none\n" .
diff --git a/test/extra/perfect/test-utf8-uri.nt b/test/extra/perfect/test-utf8-uri.nt
index b8a73a88..3338039b 100644
--- a/test/extra/perfect/test-utf8-uri.nt
+++ b/test/extra/perfect/test-utf8-uri.nt
@@ -1 +1 @@
-<http://example.org/math/\u2200x\u2208\u211D> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
+<http://example.org/math/∀x∈ℝ> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
diff --git a/test/extra/perfect/test-utf8.nt b/test/extra/perfect/test-utf8.nt
index c02cb375..a9de7bbe 100644
--- a/test/extra/perfect/test-utf8.nt
+++ b/test/extra/perfect/test-utf8.nt
@@ -1,3 +1,3 @@
-<http://example.org/eg#s> <http://example.org/eg#p> "1: Two byte Unicode escape: \u00E0" .
-<http://example.org/eg#s> <http://example.org/eg#p> "2: Largest Unicode escape in Turtle: \U0010FFFF" .
-<http://example.org/eg#s> <http://example.org/eg#p> "3: \u222E E\u22C5da = Q,  n \u2192 \u221E, \u2211 f(i) = \u220F g(i)" .
+<http://example.org/eg#s> <http://example.org/eg#p> "1: Two byte Unicode escape: à" .
+<http://example.org/eg#s> <http://example.org/eg#p> "2: Largest Unicode escape in Turtle: 􏿿" .
+<http://example.org/eg#s> <http://example.org/eg#p> "3: ∮ E⋅da = Q,  n → ∞, ∑ f(i) = ∏ g(i)" .
diff --git a/test/meson.build b/test/meson.build
index 3e24fea0..937b9038 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -336,11 +336,12 @@ test_suites = {
     files('extra/good/manifest.ttl'),
     ns_serdtest + 'good/',
     '--',
+    '-a',
     '-b',
   ],
   'fast': [
-    files('extra/good/manifest.ttl'),
-    ns_serdtest + 'good/',
+    files('extra/perfect/manifest.ttl'),
+    ns_serdtest + 'perfect/',
     '--',
     '-f',
   ],
@@ -353,12 +354,15 @@ test_suites = {
   'good': [
     files('extra/good/manifest.ttl'),
     ns_serdtest + 'good/',
+    '--',
+    '-a',
   ],
   'lax_lax': [
     '--lax',
     files('extra/lax/manifest.ttl'),
     ns_serdtest + 'lax/',
     '--',
+    '-a',
     '-l',
   ],
   'lax_strict': [
diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c
index e792f2dc..c4f8bb90 100644
--- a/test/test_reader_writer.c
+++ b/test/test_reader_writer.c
@@ -409,8 +409,7 @@ test_write_errors(void)
 {
   SerdWorld* const      world = serd_world_new();
   ErrorContext          ctx   = {0U, 0U};
-  const SerdWriterFlags style =
-    (SerdWriterFlags)(SERD_WRITE_STRICT | SERD_WRITE_CURIED);
+  const SerdWriterFlags style = (SerdWriterFlags)SERD_WRITE_STRICT;
 
   const size_t max_offsets[] = {0, 386, 1911, 2003, 386};