Skip to content

Commit 681767f

Browse files
gkellogggkellogg
committed
Fix annotation tests and issues with reverse relationships.
1 parent e6e004c commit 681767f

33 files changed

+102
-151
lines changed

‎tests/flatten-manifest.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
"name": "Annotation node 5 (with @annotation)",
175175
"purpose": "Node with @annotation property containing an empty node object",
176176
"input": "flatten/st20b-in.jsonld",
177-
"expect": "flatten/st20b-out.jsonld",
177+
"expect": "flatten/st20bn-out.jsonld",
178178
"requires": "JSON-LD-star",
179179
"option": {"specVersion": "json-ld-star", "rdfstar": true, "createAnnotations": true}
180180
}, {

‎tests/flatten/st19n-out.jsonld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"ex:knows": [{
55
"@id": "ex:fred",
66
"@annotation": [{
7+
"@id": "_:b1",
78
"ex:certainty": [{"@value": 0.8}]
89
}]
910
}]

‎tests/flatten/st20bn-out.jsonld

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[{
2+
"@id": "ex:bob",
3+
"ex:name": [{"@value": "Bob"}],
4+
"ex:knows": [{
5+
"@id": "ex:fred",
6+
"@annotation": [{"@id": "_:b1"}]
7+
}]
8+
}, {
9+
"@id": "ex:fred",
10+
"ex:name": [{"@value": "Fred"}]
11+
}]

‎tests/flatten/st20n-out.jsonld

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
"ex:knows": [{
55
"@id": "ex:fred",
66
"@annotation": [{
7-
"@id": "_:bn1",
8-
"ex:certainty": [{"@value": 0.8}],
7+
"@id": "_:b1",
8+
"ex:certainty": [{"@value": 0.8}]
9+
}, {
10+
"@id": "_:b3",
911
"ex:source": [{"@id": "http://example.org/"}]
1012
}]
1113
}]

‎tests/flatten/st28n-out.jsonld

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[{
2-
"@id": "_:rei",
3-
"@reifies": {
2+
"@id": "_:b2",
3+
"@reifies": [{
44
"@id": "ex:rei",
5-
"ex:prop": [{"@id": "_:b0"}]
6-
},
5+
"ex:prop": [{"@id": "_:b1"}]
6+
}],
77
"ex:prop": [{
88
"@value": "value2",
99
"@annotation": [{
10-
"@id": "_:bn1",
10+
"@id": "_:b4",
1111
"ex:certainty": [{"@value": 0.8}]
1212
}]
1313
}]

‎tests/flatten/st29n-out.jsonld

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
[{
22
"@id": "ex:subj",
3-
"ex:value": [{"@id": "_:bn0"}]
4-
}, {
5-
"@id": {
6-
"@id": "ex:rei",
7-
"ex:prop": [{"@value": "value"}]
8-
},
3+
"ex:value": [{
4+
"@id": "_:b0",
95
"@annotation": [{
6+
"@id": "_:b2",
107
"ex:certainty": [{"@value": 0.8}]
118
}]
129
}]
10+
},
11+
{
12+
"@id": "_:b0",
13+
"@reifies": [{
14+
"@id": "ex:rei",
15+
"ex:prop": [{"@value": "value"}]
16+
}]
1317
}]

‎tests/flatten/st34-out.jsonld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
}, {
88
"@id": "_:b1",
99
"@reifies": [{
10-
"@id": "ex:bob",
11-
"ex:knows": [{"@id": "ex:fred"}]
10+
"@id": "ex:fred",
11+
"ex:knows": [{"@id": "ex:bob"}]
1212
}],
1313
"ex:certainty": [{"@value": 0.8}]
1414
}

‎tests/flatten/st34n-out.jsonld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ex:knows": [{
88
"@id": "ex:bob",
99
"@annotation": [{
10+
"@id": "_:b1",
1011
"ex:certainty": [{"@value": 0.8}]
1112
}]
1213
}]

‎tests/flatten/st35n-out.jsonld

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
"ex:knows": [{
44
"@id": "ex:jane",
55
"@annotation": [{
6+
"@id": "_:b1",
67
"ex:certainty": [{"@value": 0.8}]
78
}]
89
}]
910
},{
1011
"@id": "ex:sue",
11-
"ex:claims": [{
12-
"@id": {
13-
"@id": "ex:bob",
14-
"ex:knows": [{"@id": "ex:jane"}]
15-
}
16-
}]
12+
"ex:claims": [{"@id": "_:b1"}]
1713
}]

‎tests/flatten/st38n-out.jsonld

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[{
2-
"@id": {
2+
"@id": "http://example.org/reif",
3+
"@reifies": [{
34
"@id": "http://example.org/bob",
45
"http://example.org/knows": [{"@id": "http://example.org/alice"}]
5-
},
6+
}],
67
"http://example.org/certainty": [{
78
"@value": 0.8,
89
"@annotation": [{
10+
"@id": "_:b1",
911
"http://example.org/claims": [{"@id": "http://example.org/ted"}]
1012
}]
1113
}]

‎tests/flatten/st39n-out.jsonld

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
"ex:p": [{
44
"@id": "ex:o",
55
"@annotation": [{
6-
"ex:r": [{
7-
"@id": {
8-
"@id": "ex:s1",
9-
"ex:p1": [{"@id": "ex:o1"}]
10-
}
11-
}]
6+
"@id": "_:b1",
7+
"ex:r": [{"@id": "_:b2"}]
128
}]
139
}]
10+
}, {
11+
"@id": "_:b2",
12+
"@reifies": [{
13+
"@id": "ex:s1",
14+
"ex:p1": [{"@id": "ex:o1"}]
15+
}]
1416
}]

‎tests/flatten/st40n-out.jsonld

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
"ex:p": [{
44
"@id": "ex:o",
55
"@annotation": [{
6-
"ex:r": [{
7-
"@id": "ex:s1",
8-
"@annotation": [{
9-
"ex:p1": [{"@id": "ex:o1"}]
10-
}]
11-
}]
6+
"@id": "_:b1",
7+
"ex:r": [{"@id": "ex:s1"}]
128
}]
139
}]
10+
}, {
11+
"@id": "_:b3",
12+
"@reifies": [{
13+
"@id": "_:b1",
14+
"ex:r": [{"@id": "ex:s1"}]
15+
}],
16+
"ex:p1": [{"@id": "ex:o1"}]
1417
}]

‎tests/fromRdf-manifest.jsonld

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,6 @@
186186
"expect": "fromRdf/st36-out.jsonld",
187187
"requires": "JSON-LD-star",
188188
"option": {"specVersion": "json-ld-star", "rdfstar": true}
189-
}, {
190-
"@id": "#tst37",
191-
"@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
192-
"name": "Alias for annotation node (with @annotation)",
193-
"purpose": "annotation node with an alias of `@annotation`",
194-
"input": "fromRdf/st37-in.nq",
195-
"expect": "fromRdf/st37-out.jsonld",
196-
"requires": "JSON-LD-star",
197-
"option": {"specVersion": "json-ld-star", "rdfstar": true}
198189
}, {
199190
"@id": "#tst38",
200191
"@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
@@ -204,24 +195,6 @@
204195
"expect": "fromRdf/st38-out.jsonld",
205196
"requires": "JSON-LD-star",
206197
"option": {"specVersion": "json-ld-star", "rdfstar": true}
207-
}, {
208-
"@id": "#tst39",
209-
"@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
210-
"name": "annotation with embedded node 1 (with @annotation)",
211-
"purpose": "annotation node containing an embedded node",
212-
"input": "fromRdf/st39-in.nq",
213-
"expect": "fromRdf/st39-out.jsonld",
214-
"requires": "JSON-LD-star",
215-
"option": {"specVersion": "json-ld-star", "rdfstar": true}
216-
}, {
217-
"@id": "#tst40",
218-
"@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
219-
"name": "annotation with annotation 1 (with @annotation)",
220-
"purpose": "annotation node containing an annotation node",
221-
"input": "fromRdf/st40-in.nq",
222-
"expect": "fromRdf/st40-out.jsonld",
223-
"requires": "JSON-LD-star",
224-
"option": {"specVersion": "json-ld-star", "rdfstar": true}
225198
}
226199
]
227200
}

‎tests/fromRdf/st19-out.jsonld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"ex:knows": [{
55
"@id": "ex:fred",
66
"@annotation": [{
7+
"@id": "_:b1",
78
"ex:certainty": [{
89
"@value": "8.0E-1",
910
"@type": "http://www.w3.org/2001/XMLSchema#double"

‎tests/fromRdf/st20-in.nq

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<ex:fred> <ex:name> "Fred" .
2-
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
3-
_:b1 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
4-
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
5-
_:b2 <ex:source> <http://example.org/> .
62
<ex:bob> <ex:knows> <ex:fred> .
73
<ex:bob> <ex:name> "Bob" .
4+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
5+
_:b1 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
6+
_:b1 <ex:source> <http://example.org/> .

‎tests/fromRdf/st20-out.jsonld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"ex:knows": [{
55
"@id": "ex:fred",
66
"@annotation": [{
7+
"@id": "_:b1",
78
"ex:certainty": [{
89
"@value": "8.0E-1",
910
"@type": "http://www.w3.org/2001/XMLSchema#double"

‎tests/fromRdf/st20a-in.nq

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
<ex:bob> <ex:knows> <ex:fred> .
2+
<ex:bob> <ex:name> "Bob" .
3+
<ex:fred> <ex:name> "Fred" .
14
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
25
_:b1 <ex:source> <http://example.org/> .
36
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
47
_:b2 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
5-
<ex:bob> <ex:knows> <ex:fred> .
6-
<ex:bob> <ex:name> "Bob" .
7-
<ex:fred> <ex:name> "Fred" .

‎tests/fromRdf/st20a-out.jsonld

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
"ex:knows": [{
55
"@id": "ex:fred",
66
"@annotation": [{
7+
"@id": "_:b1",
8+
"ex:source": [{"@id": "http://example.org/"}]
9+
}, {
10+
"@id": "_:b2",
711
"ex:certainty": [{
812
"@value": "8.0E-1",
913
"@type": "http://www.w3.org/2001/XMLSchema#double"
10-
}],
11-
"ex:source": [{"@id": "http://example.org/"}]
14+
}]
1215
}]
1316
}]
1417
}, {

‎tests/fromRdf/st28-in.nq

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> _:b0)>> .
2-
_:b1 <ex:prop> "value2" .
3-
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> _:b0)>> .
4-
_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b2 <ex:prop> "value2")>> .
5-
_:b3 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
1+
_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> _:b1)>> .
2+
_:b0 <ex:prop> "value2" .
3+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b0 <ex:prop> "value2")>> .
4+
_:b2 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .

‎tests/fromRdf/st28-out.jsonld

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[{
2-
"@id": {
2+
"@id": "_:b0",
3+
"@reifies": [{
34
"@id": "ex:rei",
4-
"ex:prop": [{"@id": "_:b0"}]
5-
},
5+
"ex:prop": [{"@id": "_:b1"}]
6+
}],
67
"ex:prop": [{
78
"@value": "value2",
89
"@annotation": [{
10+
"@id": "_:b2",
911
"ex:certainty": [{
1012
"@value": "8.0E-1",
1113
"@type": "http://www.w3.org/2001/XMLSchema#double"

‎tests/fromRdf/st29-in.nq

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<ex:subj> <ex:value> <<<ex:rei> <ex:prop> "value">> .
2-
<<<ex:subj> <ex:value> <<<ex:rei> <ex:prop> "value">>>> <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
3-
4-
<ex:subj> <ex:value> _:b1 .
5-
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
6-
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:subj> <ex:value> _:b1)>> .
1+
<ex:subj> <ex:value> _:b0 .
2+
_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
3+
_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:subj> <ex:value> _:b0)>> .
74
_:b2 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .

‎tests/fromRdf/st29-out.jsonld

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
[{
22
"@id": "ex:subj",
33
"ex:value": [{
4-
"@id": {
5-
"@id": "ex:rei",
6-
"ex:prop": [{"@value": "value"}]
7-
},
4+
"@id": "_:b0",
85
"@annotation": [{
6+
"@id": "_:b2",
97
"ex:certainty": [{
108
"@value": "8.0E-1",
119
"@type": "http://www.w3.org/2001/XMLSchema#double"
1210
}]
1311
}]
1412
}]
13+
}, {
14+
"@id": "_:b0",
15+
"@reifies": [{
16+
"@id": "ex:rei",
17+
"ex:prop": [{"@value": "value"}]
18+
}]
1519
}]

‎tests/fromRdf/st34-out.jsonld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ex:knows": [{
88
"@id": "ex:bob",
99
"@annotation": [{
10+
"@id": "_:b1",
1011
"ex:certainty": [{
1112
"@value": "8.0E-1",
1213
"@type": "http://www.w3.org/2001/XMLSchema#double"

‎tests/fromRdf/st35-out.jsonld

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
"ex:knows": [{
44
"@id": "ex:jane",
55
"@annotation": [{
6+
"@id": "_:b1",
67
"ex:certainty": [{
78
"@value": "8.0E-1",
89
"@type": "http://www.w3.org/2001/XMLSchema#double"
910
}]
1011
}]
1112
}]
12-
},{
13-
"@id": "ex:sue",
14-
"ex:claims": [{
15-
"@id": {
16-
"@id": "ex:bob",
17-
"ex:knows": [{"@id": "ex:jane"}]
18-
}
19-
}]
2013
}]

‎tests/fromRdf/st37-in.nq

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎tests/fromRdf/st37-out.jsonld

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎tests/fromRdf/st38-in.nq

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
<<<http://example.org/bob> <http://example.org/knows> <http://example.org/alice>>> <http://example.org/certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
2-
<<<<<http://example.org/bob> <http://example.org/knows> <http://example.org/alice>>> <http://example.org/certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double>>> <http://example.org/claims> <http://example.org/ted> .
1+
<http://example.org/reif> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example.org/bob> <http://example.org/knows> <http://example.org/alice>)>> .
2+
<http://example.org/reif> <http://example.org/certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
3+
_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example.org/reif> <http://example.org/certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double>)>> .
4+
_:b1 <http://example.org/claims> <http://example.org/ted> .

0 commit comments

Comments
 (0)