This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit e87afae13b7ac2b1ae5f27712e27a38a9c9d21a2 Author: Andy Seaborne <[email protected]> AuthorDate: Wed Apr 8 09:14:57 2026 +0100 C14N tests from rdf-tests; local NodeFormtter tests --- .../java/org/apache/jena/riot/out/TestNodeFmt.java | 23 +++++++++++----------- .../rdf-n-quads/c14n/dirlangtagged_string-c14n.nq | 2 +- .../rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq | 2 +- .../c14n/dirlangtagged_string-c14n.nt | 2 +- .../rdf-n-triples/c14n/dirlangtagged_string.nt | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java index 866edda51d..b1383ca956 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java @@ -110,15 +110,17 @@ public class TestNodeFmt // C14N -- Canonicalization. Java escaping make this messy. private static Node blankNode = NodeFactory.createBlankNode("ABC"); - @Test public void nodefmt_c14n_00() { test(nodeFormatterC14N, "'--\\u0009--'", "\"--\\t--\""); } - @Test public void nodefmt_c14n_01() { test(nodeFormatterC14N, "'--\\u0008\\u0009\\u000A\\u000C\\u000D\\u0022\\u005C--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); } - @Test public void nodefmt_c14n_02() { test(nodeFormatterC14N, "'--\\b\\t\\n\\f\\r\\\"\\\\--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); } - @Test public void nodefmt_c14n_03() { test(nodeFormatterC14N, "'xyz'@EN-GB--ltr", "\"xyz\"@en-gb--ltr"); } - @Test public void nodefmt_c14n_04() { test(nodeFormatterC14N, "'\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F'", - "\"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F\""); } - @Test public void nodefmt_c14n_05() { test(nodeFormatterC14N, "'\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F'", - "\"\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F\""); } - @Test public void nodefmt_c14n_06() { test(nodeFormatterC14N, blankNode, "_:ABC"); } + @Test public void nodefmt_c14n_00() { test(nodeFormatterC14N, "'--\\u0009--'", "\"--\\t--\""); } + @Test public void nodefmt_c14n_01() { test(nodeFormatterC14N, "'--\\u0008\\u0009\\u000A\\u000C\\u000D\\u0022\\u005C--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); } + @Test public void nodefmt_c14n_02() { test(nodeFormatterC14N, "'--\\b\\t\\n\\f\\r\\\"\\\\--'", "\"--\\b\\t\\n\\f\\r\\\"\\\\--\""); } + @Test public void nodefmt_c14n_03() { test(nodeFormatterC14N, "'xyz'@EN-GB--ltr", "\"xyz\"@en-gb--ltr"); } + @Test public void nodefmt_c14n_04() { test(nodeFormatterC14N, "'\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F'", + "\"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\u000B\\u007F\""); } + @Test public void nodefmt_c14n_05() { test(nodeFormatterC14N, "'\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F'", + "\"\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0015\\u0016\\u0017\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001F\""); } + @Test public void nodefmt_c14n_06() { test(nodeFormatterC14N, blankNode, "_:ABC"); } + + // Turtle @Test public void nodefmt_ttl_01() { test(nodeFormatterTTL, "?x"); } @Test public void nodefmt_ttl_02() { test(nodeFormatterTTL, "?xyz"); } @@ -155,8 +157,7 @@ public class TestNodeFmt @Test public void prefixedname_01() { testPrefix("", ""); } - private void testPrefix(String prefix, String local) - { + private void testPrefix(String prefix, String local) { assertTrue(NodeFormatterTTL.safeForPrefix(prefix)); assertTrue(NodeFormatterTTL.safeForPrefixLocalname(local)); } diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq index 73c8ed0ba3..0bbc63ac86 100644 --- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq +++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string-c14n.nq @@ -1 +1 @@ -<http://a.example/s> <http://a.example/p> "chat"@en--ltr <http://example/g> . +<http://a.example/s> <http://a.example/p> "chat"@en-gb--ltr <http://example/g> . diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq index 99f3562966..47f62f384d 100644 --- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq +++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-quads/c14n/dirlangtagged_string.nq @@ -1 +1 @@ -<http://a.example/s> <http://a.example/p> "chat"@EN--ltr <http://example/g> . +<http://a.example/s> <http://a.example/p> "chat"@EN-GB--ltr <http://example/g> . diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt index 56ed7892a7..96c09f99e8 100644 --- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt +++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string-c14n.nt @@ -1 +1 @@ -<http://a.example/s> <http://a.example/p> "chat"@en--ltr . +<http://a.example/s> <http://a.example/p> "chat"@en-gb--ltr . diff --git a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt index 87df8ad141..8ec90b00a5 100644 --- a/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt +++ b/jena-arq/testing/rdf-tests-cg/rdf/rdf12/rdf-n-triples/c14n/dirlangtagged_string.nt @@ -1 +1 @@ -<http://a.example/s> <http://a.example/p> "chat"@EN--ltr . +<http://a.example/s> <http://a.example/p> "chat"@EN-GB--ltr .
