Skip to content

Commit 06fb431

Browse files
committed
Update RDF 1.2 semantics tests for triple terms not quoted triples.
1 parent f0102ad commit 06fb431

36 files changed

+170
-175
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b "42"^^xsd:integer >> :p1 :o1.
4+
:a1 :p1 <<( :a :b "42"^^xsd:integer )>>.

rdf/rdf12/rdf-semantics/index.html

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b "hello"@en-us >> :p1 :o1.
4+
:a1 :p1 <<( :a :b "hello"@en-us )>>.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b "c"^^xsd:integer >> :p1 :o1.
5-
<< :d :b "c"^^xsd:integer >> :p2 :o2.
4+
:a1 :p1 <<( :a :b "c"^^xsd:integer )>>.
5+
:a2 :p2 <<( :d :b "c"^^xsd:integer )>>.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b _:x >> :p1 :o1.
5-
<< :d :b _:x >> :p2 :o2.
4+
:a1 :p1 <<( :a :b _:x )>>.
5+
:a2 :p2 <<( :d :b _:x )>>.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b "c"^^xsd:integer >> :p1 :o1.
5-
<< :d :b "d"^^xsd:integer >> :p2 :o2.
4+
:a1 :p1 <<( :a :b "c"^^xsd:integer )>>.
5+
:a2 :p2 <<( :d :b "d"^^xsd:integer )>>.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b _:x >> :p1 :o1.
5-
<< :d :b _:x >> :p2 :o2.
4+
:a1 :p1 <<( :a :b _:x )>>.
5+
:a2 :p2 <<( :d :b _:x )>>.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b "d"^^xsd:integer >> :p1 :o1.
4+
:a1 :p1 <<( :a :b "c"^^xsd:integer )>>..
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
prefix : <http://example.com/ns#>
22
prefix xsd: <http://www.w3.org/2001/XMLSchema#>
33

4-
<< :a :b "c"^^xsd:integer >> :p1 :o1.
4+
:a1 :p1 <<( :a :b "c"^^xsd:integer )>>..

rdf/rdf12/rdf-semantics/manifest.ttl

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ trs:manifest a mf:Manifest;
3737
""";
3838
rdfs:seeAlso <README>;
3939
mf:entries (
40-
trs:all-identical-quoted-triples-are-the-same
41-
trs:quoted-triples-no-spurious
42-
trs:bnodes-in-quoted-subject
43-
trs:bnodes-in-quoted-object
44-
trs:bnodes-in-quoted-subject-and-object
45-
trs:bnodes-in-quoted-subject-and-object-fail
46-
trs:same-bnode-same-quoted-term
47-
trs:different-bnodes-same-quoted-term
48-
trs:constrained-bnodes-in-quoted-subject
49-
trs:constrained-bnodes-in-quoted-object
50-
trs:constrained-bnodes-in-quoted-fail
40+
trs:all-identical-triple-terms-are-the-same
41+
trs:triple-terms-no-spurious
42+
trs:bnodes-in-triple-term-subject
43+
trs:bnodes-in-triple-term-object
44+
trs:bnodes-in-triple-term-subject-and-object
45+
trs:bnodes-in-triple-term-subject-and-object-fail
46+
trs:same-bnode-same-triple-term
47+
trs:different-bnodes-same-triple-term
48+
trs:constrained-bnodes-in-triple-term-subject
49+
trs:constrained-bnodes-in-triple-term-object
50+
trs:constrained-bnodes-in-triple-term-fail
5151
trs:constrained-bnodes-on-literal
5252
trs:malformed-literal-control
5353
trs:malformed-literal
@@ -60,7 +60,7 @@ trs:manifest a mf:Manifest;
6060
trs:opaque-language-string
6161
trs:opaque-iri-control
6262
trs:opaque-iri
63-
trs:quoted-not-asserted
63+
trs:triple-term-not-asserted
6464
trs:annotated-asserted
6565
trs:annotation
6666
trs:annotation-unfolded
@@ -81,11 +81,11 @@ trs:manifest a mf:Manifest;
8181
trs:double-infinity
8282
) .
8383

84-
trs:all-identical-quoted-triples-are-the-same a mf:PositiveEntailmentTest;
85-
rdfs:comment "Multiple occurences of the same quoted triples are undistinguishable in the abstract model.";
84+
trs:all-identical-triple-terms-are-the-same a mf:PositiveEntailmentTest;
85+
rdfs:comment "Multiple occurences of the same triple terms are undistinguishable in the abstract model.";
8686
mf:action <test001a.ttl>;
8787
mf:entailmentRegime "simple";
88-
mf:name "all-identical-quoted-triples-are-the-same";
88+
mf:name "all-identical-triple-terms-are-the-same";
8989
mf:recognizedDatatypes ();
9090
mf:result <test001r.ttl>;
9191
mf:unrecognizedDatatypes ();
@@ -102,7 +102,7 @@ trs:annotated-asserted a mf:PositiveEntailmentTest;
102102
test:approval test:NotClassified .
103103

104104
trs:annotation a mf:PositiveEntailmentTest;
105-
rdfs:comment "Annotation are about the annotated triple.";
105+
rdfs:comment "Annotation are about the reifying triple.";
106106
mf:action <test007a.ttl>;
107107
mf:entailmentRegime "simple";
108108
mf:name "annotation";
@@ -121,78 +121,78 @@ trs:annotation-unfolded a mf:PositiveEntailmentTest;
121121
mf:unrecognizedDatatypes ();
122122
test:approval test:NotClassified .
123123

124-
trs:bnodes-in-quoted-object a mf:PositiveEntailmentTest;
125-
rdfs:comment "Terms inside quoted triples can be replaced by fresh bnodes.";
124+
trs:bnodes-in-triple-term-object a mf:PositiveEntailmentTest;
125+
rdfs:comment "Terms inside triple terms can be replaced by fresh bnodes.";
126126
mf:action <test002a.ttl>;
127127
mf:entailmentRegime "simple";
128-
mf:name "bnodes-in-quoted-object";
128+
mf:name "bnodes-in-triple-term-object";
129129
mf:recognizedDatatypes ();
130130
mf:result <test002or.ttl>;
131131
mf:unrecognizedDatatypes ();
132132
test:approval test:NotClassified .
133133

134-
trs:bnodes-in-quoted-subject a mf:PositiveEntailmentTest;
135-
rdfs:comment "Terms inside quoted triples can be replaced by fresh bnodes.";
134+
trs:bnodes-in-triple-term-subject a mf:PositiveEntailmentTest;
135+
rdfs:comment "Terms inside triple terms can be replaced by fresh bnodes.";
136136
mf:action <test002a.ttl>;
137137
mf:entailmentRegime "simple";
138-
mf:name "bnodes-in-quoted-subject";
138+
mf:name "bnodes-in-triple-term-subject";
139139
mf:recognizedDatatypes ();
140140
mf:result <test002sr.ttl>;
141141
mf:unrecognizedDatatypes ();
142142
test:approval test:NotClassified .
143143

144-
trs:bnodes-in-quoted-subject-and-object a mf:PositiveEntailmentTest;
145-
rdfs:comment "Terms inside quoted triples can be replaced by fresh bnodes.";
144+
trs:bnodes-in-triple-term-subject-and-object a mf:PositiveEntailmentTest;
145+
rdfs:comment "Terms inside triple terms can be replaced by fresh bnodes.";
146146
mf:action <test002a.ttl>;
147147
mf:entailmentRegime "simple";
148-
mf:name "bnodes-in-quoted-subject-and-object";
148+
mf:name "bnodes-in-triple-term-subject-and-object";
149149
mf:recognizedDatatypes ();
150150
mf:result <test002sor.ttl>;
151151
mf:unrecognizedDatatypes ();
152152
test:approval test:NotClassified .
153153

154-
trs:bnodes-in-quoted-subject-and-object-fail a mf:NegativeEntailmentTest;
155-
rdfs:comment "The same bnode can not match different quoted terms.";
154+
trs:bnodes-in-triple-term-subject-and-object-fail a mf:NegativeEntailmentTest;
155+
rdfs:comment "The same bnode can not match different triple terms.";
156156
mf:action <test002a.ttl>;
157157
mf:entailmentRegime "simple";
158-
mf:name "bnodes-in-quoted-subject-and-object-fail";
158+
mf:name "bnodes-in-triple-term-subject-and-object-fail";
159159
mf:recognizedDatatypes ();
160160
mf:result <test002sbr.ttl>;
161161
mf:unrecognizedDatatypes ();
162162
test:approval test:NotClassified .
163163

164-
trs:constrained-bnodes-in-quoted-fail a mf:NegativeEntailmentTest;
165-
rdfs:comment "Quoted bnode identifiers share the same scope as non-quoted ones. A bnode that occurs both inside quoted triples and inside asserted triples must satisfy all occurrences at the same time.";
164+
trs:constrained-bnodes-in-triple-term-fail a mf:NegativeEntailmentTest;
165+
rdfs:comment "Quoted bnode identifiers share the same scope as non-quoted ones. A bnode that occurs both inside triple terms and inside asserted triples must satisfy all occurrences at the same time.";
166166
mf:action <test004a.ttl>;
167167
mf:entailmentRegime "simple";
168-
mf:name "constrained-bnodes-in-quoted-fail";
168+
mf:name "constrained-bnodes-in-triple-term-fail";
169169
mf:recognizedDatatypes ();
170170
mf:result <test004fr.ttl>;
171171
mf:unrecognizedDatatypes ();
172172
test:approval test:NotClassified .
173173

174-
trs:constrained-bnodes-in-quoted-object a mf:PositiveEntailmentTest;
175-
rdfs:comment "Terms inside and outside quoted triples can be replaced by fresh bnodes.";
174+
trs:constrained-bnodes-in-triple-term-object a mf:PositiveEntailmentTest;
175+
rdfs:comment "Terms inside and outside triple terms can be replaced by fresh bnodes.";
176176
mf:action <test004a.ttl>;
177177
mf:entailmentRegime "simple";
178-
mf:name "constrained-bnodes-in-quoted-object";
178+
mf:name "constrained-bnodes-in-triple-term-object";
179179
mf:recognizedDatatypes ();
180180
mf:result <test004or.ttl>;
181181
mf:unrecognizedDatatypes ();
182182
test:approval test:NotClassified .
183183

184-
trs:constrained-bnodes-in-quoted-subject a mf:PositiveEntailmentTest;
185-
rdfs:comment "Terms inside and outside quoted triples can be replaced by fresh bnodes";
184+
trs:constrained-bnodes-in-triple-term-subject a mf:PositiveEntailmentTest;
185+
rdfs:comment "Terms inside and outside triple terms can be replaced by fresh bnodes";
186186
mf:action <test004a.ttl>;
187187
mf:entailmentRegime "simple";
188-
mf:name "constrained-bnodes-in-quoted-subject";
188+
mf:name "constrained-bnodes-in-triple-term-subject";
189189
mf:recognizedDatatypes ();
190190
mf:result <test004sr.ttl>;
191191
mf:unrecognizedDatatypes ();
192192
test:approval test:NotClassified .
193193

194194
trs:constrained-bnodes-on-literal a mf:PositiveEntailmentTest;
195-
rdfs:comment "Literals inside and outside quoted triples can be replaced by fresh bnodes.";
195+
rdfs:comment "Literals inside and outside triple terms can be replaced by fresh bnodes.";
196196
mf:action <test006a.ttl>;
197197
mf:entailmentRegime "simple";
198198
mf:name "constrained-bnodes-on-literal";
@@ -201,27 +201,27 @@ trs:constrained-bnodes-on-literal a mf:PositiveEntailmentTest;
201201
mf:unrecognizedDatatypes ();
202202
test:approval test:NotClassified .
203203

204-
trs:different-bnodes-same-quoted-term a mf:PositiveEntailmentTest;
205-
rdfs:comment "Different bnodes can match identical quoted terms.";
204+
trs:different-bnodes-same-triple-term a mf:PositiveEntailmentTest;
205+
rdfs:comment "Different bnodes can match identical triple terms.";
206206
mf:action <test003a.ttl>;
207207
mf:entailmentRegime "simple";
208-
mf:name "different-bnodes-same-quoted-term";
208+
mf:name "different-bnodes-same-triple-term";
209209
mf:recognizedDatatypes ();
210210
mf:result <test002sor.ttl>;
211211
mf:unrecognizedDatatypes ();
212212
test:approval test:NotClassified .
213213

214-
trs:quoted-not-asserted a mf:NegativeEntailmentTest;
215-
rdfs:comment "Quoted triples are not asserted.";
214+
trs:triple-term-not-asserted a mf:NegativeEntailmentTest;
215+
rdfs:comment "Triple terms are not asserted.";
216216
mf:action <test002a.ttl>;
217217
mf:entailmentRegime "simple";
218-
mf:name "quoted-not-asserted";
218+
mf:name "triple-term-not-asserted";
219219
mf:recognizedDatatypes ();
220220
mf:result <test002pgr.ttl>;
221221
mf:unrecognizedDatatypes ();
222222
test:approval test:NotClassified .
223223

224-
trs:quoted-triples-no-spurious a mf:NegativeEntailmentTest;
224+
trs:triple-terms-no-spurious a mf:NegativeEntailmentTest;
225225
rdfs:comment "This test ensures that other entailments are not spurious.";
226226
mf:action <test002a.ttl>;
227227
mf:entailmentRegime "simple";
@@ -232,7 +232,7 @@ trs:quoted-triples-no-spurious a mf:NegativeEntailmentTest;
232232
test:approval test:NotClassified .
233233

234234
trs:malformed-literal a mf:NegativeEntailmentTest;
235-
rdfs:comment "Malformed literals are allowed when quoted.";
235+
rdfs:comment "Malformed literals are allowed when in triple terms.";
236236
mf:action <malformed-literal.ttl>;
237237
mf:entailmentRegime "RDF";
238238
mf:name "malformed-literal";
@@ -242,7 +242,7 @@ trs:malformed-literal a mf:NegativeEntailmentTest;
242242
test:approval test:NotClassified .
243243

244244
trs:malformed-literal-accepted a mf:PositiveEntailmentTest;
245-
rdfs:comment "Malformed literals are allowed when quoted.";
245+
rdfs:comment "Malformed literals are allowed when in triple terms.";
246246
mf:action <malformed-literal.ttl>;
247247
mf:entailmentRegime "RDF";
248248
mf:name "malformed-literal-accepted";
@@ -302,7 +302,7 @@ trs:malformed-literal-control a mf:PositiveEntailmentTest;
302302
test:approval test:NotClassified .
303303

304304
trs:malformed-literal-no-spurious a mf:NegativeEntailmentTest;
305-
rdfs:comment "Quoted malformed literals do not lead to spurious entailment.";
305+
rdfs:comment "Malformed literals within triple terms do not lead to spurious entailment.";
306306
mf:action <malformed-literal.ttl>;
307307
mf:entailmentRegime "RDF";
308308
mf:name "malformed-literal-no-spurious";
@@ -312,7 +312,7 @@ trs:malformed-literal-no-spurious a mf:NegativeEntailmentTest;
312312
test:approval test:NotClassified .
313313

314314
trs:opaque-iri a mf:NegativeEntailmentTest;
315-
rdfs:comment "Quoted IRIs are opaque.";
315+
rdfs:comment "Triple term IRIs are opaque.";
316316
mf:action <superman.ttl>;
317317
mf:entailmentRegime "RDFS-Plus";
318318
mf:name "opaque-iri";
@@ -332,7 +332,7 @@ trs:opaque-iri-control a mf:PositiveEntailmentTest;
332332
test:approval test:NotClassified .
333333

334334
trs:opaque-language-string a mf:NegativeEntailmentTest;
335-
rdfs:comment "Quoted literals (including language strings) are opaque, even when their datatype is recognized.";
335+
rdfs:comment "Literals within reifying terms (including language strings) are opaque, even when their datatype is recognized.";
336336
mf:action <lowercase-language-string.ttl>;
337337
mf:entailmentRegime "RDF";
338338
mf:name "opaque-language-string";
@@ -352,7 +352,7 @@ trs:opaque-language-string-control a mf:PositiveEntailmentTest;
352352
test:approval test:NotClassified .
353353

354354
trs:opaque-literal a mf:NegativeEntailmentTest;
355-
rdfs:comment "Quoted literals are opaque, even when their datatype is recognized.";
355+
rdfs:comment "Literals within triple terms are opaque, even when their datatype is recognized.";
356356
mf:action <non-canonical-literal.ttl>;
357357
mf:entailmentRegime "RDF";
358358
mf:name "opaque-literal";
@@ -371,8 +371,8 @@ trs:opaque-literal-control a mf:PositiveEntailmentTest;
371371
mf:unrecognizedDatatypes ();
372372
test:approval test:NotClassified .
373373

374-
trs:same-bnode-same-quoted-term a mf:PositiveEntailmentTest;
375-
rdfs:comment "Identical quoted term can be replaced by the same fresh bnode multiple times.";
374+
trs:same-bnode-same-triple-term a mf:PositiveEntailmentTest;
375+
rdfs:comment "Identical triple term can be replaced by the same fresh bnode multiple times.";
376376
mf:action <test003a.ttl>;
377377
mf:entailmentRegime "simple";
378378
mf:name "same-bnode-same-quoted-term";
@@ -382,7 +382,7 @@ trs:same-bnode-same-quoted-term a mf:PositiveEntailmentTest;
382382
test:approval test:NotClassified .
383383

384384
trs:triple-in-object a mf:PositiveEntailmentTest;
385-
rdfs:comment "Quoted triples can appear in object position (withdrawn, as it belongs to concrete syntax test-suites).";
385+
rdfs:comment "Triple terms can appear in object position (withdrawn, as it belongs to concrete syntax test-suites).";
386386
mf:action <test000o.ttl>;
387387
mf:entailmentRegime "simple";
388388
mf:name "triple-in-object";

0 commit comments

Comments
 (0)