Fix annotation tests and issues with reverse relationships.

gkellogg · gkellogg · commit 681767f7558f · 2025-05-17T16:47:39.000-07:00
diff --git a/tests/flatten-manifest.jsonld b/tests/flatten-manifest.jsonld
@@ -174,7 +174,7 @@
       "name": "Annotation node 5 (with @annotation)",
       "purpose": "Node with @annotation property containing an empty node object",
       "input": "flatten/st20b-in.jsonld",
-      "expect": "flatten/st20b-out.jsonld",
+      "expect": "flatten/st20bn-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true, "createAnnotations": true}
     }, {
diff --git a/tests/flatten/st19n-out.jsonld b/tests/flatten/st19n-out.jsonld
@@ -4,6 +4,7 @@
   "ex:knows": [{
     "@id": "ex:fred",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{"@value": 0.8}]
     }]
   }]
diff --git a/tests/flatten/st20bn-out.jsonld b/tests/flatten/st20bn-out.jsonld
@@ -0,0 +1,11 @@
+[{
+  "@id": "ex:bob",
+  "ex:name": [{"@value": "Bob"}],
+  "ex:knows": [{
+    "@id": "ex:fred",
+    "@annotation": [{"@id": "_:b1"}]
+  }]
+}, {
+  "@id": "ex:fred",
+  "ex:name": [{"@value": "Fred"}]
+}]
diff --git a/tests/flatten/st20n-out.jsonld b/tests/flatten/st20n-out.jsonld
@@ -4,8 +4,10 @@
   "ex:knows": [{
     "@id": "ex:fred",
     "@annotation": [{
-      "@id": "_:bn1",
-      "ex:certainty": [{"@value": 0.8}],
+      "@id": "_:b1",
+      "ex:certainty": [{"@value": 0.8}]
+    }, {
+      "@id": "_:b3",
       "ex:source": [{"@id": "http://example.org/"}]
     }]
   }]
diff --git a/tests/flatten/st28n-out.jsonld b/tests/flatten/st28n-out.jsonld
@@ -1,13 +1,13 @@
 [{
-  "@id": "_:rei",
-  "@reifies": {
+  "@id": "_:b2",
+  "@reifies": [{
     "@id": "ex:rei",
-    "ex:prop": [{"@id": "_:b0"}]
-  },
+    "ex:prop": [{"@id": "_:b1"}]
+  }],
   "ex:prop": [{
     "@value": "value2",
     "@annotation": [{
-      "@id": "_:bn1",
+      "@id": "_:b4",
       "ex:certainty": [{"@value": 0.8}]
     }]
   }]
diff --git a/tests/flatten/st29n-out.jsonld b/tests/flatten/st29n-out.jsonld
@@ -1,13 +1,17 @@
 [{
   "@id": "ex:subj",
-  "ex:value": [{"@id": "_:bn0"}]
-}, {
-    "@id": {
-      "@id": "ex:rei",
-      "ex:prop": [{"@value": "value"}]
-    },
+  "ex:value": [{
+    "@id": "_:b0",
     "@annotation": [{
+      "@id": "_:b2",
       "ex:certainty": [{"@value": 0.8}]
     }]
   }]
+},
+{
+  "@id": "_:b0",
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@value": "value"}]
+  }]
 }]
diff --git a/tests/flatten/st34-out.jsonld b/tests/flatten/st34-out.jsonld
@@ -7,8 +7,8 @@
 }, {
   "@id": "_:b1",
   "@reifies": [{
-    "@id": "ex:bob",
-    "ex:knows": [{"@id": "ex:fred"}]
+    "@id": "ex:fred",
+    "ex:knows": [{"@id": "ex:bob"}]
   }],
   "ex:certainty": [{"@value": 0.8}]
 }
diff --git a/tests/flatten/st34n-out.jsonld b/tests/flatten/st34n-out.jsonld
@@ -7,6 +7,7 @@
   "ex:knows": [{
     "@id": "ex:bob",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{"@value": 0.8}]
     }]
   }]
diff --git a/tests/flatten/st35n-out.jsonld b/tests/flatten/st35n-out.jsonld
@@ -3,15 +3,11 @@
   "ex:knows": [{
     "@id": "ex:jane",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{"@value": 0.8}]
     }]
   }]
 },{
   "@id": "ex:sue",
-  "ex:claims": [{
-    "@id": {
-      "@id": "ex:bob",
-      "ex:knows": [{"@id": "ex:jane"}]
-    }
-  }]
+  "ex:claims": [{"@id": "_:b1"}]
 }]
diff --git a/tests/flatten/st38n-out.jsonld b/tests/flatten/st38n-out.jsonld
@@ -1,11 +1,13 @@
 [{
-  "@id": {
+  "@id": "http://example.org/reif",
+  "@reifies": [{
     "@id": "http://example.org/bob",
     "http://example.org/knows": [{"@id": "http://example.org/alice"}]
-  },
+  }],
   "http://example.org/certainty": [{
     "@value": 0.8,
     "@annotation": [{
+      "@id": "_:b1",
       "http://example.org/claims": [{"@id": "http://example.org/ted"}]
     }]
   }]
diff --git a/tests/flatten/st39n-out.jsonld b/tests/flatten/st39n-out.jsonld
@@ -3,12 +3,14 @@
   "ex:p": [{
     "@id": "ex:o",
     "@annotation": [{
-      "ex:r": [{
-        "@id": {
-          "@id": "ex:s1",
-          "ex:p1": [{"@id": "ex:o1"}]
-        }
-      }]
+      "@id": "_:b1",
+      "ex:r": [{"@id": "_:b2"}]
     }]
   }]
+}, {
+  "@id": "_:b2",
+  "@reifies": [{
+    "@id": "ex:s1",
+    "ex:p1": [{"@id": "ex:o1"}]
+  }]
 }]
diff --git a/tests/flatten/st40n-out.jsonld b/tests/flatten/st40n-out.jsonld
@@ -3,12 +3,15 @@
   "ex:p": [{
     "@id": "ex:o",
     "@annotation": [{
-      "ex:r": [{
-        "@id": "ex:s1",
-        "@annotation": [{
-          "ex:p1": [{"@id": "ex:o1"}]
-        }]
-      }]
+      "@id": "_:b1",
+      "ex:r": [{"@id": "ex:s1"}]
     }]
   }]
+}, {
+  "@id": "_:b3",
+  "@reifies": [{
+    "@id": "_:b1",
+    "ex:r": [{"@id": "ex:s1"}]
+  }],
+  "ex:p1": [{"@id": "ex:o1"}]
 }]
diff --git a/tests/fromRdf-manifest.jsonld b/tests/fromRdf-manifest.jsonld
@@ -186,15 +186,6 @@
       "expect": "fromRdf/st36-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
-    }, {
-      "@id": "#tst37",
-      "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
-      "name": "Alias for annotation node (with @annotation)",
-      "purpose": "annotation node with an alias of `@annotation`",
-      "input": "fromRdf/st37-in.nq",
-      "expect": "fromRdf/st37-out.jsonld",
-      "requires": "JSON-LD-star",
-      "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }, {
       "@id": "#tst38",
       "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
@@ -204,24 +195,6 @@
       "expect": "fromRdf/st38-out.jsonld",
       "requires": "JSON-LD-star",
       "option": {"specVersion": "json-ld-star", "rdfstar": true}
-    }, {
-      "@id": "#tst39",
-      "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
-      "name": "annotation with embedded node 1 (with @annotation)",
-      "purpose": "annotation node containing an embedded node",
-      "input": "fromRdf/st39-in.nq",
-      "expect": "fromRdf/st39-out.jsonld",
-      "requires": "JSON-LD-star",
-      "option": {"specVersion": "json-ld-star", "rdfstar": true}
-    }, {
-      "@id": "#tst40",
-      "@type": ["jld:PositiveEvaluationTest", "jld:FromRDFTest"],
-      "name": "annotation with annotation 1 (with @annotation)",
-      "purpose": "annotation node containing an annotation node",
-      "input": "fromRdf/st40-in.nq",
-      "expect": "fromRdf/st40-out.jsonld",
-      "requires": "JSON-LD-star",
-      "option": {"specVersion": "json-ld-star", "rdfstar": true}
     }
   ]
 }
diff --git a/tests/fromRdf/st19-out.jsonld b/tests/fromRdf/st19-out.jsonld
@@ -4,6 +4,7 @@
   "ex:knows": [{
     "@id": "ex:fred",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
diff --git a/tests/fromRdf/st20-in.nq b/tests/fromRdf/st20-in.nq
@@ -1,7 +1,6 @@
 <ex:fred> <ex:name> "Fred" .
-_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
-_:b1 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
-_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
-_:b2 <ex:source> <http://example.org/> .
 <ex:bob> <ex:knows> <ex:fred> .
 <ex:bob> <ex:name> "Bob" .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
+_:b1 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:b1 <ex:source> <http://example.org/> .
diff --git a/tests/fromRdf/st20-out.jsonld b/tests/fromRdf/st20-out.jsonld
@@ -4,6 +4,7 @@
   "ex:knows": [{
     "@id": "ex:fred",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
diff --git a/tests/fromRdf/st20a-in.nq b/tests/fromRdf/st20a-in.nq
@@ -1,7 +1,7 @@
+<ex:bob> <ex:knows> <ex:fred> .
+<ex:bob> <ex:name> "Bob" .
+<ex:fred> <ex:name> "Fred" .
 _:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
 _:b1 <ex:source> <http://example.org/> .
 _:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:bob> <ex:knows> <ex:fred>)>> .
 _:b2 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
-<ex:bob> <ex:knows> <ex:fred> .
-<ex:bob> <ex:name> "Bob" .
-<ex:fred> <ex:name> "Fred" .
diff --git a/tests/fromRdf/st20a-out.jsonld b/tests/fromRdf/st20a-out.jsonld
@@ -4,11 +4,14 @@
   "ex:knows": [{
     "@id": "ex:fred",
     "@annotation": [{
+      "@id": "_:b1",
+      "ex:source": [{"@id": "http://example.org/"}]
+    }, {
+      "@id": "_:b2",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
-      }],
-      "ex:source": [{"@id": "http://example.org/"}]
+      }]
     }]
   }]
 }, {
diff --git a/tests/fromRdf/st28-in.nq b/tests/fromRdf/st28-in.nq
@@ -1,5 +1,4 @@
-_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> _:b0)>> .
-_:b1 <ex:prop> "value2" .
-_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> _:b0)>> .
-_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b2 <ex:prop> "value2")>> .
-_:b3 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> _:b1)>> .
+_:b0 <ex:prop> "value2" .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b0 <ex:prop> "value2")>> .
+_:b2 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
diff --git a/tests/fromRdf/st28-out.jsonld b/tests/fromRdf/st28-out.jsonld
@@ -1,11 +1,13 @@
 [{
-  "@id": {
+  "@id": "_:b0",
+  "@reifies": [{
     "@id": "ex:rei",
-    "ex:prop": [{"@id": "_:b0"}]
-  },
+    "ex:prop": [{"@id": "_:b1"}]
+  }],
   "ex:prop": [{
     "@value": "value2",
     "@annotation": [{
+      "@id": "_:b2",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
diff --git a/tests/fromRdf/st29-in.nq b/tests/fromRdf/st29-in.nq
@@ -1,7 +1,4 @@
-<ex:subj> <ex:value> <<<ex:rei> <ex:prop> "value">> .
-<<<ex:subj> <ex:value> <<<ex:rei> <ex:prop> "value">>>> <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
-
-<ex:subj> <ex:value> _:b1 .
-_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
-_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:subj> <ex:value> _:b1)>> .
+<ex:subj> <ex:value> _:b0 .
+_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:subj> <ex:value> _:b0)>> .
 _:b2 <ex:certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
diff --git a/tests/fromRdf/st29-out.jsonld b/tests/fromRdf/st29-out.jsonld
@@ -1,15 +1,19 @@
 [{
   "@id": "ex:subj",
   "ex:value": [{
-    "@id": {
-      "@id": "ex:rei",
-      "ex:prop": [{"@value": "value"}]
-    },
+    "@id": "_:b0",
     "@annotation": [{
+      "@id": "_:b2",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
       }]
     }]
   }]
+}, {
+  "@id": "_:b0",
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@value": "value"}]
+  }]
 }]
diff --git a/tests/fromRdf/st34-out.jsonld b/tests/fromRdf/st34-out.jsonld
@@ -7,6 +7,7 @@
   "ex:knows": [{
     "@id": "ex:bob",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
diff --git a/tests/fromRdf/st35-out.jsonld b/tests/fromRdf/st35-out.jsonld
@@ -3,18 +3,11 @@
   "ex:knows": [{
     "@id": "ex:jane",
     "@annotation": [{
+      "@id": "_:b1",
       "ex:certainty": [{
         "@value": "8.0E-1",
         "@type": "http://www.w3.org/2001/XMLSchema#double"
       }]
     }]
   }]
-},{
-  "@id": "ex:sue",
-  "ex:claims": [{
-    "@id": {
-      "@id": "ex:bob",
-      "ex:knows": [{"@id": "ex:jane"}]
-    }
-  }]
 }]
diff --git a/tests/fromRdf/st37-in.nq b/tests/fromRdf/st37-in.nq
diff --git a/tests/fromRdf/st37-out.jsonld b/tests/fromRdf/st37-out.jsonld
diff --git a/tests/fromRdf/st38-in.nq b/tests/fromRdf/st38-in.nq
@@ -1,2 +1,4 @@
-<<<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/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> .
+<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>)>> .
+<http://example.org/reif> <http://example.org/certainty> "8.0E-1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_: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>)>> .
+_:b1 <http://example.org/claims> <http://example.org/ted> .
diff --git a/tests/fromRdf/st38-out.jsonld b/tests/fromRdf/st38-out.jsonld
diff --git a/tests/fromRdf/st39-in.nq b/tests/fromRdf/st39-in.nq
diff --git a/tests/fromRdf/st39-out.jsonld b/tests/fromRdf/st39-out.jsonld
diff --git a/tests/fromRdf/st40-in.nq b/tests/fromRdf/st40-in.nq
diff --git a/tests/fromRdf/st40-out.jsonld b/tests/fromRdf/st40-out.jsonld
diff --git a/tests/toRdf/st34-out.nq b/tests/toRdf/st34-out.nq
