Merge pull request #247 from dachafra/test-cases

dachafra · web-flow · commit b253ea7dd48e · 2025-11-07T12:36:17.000+01:00
proposal to fix IRI, URI and UnsafeIRI tests
diff --git a/spec/section/termmap.md b/spec/section/termmap.md
@@ -282,10 +282,6 @@ The value MUST be an [=IRI=] and MUST be one of the following options:
 * If the term map is an [=object map=]: `rml:IRI`, `rml:URI`, `rml:BlankNode`, or `rml:Literal`
 * If the term map is a [=graph map=]: `rml:IRI`, `rml:URI`
 
-<aside class="note">
-When [=URIs=] are generated from [=string templates=], RML performs percent-encoding in the same way as for [=IRIs=].
-To generate [=URIs=] without applying percent-encoding, the [=term map=] MUST have a [=term type=] of rml:UnsafeURI.
-</aside>
 
 ### Default Term Types
 
diff --git a/test-cases/RMLTC0027a-JSON/README.md b/test-cases/RMLTC0027a-JSON/README.md
@@ -15,7 +15,7 @@
     {"Name": "Alice"},
     {"Name": "Bob"},
     {"Name": "Bob/Charles"},
-    {"Name": "Danny"},
+    {"Name": "Zoë Krüger"},
     {"Name": "Emily Smith"}
   ]
 }
@@ -53,7 +53,7 @@
 <http://example.com/Person/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://example.com/Person/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://example.com/Person/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Zo%C3%AB%20Kr%C3%BCger> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://example.com/Person/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 
 ```
diff --git a/test-cases/RMLTC0027a-JSON/output.nq b/test-cases/RMLTC0027a-JSON/output.nq
@@ -1,5 +1,5 @@
 <http://example.com/Person/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://example.com/Person/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://example.com/Person/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Zo%C3%AB%20Kr%C3%BCger> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 <http://example.com/Person/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
diff --git a/test-cases/RMLTC0027a-JSON/student.json b/test-cases/RMLTC0027a-JSON/student.json
@@ -3,7 +3,7 @@
     {"Name": "Alice"},
     {"Name": "Bob"},
     {"Name": "Bob/Charles"},
-    {"Name": "Danny"},
+    {"Name": "Zoë Krüger"},
     {"Name": "Emily Smith"}
   ]
 }
diff --git a/test-cases/RMLTC0027b-JSON/README.md b/test-cases/RMLTC0027b-JSON/README.md
@@ -1,8 +1,8 @@
 ## RMLTC0027b-JSON
 
-**Title**: "Generation of triples using the UnsafeURI term type"
+**Title**: "Generation of triples using the UnsafeIRI term type"
 
-**Description**: "Tests the generation of triples with a UnsafeURI term type in the subject or object"
+**Description**: "Tests the generation of triples with a UnsafeIRI term type in the subject or object"
 
 **Default Base IRI**: http://example.com/
 
@@ -12,11 +12,9 @@
 ```
 {
   "students": [
-    {"Name": "Alice"},
-    {"Name": "Bob"},
     {"Name": "Bob/Charles"},
-    {"Name": "Danny"},
-    {"Name": "Emily Smith"}
+    {"Name": "Emily Smith"},
+    {"Name": "Zoë Krüger"}
   ]
 }
 
@@ -43,18 +41,16 @@
     ];
   rml:subjectMap [
       rml:template "http://example.com/Person/{$.Name}";
-      rml:termType rml:UnsafeURI
+      rml:termType rml:UnsafeIRI
     ] .
 
 ```
 
 **Output**
 ```
-<http://example.com/Person/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Bob/Charles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Emily Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Zoë Krüger> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
 
 ```
 
diff --git a/test-cases/RMLTC0027b-JSON/mapping.ttl b/test-cases/RMLTC0027b-JSON/mapping.ttl
@@ -17,5 +17,5 @@
     ];
   rml:subjectMap [
       rml:template "http://example.com/Person/{$.Name}";
-      rml:termType rml:UnsafeURI
+      rml:termType rml:UnsafeIRI
     ] .
diff --git a/test-cases/RMLTC0027b-JSON/output.nq b/test-cases/RMLTC0027b-JSON/output.nq
@@ -1,5 +1,3 @@
-<http://example.com/Person/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Bob/Charles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Emily Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Zoë Krüger> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
diff --git a/test-cases/RMLTC0027b-JSON/student.json b/test-cases/RMLTC0027b-JSON/student.json
@@ -1,9 +1,7 @@
 {
   "students": [
-    {"Name": "Alice"},
-    {"Name": "Bob"},
     {"Name": "Bob/Charles"},
-    {"Name": "Danny"},
-    {"Name": "Emily Smith"}
+    {"Name": "Emily Smith"},
+    {"Name": "Zoë Krüger"}
   ]
 }
diff --git a/test-cases/RMLTC0027c-JSON/README.md b/test-cases/RMLTC0027c-JSON/README.md
@@ -1,8 +1,8 @@
 ## RMLTC0027c-JSON
 
-**Title**: "Generation of triples using the UnsafeIRI term type"
+**Title**: "Generation an IRI using the term type IRI"
 
-**Description**: "Tests the generation of triples with a UnsafeIRI term type in the subject or object"
+**Description**: "Tests the generation of triples with a IRI term type in the subject"
 
 **Default Base IRI**: http://example.com/
 
@@ -12,11 +12,7 @@
 ```
 {
   "students": [
-    {"Name": "Alice"},
-    {"Name": "Bob"},
-    {"Name": "Bob/Charles"},
-    {"Name": "Danny"},
-    {"Name": "Emily Smith"}
+    {"Name": "Zoë Krüger"}
   ]
 }
 
@@ -43,18 +39,15 @@
     ];
   rml:subjectMap [
       rml:template "http://example.com/Person/{$.Name}";
-      rml:termType rml:UnsafeIRI
+      rml:termType rml:IRI
     ] .
 
 ```
 
 **Output**
 ```
-<http://example.com/Person/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Zoë%20Krüger> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+
 
 ```
 
diff --git a/test-cases/RMLTC0027c-JSON/mapping.ttl b/test-cases/RMLTC0027c-JSON/mapping.ttl
@@ -17,5 +17,5 @@
     ];
   rml:subjectMap [
       rml:template "http://example.com/Person/{$.Name}";
-      rml:termType rml:UnsafeIRI
+      rml:termType rml:IRI
     ] .
diff --git a/test-cases/RMLTC0027c-JSON/output.nq b/test-cases/RMLTC0027c-JSON/output.nq
@@ -1,5 +1,2 @@
-<http://example.com/Person/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Person/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Person/Zoë%20Krüger> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+
diff --git a/test-cases/RMLTC0027c-JSON/student.json b/test-cases/RMLTC0027c-JSON/student.json
@@ -1,9 +1,5 @@
 {
   "students": [
-    {"Name": "Alice"},
-    {"Name": "Bob"},
-    {"Name": "Bob/Charles"},
-    {"Name": "Danny"},
-    {"Name": "Emily Smith"}
+    {"Name": "Zoë Krüger"}
   ]
 }
diff --git a/test-cases/descriptions.csv b/test-cases/descriptions.csv
@@ -57,8 +57,8 @@ RMLTC0026b-JSON,"Two triples maps, one with rml:baseIRI one one without and gene
 RMLTC0026c-JSON,"Two triples maps, both with rml:baseIRI defined","Tests the generation of triples using relative IRIs with base IRIs defined only in triples maps, without base IRI parameter"
 RMLTC0026d-JSON,"Two triples maps,both with rml:bseIRI defined and baseIRI parameter defined",Tests the generation of triples by with base IRIs different than the base IRI parameter
 RMLTC0027a-JSON,Generation of triples using the URI term type,Tests the generation of triples with a URI term type in the subject or object
-RMLTC0027b-JSON,Generation of triples using the UnsafeURI term type,Tests the generation of triples with a UnsafeURI term type in the subject or object
-RMLTC0027c-JSON,Generation of triples using the UnsafeIRI term type,Tests the generation of triples with a UnsafeIRI term type in the subject or object
+RMLTC0027b-JSON,Generation of triples using the UnsafeIRI term type,Tests the generation of triples with a UnsafeIRI term type in the subject or object
+RMLTC0027c-JSON,Generation an IRI using the term type IRI,Tests the generation of triples with a IRI term type in the subject
 RMLTC0028a-JSON,Generation of the right datatype for a constant in the mapping,Test the honoring of the datatype specified by the constant term in the mapping
 RMLTC0028b-JSON,Generation of all named graphs when rml:defaultGraph is involved,Test if the default graph is also generated correctly.
 RMLTC0028c-JSON,Generation of the right language tag for a constant in the mapping,Test the honoring of the language tag specified by the constant term in the mapping
diff --git a/test-cases/docs/20251107/index.html b/test-cases/docs/20251107/index.html
diff --git a/test-cases/docs/index.html b/test-cases/docs/index.html
diff --git a/test-cases/metadata.csv b/test-cases/metadata.csv

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{"Name": "Alice"},`
`4`	`4`	`{"Name": "Bob"},`
`5`	`5`	`{"Name": "Bob/Charles"},`
`6`		`- {"Name": "Danny"},`
	`6`	`+ {"Name": "Zoë Krüger"},`
`7`	`7`	`{"Name": "Emily Smith"}`
`8`	`8`	`]`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"students": [`
`3`		`- {"Name": "Alice"},`
`4`		`- {"Name": "Bob"},`
`5`	`3`	`{"Name": "Bob/Charles"},`
`6`		`- {"Name": "Danny"},`
`7`		`- {"Name": "Emily Smith"}`
	`4`	`+ {"Name": "Emily Smith"},`
	`5`	`+ {"Name": "Zoë Krüger"}`
`8`	`6`	`]`
`9`	`7`	`}`