Repository: jena
Updated Branches:
  refs/heads/master 6ac577192 -> 691520f16


Leave line endings alone in tests


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5f215fbe
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5f215fbe
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5f215fbe

Branch: refs/heads/master
Commit: 5f215fbe765e90386f695e70659393ea3a797adb
Parents: 6ac5771
Author: Andy Seaborne <[email protected]>
Authored: Tue Sep 23 17:57:57 2014 +0100
Committer: Andy Seaborne <[email protected]>
Committed: Tue Sep 23 17:57:57 2014 +0100

----------------------------------------------------------------------
 jena-arq/testing/RIOT/Lang/.gitattributes       |   1 +
 .../testing/RIOT/Lang/TurtleStd/.gitattributes  |   1 -
 jena-arq/testing/RIOT/Lang/TurtleStd/LICENSE    | 183 +++++++++----------
 .../Lang/TurtleStd/LITERAL1_all_controls.nt     |   2 +-
 .../Lang/TurtleStd/LITERAL1_all_punctuation.nt  |   2 +-
 .../Lang/TurtleStd/LITERAL1_ascii_boundaries.nt |   2 +-
 .../TurtleStd/LITERAL1_with_UTF8_boundaries.ttl |   2 +-
 .../Lang/TurtleStd/LITERAL2_ascii_boundaries.nt |   2 +-
 .../TurtleStd/LITERAL2_with_UTF8_boundaries.ttl |   2 +-
 .../TurtleStd/LITERAL_LONG1_ascii_boundaries.nt |   2 +-
 .../LITERAL_LONG1_with_UTF8_boundaries.ttl      |   2 +-
 .../TurtleStd/LITERAL_LONG2_ascii_boundaries.nt |   2 +-
 .../LITERAL_LONG2_with_UTF8_boundaries.ttl      |   2 +-
 .../TurtleStd/LITERAL_with_UTF8_boundaries.nt   |   2 +-
 ..._with_PN_CHARS_BASE_character_boundaries.ttl |   2 +-
 ...ed_nfc_PN_CHARS_BASE_character_boundaries.nt |   2 +-
 ...fc_bmp_PN_CHARS_BASE_character_boundaries.nt |   2 +-
 ...th_nfc_PN_CHARS_BASE_character_boundaries.nt |   2 +-
 .../localName_with_non_leading_extras.nt        |   2 +-
 .../testing/RIOT/Lang/TurtleStd/manifest.ttl    |  64 +++++--
 ..._with_PN_CHARS_BASE_character_boundaries.ttl |   4 +-
 jena-arq/testing/RIOT/Lang/generate             | 174 ------------------
 jena-arq/testing/RIOT/Lang/manifest-all.ttl     |   7 +-
 23 files changed, 162 insertions(+), 304 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/.gitattributes
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/.gitattributes 
b/jena-arq/testing/RIOT/Lang/.gitattributes
new file mode 100644
index 0000000..02c2af7
--- /dev/null
+++ b/jena-arq/testing/RIOT/Lang/.gitattributes
@@ -0,0 +1 @@
+*.ttl  -text

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/.gitattributes
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/.gitattributes 
b/jena-arq/testing/RIOT/Lang/TurtleStd/.gitattributes
deleted file mode 100644
index 19b4c1a..0000000
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.txt  -text

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LICENSE
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/LICENSE 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LICENSE
index 8b9706a..1ac8f4e 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LICENSE
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LICENSE
@@ -1,9 +1,9 @@
 Summary
 =======
 
-Distributed under both the W3C Test Suite License[1] and the W3C 3-clause
-BSD License[2]. To contribute to a W3C Test Suite, see the policies and
-contribution forms [3]
+Distributed under both the W3C Test Suite License[1] and the W3C 3-clause BSD
+License[2]. To contribute to a W3C Test Suite, see the policies and 
contribution
+forms [3]
 
 1. http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
 2. http://www.w3.org/Consortium/Legal/2008/03-bsd-license
@@ -11,110 +11,107 @@ contribution forms [3]
 
 DISCLAIMER
 
-UNDER BOTH MUTUALLY EXCLUSIVE LICENSES, THIS DOCUMENT AND ALL DOCUMENTS,
-TESTS AND SOFTWARE THAT LINK THIS STATEMENT ARE PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
-CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
-IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.  COPYRIGHT HOLDERS WILL NOT BE
-LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE
-CONTENTS THEREOF.
+UNDER BOTH MUTUALLY EXCLUSIVE LICENSES, THIS DOCUMENT AND ALL DOCUMENTS, TESTS
+AND SOFTWARE THAT LINK THIS STATEMENT ARE PROVIDED "AS IS," AND COPYRIGHT
+HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
+SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
+INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE
+OR IMPLEMENTATION OF THE CONTENTS THEREOF.
 
 
 W3C Test Suite License
 ======================
 
-This document, Test Suites and other documents that link to this statement
-are provided by the copyright holders under the following license: By using
-and/or copying this document, or the W3C document from which this statement
-is linked, you (the licensee) agree that you have read, understood, and
-will comply with the following terms and conditions:
+This document, Test Suites and other documents that link to this statement are
+provided by the copyright holders under the following license: By using and/or
+copying this document, or the W3C document from which this statement is linked,
+you (the licensee) agree that you have read, understood, and will comply with
+the following terms and conditions:
 
-Permission to copy, and distribute the contents of this document, or the
-W3C document from which this statement is linked, in any medium for any
-purpose and without fee or royalty is hereby granted, provided that you
-include the following on ALL copies of the document, or portions thereof,
-that you use:
+Permission to copy, and distribute the contents of this document, or the W3C
+document from which this statement is linked, in any medium for any purpose and
+without fee or royalty is hereby granted, provided that you include the
+following on ALL copies of the document, or portions thereof, that you use:
 
-A link or URL to the original W3C document.
+1 A link or URL to the original W3C document.
 
-The pre-existing copyright notice of the original author, or if it doesn't
-exist, a notice (hypertext is preferred, but a textual representation is
-permitted) of the form: "Copyright © [$date-of-document] World Wide Web
-Consortium, (Massachusetts Institute of Technology, European Research
-Consortium for Informatics and Mathematics, Keio University) and
-others. All Rights Reserved. 
-http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html";
+2 The pre-existing copyright notice of the original author, or if it doesn't
+  exist, a notice (hypertext is preferred, but a textual representation is
+  permitted) of the form: "Copyright © [$date-of-document] World Wide Web
+  Consortium, (Massachusetts Institute of Technology, European Research
+  Consortium for Informatics and Mathematics, Keio University) and others. All
+  Rights
+  Reserved. 
http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html";
 
-If it exists, the STATUS of the W3C document.
+3 If it exists, the STATUS of the W3C document.
+
+4 When space permits, inclusion of the full text of this NOTICE should be
+  provided. We request that authorship attribution be provided in any software,
+  documents, or other items or products that you create pursuant to the
+  implementation of the contents of this document, or any portion thereof.
 
-When space permits, inclusion of the full text of this NOTICE should be
-provided. We request that authorship attribution be provided in any
-software, documents, or other items or products that you create pursuant to
-the implementation of the contents of this document, or any portion
-thereof.
 
 No right to create modifications or derivatives of W3C documents is granted
-pursuant to this license. However, if additional requirements (documented
-in the Copyright FAQ) are satisfied, the right to create modifications or
-derivatives is sometimes granted by the W3C to individuals complying with
-those requirements.
-
-If a Test Suite distinguishes the test harness (or, framework for
-navigation) and the actual tests, permission is given to remove or alter
-the harness or navigation if the Test Suite in question allows to do
-so. The tests themselves shall NOT be changed in any way.
-
-The name and trademarks of W3C and other copyright holders may NOT be used
-in advertising or publicity pertaining to this document or other documents
-that link to this statement without specific, written prior
-permission. Title to copyright in this document will at all times remain
-with copyright holders. Permission is given to use the trademarked string
-W3C within claims of performance concerning W3C Specifications or features
-described therein, and there only, if the test suite so authorizes.
-
-THIS WORK IS PROVIDED BY W3C, MIT, ERCIM, KEIO UNIVERSITY, THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL W3C,
-MIT, ERCIM, KEIO UNIVERSITY, THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+pursuant to this license. However, if additional requirements (documented in 
the
+Copyright FAQ) are satisfied, the right to create modifications or derivatives
+is sometimes granted by the W3C to individuals complying with those
+requirements.
+
+If a Test Suite distinguishes the test harness (or, framework for navigation)
+and the actual tests, permission is given to remove or alter the harness or
+navigation if the Test Suite in question allows to do so. The tests themselves
+shall NOT be changed in any way.
+
+The name and trademarks of W3C and other copyright holders may NOT be used in
+advertising or publicity pertaining to this document or other documents that
+link to this statement without specific, written prior permission. Title to
+copyright in this document will at all times remain with copyright
+holders. Permission is given to use the trademarked string W3C within claims of
+performance concerning W3C Specifications or features described therein, and
+there only, if the test suite so authorizes.
+
+THIS WORK IS PROVIDED BY W3C, MIT, ERCIM, KEIO UNIVERSITY, THE COPYRIGHT 
HOLDERS
+AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL W3C, MIT, ERCIM, KEIO
+UNIVERSITY, THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 W3C 3-clause BSD License
 ========================
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-       Redistributions of works must retain the original copyright notice,
-       this list of conditions and the following disclaimer.
-
-       Redistributions in binary form must reproduce the original copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-       Neither the name of the W3C nor the names of its contributors may be
-       used to endorse or promote products derived from this work without
-       specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Redistribution and use in source and binary forms, with or without 
modification,
+are permitted provided that the following conditions are met:
+
+1 Redistributions of works must retain the original copyright notice, this list
+  of conditions and the following disclaimer.
+
+2 Redistributions in binary form must reproduce the original copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+3 Neither the name of the W3C nor the names of its contributors may be used to
+  endorse or promote products derived from this work without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_controls.nt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_controls.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_controls.nt
index 422a0cd..91c8af1 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_controls.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_controls.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
"\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000b\u000c\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f"
 .
+<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"
 .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_punctuation.nt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_punctuation.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_punctuation.nt
index 7531dc1..c25d818 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_punctuation.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_all_punctuation.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> " !\u0022#$%&():;<=>?@[]^_`{|}~" .
+<http://a.example/s> <http://a.example/p> " !\"#$%&():;<=>?@[]^_`{|}~" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_ascii_boundaries.nt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_ascii_boundaries.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_ascii_boundaries.nt
index b50e75f..69c4144 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_ascii_boundaries.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_ascii_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
"\u0000\u0009\u000b\u000c\u000e\u0026\u0028\u005b\u005d\u007f" .
+<http://a.example/s> <http://a.example/p> 
"\u0000\t\u000B\u000C\u000E&([]\u007F" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_with_UTF8_boundaries.ttl
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_with_UTF8_boundaries.ttl 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_with_UTF8_boundaries.ttl
index ce3a491..b72eb04 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_with_UTF8_boundaries.ttl
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL1_with_UTF8_boundaries.ttl
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> '€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿¿ð€€ð¿¿¿ñ€€€ó¿¿¿ô€€€ô¿½' .
+<http://a.example/s> <http://a.example/p> '€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿½ð€€ð¿¿½ñ€€€ó¿¿½ô€€€ô¿½' .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_ascii_boundaries.nt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_ascii_boundaries.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_ascii_boundaries.nt
index 22a1ad7..270a51e 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_ascii_boundaries.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_ascii_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
"\u0000\u0009\u000b\u000c\u000e\u0021\u0023\u005b\u005d\u007f" .
+<http://a.example/s> <http://a.example/p> 
"\u0000\t\u000B\u000C\u000E!#[]\u007F" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_with_UTF8_boundaries.ttl
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_with_UTF8_boundaries.ttl 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_with_UTF8_boundaries.ttl
index f7e71af..0e1616d 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_with_UTF8_boundaries.ttl
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL2_with_UTF8_boundaries.ttl
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> "€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿¿ð€€ð¿¿¿ñ€€€ó¿¿¿ô€€€ô¿½" .
+<http://a.example/s> <http://a.example/p> "€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿½ð€€ð¿¿½ñ€€€ó¿¿½ô€€€ô¿½" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_ascii_boundaries.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_ascii_boundaries.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_ascii_boundaries.nt
index c373b56..a592b4a 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_ascii_boundaries.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_ascii_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
"\u0000\u0026\u0028\u005b\u005d\u007f" .
+<http://a.example/s> <http://a.example/p> "\u0000&([]\u007F" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_with_UTF8_boundaries.ttl
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_with_UTF8_boundaries.ttl 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_with_UTF8_boundaries.ttl
index 59a7051..e04b675 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_with_UTF8_boundaries.ttl
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG1_with_UTF8_boundaries.ttl
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> '''€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿¿ð€€ð¿¿¿ñ€€€ó¿¿¿ô€€€ô¿½''' .
+<http://a.example/s> <http://a.example/p> '''€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿½ð€€ð¿¿½ñ€€€ó¿¿½ô€€€ô¿½''' .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_ascii_boundaries.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_ascii_boundaries.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_ascii_boundaries.nt
index d6ded6c..2878503 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_ascii_boundaries.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_ascii_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
"\u0000\u0021\u0023\u005b\u005d\u007f" .
+<http://a.example/s> <http://a.example/p> "\u0000!#[]\u007F" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_with_UTF8_boundaries.ttl
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_with_UTF8_boundaries.ttl 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_with_UTF8_boundaries.ttl
index c90d9a0..644b32d 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_with_UTF8_boundaries.ttl
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_LONG2_with_UTF8_boundaries.ttl
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> """€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿¿ð€€ð¿¿¿ñ€€€ó¿¿¿ô€€€ô¿½""" .
+<http://a.example/s> <http://a.example/p> """€߿à 
€à¿¿á€€ì¿¿í€€íŸ¿î€€ï¿½ð€€ð¿¿½ñ€€€ó¿¿½ô€€€ô¿½""" .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_with_UTF8_boundaries.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_with_UTF8_boundaries.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_with_UTF8_boundaries.nt
index cca9c49..47a2527 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_with_UTF8_boundaries.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/LITERAL_with_UTF8_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
"\u0080\u07ff\u0800\u0fff\u1000\ucfff\ud000\ud7ff\ue000\uffff\U00010000\U0003ffff\U00040000\U000fffff\U00100000\U0010fffd"
 .
+<http://a.example/s> <http://a.example/p> 
"\u0080\u07FF\u0800\u0FFF\u1000\uCFFF\uD000\uD7FF\uE000\uFFFD\U00010000\U0003FFFD\U00040000\U000FFFFD\U00100000\U0010FFFD"
 .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
 
b/jena-arq/testing/RIOT/Lang/TurtleStd/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
index 5565430..50be8d6 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
_:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿 .
+<http://a.example/s> <http://a.example/p> 
_:AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽 .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
index 128170b..4b60c9e 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
<http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef\U00010000\U000e01ef>
 .
+<http://a.example/s> <http://a.example/p> 
<http://a.example/AZaz\u00C0\u00D6\u00D8\u00F6\u00F8\u02FF\u0370\u037D\u0384\u1FFE\u200C\u200D\u2070\u2189\u2C00\u2FD5\u3001\uD7FB\uFA0E\uFDC7\uFDF0\uFFEF\U00010000\U000E01EF>
 .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
index b0720fd..78ef108 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
<http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u0384\u1ffe\u200c\u200d\u2070\u2189\u2c00\u2fd5\u3001\ud7fb\ufa0e\ufdc7\ufdf0\uffef>
 .
+<http://a.example/s> <http://a.example/p> 
<http://a.example/AZaz\u00C0\u00D6\u00D8\u00F6\u00F8\u02FF\u0370\u037D\u0384\u1FFE\u200C\u200D\u2070\u2189\u2C00\u2FD5\u3001\uD7FB\uFA0E\uFDC7\uFDF0\uFFEF>
 .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
index 276e405..5b34691 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
@@ -1 +1 @@
-<http://a.example/s> <http://a.example/p> 
<http://a.example/AZaz\u00c0\u00d6\u00d8\u00f6\u00f8\u02ff\u0370\u037d\u037f\u1fff\u200c\u200d\u2070\u218f\u2c00\u2fef\u3001\ud7ff\ufa0e\ufdcf\ufdf0\uffef\U00010000\U000efffd>
 .
+<http://a.example/s> <http://a.example/p> 
<http://a.example/AZaz\u00C0\u00D6\u00D8\u00F6\u00F8\u02FF\u0370\u037D\u037F\u1FFF\u200C\u200D\u2070\u218F\u2C00\u2FEF\u3001\uD7FF\uFA0E\uFDCF\uFDF0\uFFEF\U00010000\U000EFFFD>
 .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_non_leading_extras.nt
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_non_leading_extras.nt 
b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_non_leading_extras.nt
index e27a83b..edd03f7 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_non_leading_extras.nt
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/localName_with_non_leading_extras.nt
@@ -1 +1 @@
-<http://a.example/a·̀ͯ‿.⁀> <http://a.example/p> <http://a.example/o> .
+<http://a.example/a\u00b7\u0300\u036f\u203f\u002e\u2040> <http://a.example/p> 
<http://a.example/o> .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl 
b/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
index f04d58c..7632df4 100644
--- a/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
+++ b/jena-arq/testing/RIOT/Lang/TurtleStd/manifest.ttl
@@ -43,7 +43,6 @@
     <#localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries>
     <#localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries>
     <#localName_with_nfc_PN_CHARS_BASE_character_boundaries>
-#    <#localName_with_PN_CHARS_BASE_character_boundaries>
     <#localName_with_leading_underscore>
     <#localName_with_leading_digit>
     <#localName_with_non_leading_extras>
@@ -119,6 +118,20 @@
     <#repeated_semis_at_end>
     <#repeated_semis_not_at_end>
 
+    # tests requested by Jeremy Carroll
+    # 
http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c35
+    <#comment_following_localName>
+    <#number_sign_following_localName>
+    <#comment_following_PNAME_NS>
+    <#number_sign_following_PNAME_NS>
+
+    # tests from Dave Beckett
+    # 
http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c28
+    <#LITERAL_LONG2_with_REVERSE_SOLIDUS>
+    <#turtle-syntax-bad-LITERAL2_with_langtag_and_datatype>
+    <#two_LITERAL_LONG2s>
+    <#langtagged_LONG_with_subtag>
+
     # original tests-ttl
     <#turtle-syntax-file-01>
     <#turtle-syntax-file-02>
@@ -295,13 +308,6 @@
     <#turtle-eval-bad-03>
     <#turtle-eval-bad-04>
 
-    # tests from Dave Beckett
-    # 
http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c28
-    <#LITERAL_LONG2_with_REVERSE_SOLIDUS>
-    <#turtle-syntax-bad-LITERAL2_with_langtag_and_datatype>
-    <#two_LITERAL_LONG2s>
-    <#langtagged_LONG_with_subtag>
-
     # tests from David Robillard
     # 
http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c21
     <#turtle-syntax-bad-blank-label-dot-end>
@@ -440,14 +446,6 @@
    mf:result    <localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt> ;
    .
 
-<#localName_with_PN_CHARS_BASE_character_boundaries> rdf:type 
rdft:TestTurtleEval ;
-   mf:name      "localName_with_PN_CHARS_BASE_character_boundaries" ;
-   rdfs:comment "localName with PN CHARS BASE character boundaries 
(p:AZazÀÖØöø...)" ;
-   rdft:approval rdft:Rejected ;
-   mf:action    <localName_with_PN_CHARS_BASE_character_boundaries.ttl> ;
-   mf:result    <localName_with_PN_CHARS_BASE_character_boundaries.nt> ;
-   .
-
 <#default_namespace_IRI> rdf:type rdft:TestTurtleEval ;
    mf:name      "default_namespace_IRI" ;
    rdfs:comment "default namespace IRI (:ln)" ;
@@ -2344,6 +2342,40 @@
    mf:action    <turtle-eval-bad-04.ttl> ;
    .
 
+# tests requested by Jeremy Carroll
+# 
http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c35
+<#comment_following_localName> rdf:type rdft:TestTurtleEval ;
+   mf:name      "comment_following_localName" ;
+   rdfs:comment "comment following localName" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <comment_following_localName.ttl> ;
+   mf:result    <IRI_spo.nt> ;
+   .
+
+<#number_sign_following_localName> rdf:type rdft:TestTurtleEval ;
+   mf:name      "number_sign_following_localName" ;
+   rdfs:comment "number sign following localName" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <number_sign_following_localName.ttl> ;
+   mf:result    <number_sign_following_localName.nt> ;
+   .
+
+<#comment_following_PNAME_NS> rdf:type rdft:TestTurtleEval ;
+   mf:name      "comment_following_PNAME_NS" ;
+   rdfs:comment "comment following PNAME_NS" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <comment_following_PNAME_NS.ttl> ;
+   mf:result    <comment_following_PNAME_NS.nt> ;
+   .
+
+<#number_sign_following_PNAME_NS> rdf:type rdft:TestTurtleEval ;
+   mf:name      "number_sign_following_PNAME_NS" ;
+   rdfs:comment "number sign following PNAME_NS" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <number_sign_following_PNAME_NS.ttl> ;
+   mf:result    <number_sign_following_PNAME_NS.nt> ;
+   .
+
 # tests from Dave Beckett
 # 
http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c28
 <#LITERAL_LONG2_with_REVERSE_SOLIDUS> rdf:type rdft:TestTurtleEval ;

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/TurtleStd/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
----------------------------------------------------------------------
diff --git 
a/jena-arq/testing/RIOT/Lang/TurtleStd/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
 
b/jena-arq/testing/RIOT/Lang/TurtleStd/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
index 3a23bb7..bc436bd 100644
--- 
a/jena-arq/testing/RIOT/Lang/TurtleStd/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
+++ 
b/jena-arq/testing/RIOT/Lang/TurtleStd/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
@@ -1,2 +1,2 @@
-@prefix AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿: 
<http://a.example/> .
-<http://a.example/s> <http://a.example/p> 
AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿿:o .
+@prefix AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽: 
<http://a.example/> .
+<http://a.example/s> <http://a.example/p> 
AZazÀÖØöø˿ͰͽͿ῿‌‍⁰↏Ⰰ⿯、퟿豈﷏ﷰ�𐀀󯿽:o .

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/generate
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/generate 
b/jena-arq/testing/RIOT/Lang/generate
deleted file mode 100755
index 049bfee..0000000
--- a/jena-arq/testing/RIOT/Lang/generate
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/perl
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-# Driver : usage: $0 LANG EXT master
-# ** Writes tests to current directory.
-
-use File::Slurp;
-
-if ( $#ARGV != 3 )
-{
-    print STDERR "Usage: $0 LANG EXT EXT2 FILE  > manifest.ttl\n" ;
-    print STDERR "(writes test files to current directory)\n" ;
-    exit 1 ;
-}
-
-$lang  = shift @ARGV ;
-$langt = $lang ;
-$langt =~ s/-//  ;
-$ext   = shift @ARGV ;
-$extR  = shift @ARGV ;
-
-# print STDERR "$lang $langt $ext $extR\n" ;
-
-$testsyngood = 0 ;
-$testsynbad = 0 ;
-$testevalgood = 0 ;
-$testevalbad = 0 ;
-
-$array="" ;
-$tests="" ;
-
-%rootnames = {} ;
-
-$currentRoot = "test" ;
-$rootnames{$currentRoot} = 0 ;
-
-while(<>)
-{
-    if ( /^ROOT=(.*)/ )
-    {
-       $rn = $1 ;
-       $rootnames{$rn} = 0 
-           if ( !defined($rootnames{$rn}) ) ;
-       $currentRoot = $rn ;
-       next ;
-    }
-
-    if ( /^--Eval--/ )
-    {
-       $testType = "rdft:Test${langt}Eval" ;
-       $testevalgood ++ ;
-       $text = &testtext ;
-       ($input,$output) = split(/--Results-- *\n/,$text) ;
-
-##     print "TEST\n" ;
-##     print $text, "\n" ;
-##     print "--------\n" ;
-##     print $input, "\n" ;
-##     print "--------\n" ;
-##     print $output, "\n" ;
-##     print "--------\n" ;
-
-       $x = ++ $rootnames{$currentRoot} ;
-       $x = sprintf("%02d", $x) ;
-       $testname = "$currentRoot-$x" ;
-       $fileIn = "$testname.$ext" ;
-       $fileOut = "$testname.$extR" ;
-       $array .= "    <#$testname>\n" ;
-       open F,">:utf8", $fileIn ;
-       syswrite F, $input ;
-       close F ;
-       open F,">:utf8", $fileOut ;
-       syswrite F, $output ;
-       close F ;
-       $tests .= qq!
-<#$testname> rdf:type $testType ;
-   mf:name    "$testname" ;
-   mf:action    <$fileIn> ;
-   mf:result    <$fileOut> ;
-   .
-! ;
-    }
-
-    if ( /^--Syntax--/ || /^--BadSyntax--/ || /^--BadEval--/ )
-    {
-       if ( /^--Syntax--/ )
-       {
-           $testType = "rdft:Test${langt}PositiveSyntax" ;
-           $testsyngood ++ ;
-       }
-
-       if ( /^--BadSyntax--/ )
-       {
-           $testType = "rdft:Test${langt}NegativeSyntax" ;
-           $testsynbad ++ ;
-       }
-
-       if ( /^--BadEval--/ )
-       {
-           $testType = "rdft:Test${langt}NegativeEval" ;
-           $testsynbad ++ ;
-       }
-
-       $x = ++ $rootnames{$currentRoot} ;
-       $x = sprintf("%02d", $x) ;
-       $testname = "$currentRoot-$x" ;
-       $file = "$testname.$ext" ;
-       $text = &testtext ;
-       $array .= "    <#$testname>\n" ;
-       open F,">:utf8", $file ;
-##     if ( $text !~ /^\s*$/s )
-##     {
-##         syswrite F, "# Licensed under the terms of 
http://www.apache.org/licenses/LICENSE-2.0\n"; ;
-##         syswrite F, "\n" ;
-##     }
-       syswrite F, $text ;
-       
-       close F ;
-       $tests .= qq!
-<#$testname> rdf:type $testType ;
-   mf:name    "$testname" ;
-   mf:action    <$file> ;
-   .
-! ;
-    }
-}
-
-open MANIFEST, ">:utf8", "manifest.ttl" ;
-$LTEXT = read_file( "LICENSE" , binmode => ':utf8' ) ;
-syswrite MANIFEST, $LTEXT ;
-
-print MANIFEST q!
-@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#> .
-
-@prefix rdft:   <http://www.w3.org/ns/rdftest#> .
-!;
-
-print MANIFEST qq!
-<>  rdf:type mf:Manifest ;
-    rdfs:comment "${lang} tests" ;
-    mf:entries
-    (
-!;
-print MANIFEST $array ;
-print MANIFEST qq!    ) .\n! ;
-
-print MANIFEST $tests ;
-
-sub testtext
-{
-    $text = "" ;
-    while(<>)
-    {
-       last if ( /^--End--$/ ) ;
-       $text .= $_ ;
-    }
-    return $text
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/5f215fbe/jena-arq/testing/RIOT/Lang/manifest-all.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/manifest-all.ttl 
b/jena-arq/testing/RIOT/Lang/manifest-all.ttl
index 5c803a6..db32dab 100644
--- a/jena-arq/testing/RIOT/Lang/manifest-all.ttl
+++ b/jena-arq/testing/RIOT/Lang/manifest-all.ttl
@@ -9,10 +9,13 @@
         <N-Triples/manifest.ttl>
         ## <N-Quads/manifest.ttl>
 
-        <TurtleStd/manifest.ttl>    # W3C test suite
         <Turtle2/manifest.ttl>      ## Long tests
         <TurtleSubm/manifest.ttl>
 
         <RDF-JSON/manifest.ttl>
-        ## <TrigStd/manifest.ttl>   # W3C Test Suite
+
+        <NTriplesStd/manifest.ttl>
+        <NQuadsStd/manifest.ttl>
+        <TurtleStd/manifest.ttl>    # W3C test suite
+        <TrigStd/manifest.ttl>   # W3C Test Suite
        ).

Reply via email to