From a44d17c590b7abca9b4012154ed4beb78f988588 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 24 Feb 2013 07:07:19 +0000 Subject: Generate shorter blank node IDs like the new Turtle test suite. git-svn-id: http://svn.drobilla.net/serd/trunk@414 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- tests/bad/bad-id-clash.ttl | 4 +- tests/manifest.nt | 478 ++++++++++++++++++++++---------------------- tests/test-00.nt | 2 +- tests/test-04.nt | 4 +- tests/test-05.nt | 8 +- tests/test-07.nt | 10 +- tests/test-09.nt | 6 +- tests/test-13.nt | 2 +- tests/test-blank-cont.nt | 8 +- tests/test-blank-in-list.nt | 8 +- tests/test-id.nt | 4 +- tests/test-id.ttl | 2 +- tests/test-list-in-blank.nt | 12 +- tests/test-list-subject.nt | 10 +- tests/test-pretty.nt | 88 ++++---- 15 files changed, 323 insertions(+), 323 deletions(-) (limited to 'tests') diff --git a/tests/bad/bad-id-clash.ttl b/tests/bad/bad-id-clash.ttl index 55ab23e3..c1536840 100644 --- a/tests/bad/bad-id-clash.ttl +++ b/tests/bad/bad-id-clash.ttl @@ -1,2 +1,2 @@ -_:genid1 a _:genid2 . -_:genid2 a _:docid1 . \ No newline at end of file +_:b1 a _:b2 . +_:b2 a _:B1 . \ No newline at end of file diff --git a/tests/manifest.nt b/tests/manifest.nt index d2fa7b74..123a38b5 100644 --- a/tests/manifest.nt +++ b/tests/manifest.nt @@ -1,241 +1,241 @@ <> . <> "Turtle good syntax test cases (must pass)" . -<> _:genid1 . -_:genid1 _:genid2 . -_:genid2 "test-00" . -_:genid2 "Blank subject" . -_:genid2 _:genid3 . -_:genid3 . -_:genid2 . -_:genid1 _:genid4 . -_:genid4 _:genid5 . -_:genid5 "test-01" . -_:genid5 "@prefix and qnames" . -_:genid5 _:genid6 . -_:genid6 . -_:genid5 . -_:genid4 _:genid7 . -_:genid7 _:genid8 . -_:genid8 "test-02" . -_:genid8 ", operator" . -_:genid8 _:genid9 . -_:genid9 . -_:genid8 . -_:genid7 _:genid10 . -_:genid10 _:genid11 . -_:genid11 "test-03" . -_:genid11 "; operator" . -_:genid11 _:genid12 . -_:genid12 . -_:genid11 . -_:genid10 _:genid13 . -_:genid13 _:genid14 . -_:genid14 "test-04" . -_:genid14 "empty [] as subject and object" . -_:genid14 _:genid15 . -_:genid15 . -_:genid14 . -_:genid13 _:genid16 . -_:genid16 _:genid17 . -_:genid17 "test-05" . -_:genid17 "non-empty [] as subject and object" . -_:genid17 _:genid18 . -_:genid18 . -_:genid17 . -_:genid16 _:genid19 . -_:genid19 _:genid20 . -_:genid20 "test-06" . -_:genid20 "'a' as predicate" . -_:genid20 _:genid21 . -_:genid21 . -_:genid20 . -_:genid19 _:genid22 . -_:genid22 _:genid23 . -_:genid23 "test-07" . -_:genid23 "simple collection" . -_:genid23 _:genid24 . -_:genid24 . -_:genid23 . -_:genid22 _:genid25 . -_:genid25 _:genid26 . -_:genid26 "test-08" . -_:genid26 "empty collection" . -_:genid26 _:genid27 . -_:genid27 . -_:genid26 . -_:genid25 _:genid28 . -_:genid28 _:genid29 . -_:genid29 "test-09" . -_:genid29 "integer datatyped literal" . -_:genid29 _:genid30 . -_:genid30 . -_:genid29 . -_:genid28 _:genid31 . -_:genid31 _:genid32 . -_:genid32 "test-10" . -_:genid32 "decimal integer canonicalization" . -_:genid32 _:genid33 . -_:genid33 . -_:genid32 . -_:genid31 _:genid34 . -_:genid34 _:genid35 . -_:genid35 "test-11" . -_:genid35 "- and _ in names and qnames" . -_:genid35 _:genid36 . -_:genid36 . -_:genid35 . -_:genid34 _:genid37 . -_:genid37 _:genid38 . -_:genid38 "test-12" . -_:genid38 "tests for rdf:_ and other qnames starting with _" . -_:genid38 _:genid39 . -_:genid39 . -_:genid38 . -_:genid37 _:genid40 . -_:genid40 _:genid41 . -_:genid41 "test-13" . -_:genid41 "bare : allowed" . -_:genid41 _:genid42 . -_:genid42 . -_:genid41 . -_:genid40 _:genid43 . -_:genid43 _:genid44 . -_:genid44 "test-14" . -_:genid44 "10000 triples, more than the default Bison stack size" . -_:genid44 _:genid45 . -_:genid45 . -_:genid44 . -_:genid43 _:genid46 . -_:genid46 _:genid47 . -_:genid47 "test-15" . -_:genid47 "10000 triple objects (10000 triples)" . -_:genid47 _:genid48 . -_:genid48 . -_:genid47 . -_:genid46 _:genid49 . -_:genid49 _:genid50 . -_:genid50 "test-16" . -_:genid50 "10000 items (10000 triples)" . -_:genid50 _:genid51 . -_:genid51 . -_:genid50 . -_:genid49 _:genid52 . -_:genid52 _:genid53 . -_:genid53 "test-17" . -_:genid53 "simple long literal" . -_:genid53 _:genid54 . -_:genid54 . -_:genid53 . -_:genid52 _:genid55 . -_:genid55 _:genid56 . -_:genid56 "test-18" . -_:genid56 "long literals with escapes" . -_:genid56 _:genid57 . -_:genid57 . -_:genid56 . -_:genid55 _:genid58 . -_:genid58 _:genid59 . -_:genid59 "test-19" . -_:genid59 "floating point number" . -_:genid59 _:genid60 . -_:genid60 . -_:genid59 . -_:genid58 _:genid61 . -_:genid61 _:genid62 . -_:genid62 "test-20" . -_:genid62 "empty literals, normal and long variant" . -_:genid62 _:genid63 . -_:genid63 . -_:genid62 . -_:genid61 _:genid64 . -_:genid64 _:genid65 . -_:genid65 "test-21" . -_:genid65 "positive integer, decimal and doubles" . -_:genid65 _:genid66 . -_:genid66 . -_:genid65 . -_:genid64 _:genid67 . -_:genid67 _:genid68 . -_:genid68 "test-22" . -_:genid68 "negative integer, decimal and doubles" . -_:genid68 _:genid69 . -_:genid69 . -_:genid68 . -_:genid67 _:genid70 . -_:genid70 _:genid71 . -_:genid71 "test-23" . -_:genid71 "long literal ending in double quote" . -_:genid71 _:genid72 . -_:genid72 . -_:genid71 . -_:genid70 _:genid73 . -_:genid73 _:genid74 . -_:genid74 "test-24" . -_:genid74 "boolean literals" . -_:genid74 _:genid75 . -_:genid75 . -_:genid74 . -_:genid73 _:genid76 . -_:genid76 _:genid77 . -_:genid77 "test-25" . -_:genid77 "comments" . -_:genid77 _:genid78 . -_:genid78 . -_:genid77 . -_:genid76 _:genid79 . -_:genid79 _:genid80 . -_:genid80 "test-26" . -_:genid80 "no final mewline" . -_:genid80 _:genid81 . -_:genid81 . -_:genid80 . -_:genid79 _:genid82 . -_:genid82 _:genid83 . -_:genid83 "test-27" . -_:genid83 "duplicate prefix" . -_:genid83 _:genid84 . -_:genid84 . -_:genid83 . -_:genid82 _:genid85 . -_:genid85 _:genid86 . -_:genid86 "test-28" . -_:genid86 "decimal data types (serializing test)" . -_:genid86 _:genid87 . -_:genid87 . -_:genid86 . -_:genid85 _:genid88 . -_:genid88 _:genid89 . -_:genid89 "test-29" . -_:genid89 "Escaping U+0001 to U+007F in a URI" . -_:genid89 _:genid90 . -_:genid90 . -_:genid89 . -_:genid88 _:genid91 . -_:genid91 _:genid92 . -_:genid92 "test-30" . -_:genid92 "@base" . -_:genid92 _:genid93 . -_:genid93 . -_:genid92 . -_:genid91 _:genid94 . -_:genid94 _:genid95 . -_:genid95 "rdf-schema" . -_:genid95 "RDF Namespace document converted into Turtle" . -_:genid95 _:genid96 . -_:genid96 . -_:genid95 . -_:genid94 _:genid97 . -_:genid97 _:genid98 . -_:genid98 "rdfs-namespace" . -_:genid98 "RDFS Namespace document converted into Turtle" . -_:genid98 _:genid99 . -_:genid99 . -_:genid98 . -_:genid97 _:genid100 . -_:genid100 _:genid101 . -_:genid101 "rdfq-results" . -_:genid101 "Example query result from http://www.w3.org/2003/03/rdfqr-tests/recording-query-results.html" . -_:genid101 _:genid102 . -_:genid102 . -_:genid101 . -_:genid100 . +<> _:b1 . +_:b1 _:b2 . +_:b2 "test-00" . +_:b2 "Blank subject" . +_:b2 _:b3 . +_:b3 . +_:b2 . +_:b1 _:b4 . +_:b4 _:b5 . +_:b5 "test-01" . +_:b5 "@prefix and qnames" . +_:b5 _:b6 . +_:b6 . +_:b5 . +_:b4 _:b7 . +_:b7 _:b8 . +_:b8 "test-02" . +_:b8 ", operator" . +_:b8 _:b9 . +_:b9 . +_:b8 . +_:b7 _:b10 . +_:b10 _:b11 . +_:b11 "test-03" . +_:b11 "; operator" . +_:b11 _:b12 . +_:b12 . +_:b11 . +_:b10 _:b13 . +_:b13 _:b14 . +_:b14 "test-04" . +_:b14 "empty [] as subject and object" . +_:b14 _:b15 . +_:b15 . +_:b14 . +_:b13 _:b16 . +_:b16 _:b17 . +_:b17 "test-05" . +_:b17 "non-empty [] as subject and object" . +_:b17 _:b18 . +_:b18 . +_:b17 . +_:b16 _:b19 . +_:b19 _:b20 . +_:b20 "test-06" . +_:b20 "'a' as predicate" . +_:b20 _:b21 . +_:b21 . +_:b20 . +_:b19 _:b22 . +_:b22 _:b23 . +_:b23 "test-07" . +_:b23 "simple collection" . +_:b23 _:b24 . +_:b24 . +_:b23 . +_:b22 _:b25 . +_:b25 _:b26 . +_:b26 "test-08" . +_:b26 "empty collection" . +_:b26 _:b27 . +_:b27 . +_:b26 . +_:b25 _:b28 . +_:b28 _:b29 . +_:b29 "test-09" . +_:b29 "integer datatyped literal" . +_:b29 _:b30 . +_:b30 . +_:b29 . +_:b28 _:b31 . +_:b31 _:b32 . +_:b32 "test-10" . +_:b32 "decimal integer canonicalization" . +_:b32 _:b33 . +_:b33 . +_:b32 . +_:b31 _:b34 . +_:b34 _:b35 . +_:b35 "test-11" . +_:b35 "- and _ in names and qnames" . +_:b35 _:b36 . +_:b36 . +_:b35 . +_:b34 _:b37 . +_:b37 _:b38 . +_:b38 "test-12" . +_:b38 "tests for rdf:_ and other qnames starting with _" . +_:b38 _:b39 . +_:b39 . +_:b38 . +_:b37 _:b40 . +_:b40 _:b41 . +_:b41 "test-13" . +_:b41 "bare : allowed" . +_:b41 _:b42 . +_:b42 . +_:b41 . +_:b40 _:b43 . +_:b43 _:b44 . +_:b44 "test-14" . +_:b44 "10000 triples, more than the default Bison stack size" . +_:b44 _:b45 . +_:b45 . +_:b44 . +_:b43 _:b46 . +_:b46 _:b47 . +_:b47 "test-15" . +_:b47 "10000 triple objects (10000 triples)" . +_:b47 _:b48 . +_:b48 . +_:b47 . +_:b46 _:b49 . +_:b49 _:b50 . +_:b50 "test-16" . +_:b50 "10000 items (10000 triples)" . +_:b50 _:b51 . +_:b51 . +_:b50 . +_:b49 _:b52 . +_:b52 _:b53 . +_:b53 "test-17" . +_:b53 "simple long literal" . +_:b53 _:b54 . +_:b54 . +_:b53 . +_:b52 _:b55 . +_:b55 _:b56 . +_:b56 "test-18" . +_:b56 "long literals with escapes" . +_:b56 _:b57 . +_:b57 . +_:b56 . +_:b55 _:b58 . +_:b58 _:b59 . +_:b59 "test-19" . +_:b59 "floating point number" . +_:b59 _:b60 . +_:b60 . +_:b59 . +_:b58 _:b61 . +_:b61 _:b62 . +_:b62 "test-20" . +_:b62 "empty literals, normal and long variant" . +_:b62 _:b63 . +_:b63 . +_:b62 . +_:b61 _:b64 . +_:b64 _:b65 . +_:b65 "test-21" . +_:b65 "positive integer, decimal and doubles" . +_:b65 _:b66 . +_:b66 . +_:b65 . +_:b64 _:b67 . +_:b67 _:b68 . +_:b68 "test-22" . +_:b68 "negative integer, decimal and doubles" . +_:b68 _:b69 . +_:b69 . +_:b68 . +_:b67 _:b70 . +_:b70 _:b71 . +_:b71 "test-23" . +_:b71 "long literal ending in double quote" . +_:b71 _:b72 . +_:b72 . +_:b71 . +_:b70 _:b73 . +_:b73 _:b74 . +_:b74 "test-24" . +_:b74 "boolean literals" . +_:b74 _:b75 . +_:b75 . +_:b74 . +_:b73 _:b76 . +_:b76 _:b77 . +_:b77 "test-25" . +_:b77 "comments" . +_:b77 _:b78 . +_:b78 . +_:b77 . +_:b76 _:b79 . +_:b79 _:b80 . +_:b80 "test-26" . +_:b80 "no final mewline" . +_:b80 _:b81 . +_:b81 . +_:b80 . +_:b79 _:b82 . +_:b82 _:b83 . +_:b83 "test-27" . +_:b83 "duplicate prefix" . +_:b83 _:b84 . +_:b84 . +_:b83 . +_:b82 _:b85 . +_:b85 _:b86 . +_:b86 "test-28" . +_:b86 "decimal data types (serializing test)" . +_:b86 _:b87 . +_:b87 . +_:b86 . +_:b85 _:b88 . +_:b88 _:b89 . +_:b89 "test-29" . +_:b89 "Escaping U+0001 to U+007F in a URI" . +_:b89 _:b90 . +_:b90 . +_:b89 . +_:b88 _:b91 . +_:b91 _:b92 . +_:b92 "test-30" . +_:b92 "@base" . +_:b92 _:b93 . +_:b93 . +_:b92 . +_:b91 _:b94 . +_:b94 _:b95 . +_:b95 "rdf-schema" . +_:b95 "RDF Namespace document converted into Turtle" . +_:b95 _:b96 . +_:b96 . +_:b95 . +_:b94 _:b97 . +_:b97 _:b98 . +_:b98 "rdfs-namespace" . +_:b98 "RDFS Namespace document converted into Turtle" . +_:b98 _:b99 . +_:b99 . +_:b98 . +_:b97 _:b100 . +_:b100 _:b101 . +_:b101 "rdfq-results" . +_:b101 "Example query result from http://www.w3.org/2003/03/rdfqr-tests/recording-query-results.html" . +_:b101 _:b102 . +_:b102 . +_:b101 . +_:b100 . diff --git a/tests/test-00.nt b/tests/test-00.nt index 7f8b717e..d1d84a2d 100644 --- a/tests/test-00.nt +++ b/tests/test-00.nt @@ -1 +1 @@ -_:genid1 . +_:b1 . diff --git a/tests/test-04.nt b/tests/test-04.nt index 414e4b84..d5d01526 100644 --- a/tests/test-04.nt +++ b/tests/test-04.nt @@ -1,2 +1,2 @@ -_:genid1 . - _:genid2 . +_:b1 . + _:b2 . diff --git a/tests/test-05.nt b/tests/test-05.nt index bf904178..d440197f 100644 --- a/tests/test-05.nt +++ b/tests/test-05.nt @@ -1,4 +1,4 @@ -_:genid1 . -_:genid1 . - _:genid2 . -_:genid2 . +_:b1 . +_:b1 . + _:b2 . +_:b2 . diff --git a/tests/test-07.nt b/tests/test-07.nt index e17cc7be..923f26a4 100644 --- a/tests/test-07.nt +++ b/tests/test-07.nt @@ -1,5 +1,5 @@ - _:genid1 . -_:genid1 "apple" . -_:genid1 _:genid2 . -_:genid2 "banana" . -_:genid2 . + _:el1 . +_:el1 "apple" . +_:el1 _:el2 . +_:el2 "banana" . +_:el2 . diff --git a/tests/test-09.nt b/tests/test-09.nt index 5fdb9099..c7164085 100644 --- a/tests/test-09.nt +++ b/tests/test-09.nt @@ -1,4 +1,4 @@ _:hasParent . -_:genid1 . -_:genid1 _:hasParent . -_:genid1 "2"^^ . +_:b1 . +_:b1 _:hasParent . +_:b1 "2"^^ . diff --git a/tests/test-13.nt b/tests/test-13.nt index 9feb5ad0..195a1af7 100644 --- a/tests/test-13.nt +++ b/tests/test-13.nt @@ -1,2 +1,2 @@ -_:genid1 _:genid2 . +_:b1 _:b2 . . diff --git a/tests/test-blank-cont.nt b/tests/test-blank-cont.nt index d64e3e46..a4b44e7d 100644 --- a/tests/test-blank-cont.nt +++ b/tests/test-blank-cont.nt @@ -1,4 +1,4 @@ - _:genid1 . -_:genid1 . - _:genid2 . -_:genid2 . + _:b1 . +_:b1 . + _:b2 . +_:b2 . diff --git a/tests/test-blank-in-list.nt b/tests/test-blank-in-list.nt index 2e0c0eb0..253087e7 100644 --- a/tests/test-blank-in-list.nt +++ b/tests/test-blank-in-list.nt @@ -1,4 +1,4 @@ - _:genid1 . -_:genid1 _:genid2 . -_:genid2 . -_:genid1 . + _:el1 . +_:el1 _:b2 . +_:b2 . +_:el1 . diff --git a/tests/test-id.nt b/tests/test-id.nt index 722fc6d1..b4b11069 100644 --- a/tests/test-id.nt +++ b/tests/test-id.nt @@ -1,2 +1,2 @@ - _:genid1 . -_:docid1 . + _:b1 . +_:B1 . diff --git a/tests/test-id.ttl b/tests/test-id.ttl index 6bc1c37d..cfd0e9ca 100644 --- a/tests/test-id.ttl +++ b/tests/test-id.ttl @@ -1,4 +1,4 @@ @prefix : . :c :d [] . -_:genid1 :a :b . +_:b1 :a :b . diff --git a/tests/test-list-in-blank.nt b/tests/test-list-in-blank.nt index 76023a8b..b7f631da 100644 --- a/tests/test-list-in-blank.nt +++ b/tests/test-list-in-blank.nt @@ -1,6 +1,6 @@ - _:genid1 . -_:genid1 _:genid2 . -_:genid2 "apple" . -_:genid2 _:genid3 . -_:genid3 "banana" . -_:genid3 . + _:b1 . +_:b1 _:el2 . +_:el2 "apple" . +_:el2 _:el3 . +_:el3 "banana" . +_:el3 . diff --git a/tests/test-list-subject.nt b/tests/test-list-subject.nt index 9a853774..ef87b0f2 100644 --- a/tests/test-list-subject.nt +++ b/tests/test-list-subject.nt @@ -1,6 +1,6 @@ . -_:genid1 "apple" . -_:genid1 _:genid2 . -_:genid2 "banana" . -_:genid2 . -_:genid1 . +_:el1 "apple" . +_:el1 _:el2 . +_:el2 "banana" . +_:el2 . +_:el1 . diff --git a/tests/test-pretty.nt b/tests/test-pretty.nt index c61f7c22..f96a10e2 100644 --- a/tests/test-pretty.nt +++ b/tests/test-pretty.nt @@ -1,46 +1,46 @@ . -_:genid1 . +_:b1 . . -_:genid2 _:genid3 . -_:genid4 "apple" . -_:genid4 _:genid5 . -_:genid5 "banana" . -_:genid5 _:genid6 . -_:genid6 "pear" . -_:genid6 . -_:genid4 . -_:genid7 _:genid8 . -_:genid8 . -_:genid8 _:genid9 . -_:genid9 . -_:genid9 . -_:genid7 _:genid10 . -_:genid10 _:genid11 . -_:genid11 . -_:genid11 _:genid12 . -_:genid12 . -_:genid12 . -_:genid10 . -_:genid7 . -_:genid13 _:genid14 . -_:genid14 "apple" . -_:genid14 _:genid15 . -_:genid15 "banana" . -_:genid15 _:genid16 . -_:genid16 "pear" . -_:genid16 . -_:genid17 . -_:genid17 . -_:genid17 . -_:genid18 _:genid19 . -_:genid19 . -_:genid19 . -_:genid18 _:genid20 . -_:genid20 . -_:genid21 _:genid22 . -_:genid22 _:genid23 . -_:genid23 . -_:genid22 _:genid24 . -_:genid24 _:genid25 . -_:genid25 . -_:genid24 . +_:b2 _:b3 . +_:el4 "apple" . +_:el4 _:el5 . +_:el5 "banana" . +_:el5 _:el6 . +_:el6 "pear" . +_:el6 . +_:el4 . +_:el7 _:el8 . +_:el8 . +_:el8 _:el9 . +_:el9 . +_:el9 . +_:el7 _:el10 . +_:el10 _:el11 . +_:el11 . +_:el11 _:el12 . +_:el12 . +_:el12 . +_:el10 . +_:el7 . +_:b13 _:el14 . +_:el14 "apple" . +_:el14 _:el15 . +_:el15 "banana" . +_:el15 _:el16 . +_:el16 "pear" . +_:el16 . +_:b17 . +_:b17 . +_:b17 . +_:b18 _:b19 . +_:b19 . +_:b19 . +_:b18 _:b20 . +_:b20 . +_:b21 _:el22 . +_:el22 _:b23 . +_:b23 . +_:el22 _:el24 . +_:el24 _:b25 . +_:b25 . +_:el24 . -- cgit v1.2.1