Update reification tests as suggested by @pchampin.

gkellogg · gkellogg · commit e6e004c745dd · 2025-05-16T14:30:45.000-07:00
diff --git a/tests/expand/st04a-in.jsonld b/tests/expand/st04a-in.jsonld
@@ -1,8 +1,6 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "ex:prop": "value"
   }
 }
diff --git a/tests/expand/st04a-out.jsonld b/tests/expand/st04a-out.jsonld
@@ -1,8 +1,6 @@
 [{
   "@id": "ex:s",
-  "ex:p": [{
-    "@reifies": [{
-      "ex:prop": [{"@value": "value"}]
-    }]
+  "@reifies": [{
+    "ex:prop": [{"@value": "value"}]
   }]
 }]
diff --git a/tests/expand/st05a-in.jsonld b/tests/expand/st05a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": "value"
   }
 }
diff --git a/tests/expand/st05a-out.jsonld b/tests/expand/st05a-out.jsonld
@@ -1,9 +1,7 @@
 [{
   "@id": "ex:s",
-  "ex:p": [{
-    "@reifies": [{
-      "@id": "ex:rei",
-      "ex:prop": [{"@value": "value"}]
-    }]
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@value": "value"}]
   }]
 }]
diff --git a/tests/expand/st06a-in.jsonld b/tests/expand/st06a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "_:rei",
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "@id": "_:rei",
+    "ex:prop": "value"
   }
 }
diff --git a/tests/expand/st06a-out.jsonld b/tests/expand/st06a-out.jsonld
@@ -1,9 +1,7 @@
 [{
   "@id": "ex:s",
-  "ex:p": [{
-    "@reifies": [{
-      "@id": "_:rei",
-      "ex:prop": [{"@value": "value"}]
-    }]
+  "@reifies": [{
+    "@id": "_:rei",
+    "ex:prop": [{"@value": "value"}]
   }]
 }]
diff --git a/tests/expand/st07a-in.jsonld b/tests/expand/st07a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "@type": "ex:Type"
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "@type": "ex:Type"
   }
 }
diff --git a/tests/expand/st07a-out.jsonld b/tests/expand/st07a-out.jsonld
@@ -1,9 +1,7 @@
 [{
   "@id": "ex:s",
-  "ex:p": [{
-    "@reifies": [{
-      "@id": "ex:rei",
-      "@type": ["ex:Type"]
-    }]
+  "@reifies": [{
+    "@id": "ex:rei",
+    "@type": ["ex:Type"]
   }]
 }]
diff --git a/tests/expand/st08a-in.jsonld b/tests/expand/st08a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "ex:prop": {"@id": "ex:value"}
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": {"@id": "ex:value"}
   }
 }
diff --git a/tests/expand/st08a-out.jsonld b/tests/expand/st08a-out.jsonld
@@ -1,9 +1,7 @@
 [{
   "@id": "ex:s",
-  "ex:p": [{
-    "@reifies": [{
-      "@id": "ex:rei",
-      "ex:prop": [{"@id": "ex:value"}]
-    }]
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@id": "ex:value"}]
   }]
 }]
diff --git a/tests/expand/st09a-in.jsonld b/tests/expand/st09a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "ex:prop": {"@id": "_:value"}
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": {"@id": "_:value"}
   }
 }
diff --git a/tests/expand/st09a-out.jsonld b/tests/expand/st09a-out.jsonld
@@ -1,9 +1,7 @@
 [{
   "@id": "ex:s",
-  "ex:p": [{
-    "@reifies": [{
-      "@id": "ex:rei",
-      "ex:prop": [{"@id": "_:value"}]
-    }]
+  "@reifies": [{
+    "@id": "ex:rei",
+    "ex:prop": [{"@id": "_:value"}]
   }]
 }]
diff --git a/tests/expand/st10a-in.jsonld b/tests/expand/st10a-in.jsonld
@@ -1,15 +1,11 @@
 {
   "@context": {"ex": "http://example/"},
   "@id": "ex:s",
-  "ex:p": {
+  "@reifies": {
+    "@id": "ex:s1",
     "@reifies": {
-      "@id": "ex:s1",
-      "ex:p1": {
-        "@reifies": {
-          "@id": "ex:s2",
-          "ex:p2": {"@id": "ex:o2"}
-        }
-      }
+      "@id": "ex:s2",
+      "ex:p2": {"@id": "ex:o2"}
     }
   }
 }
diff --git a/tests/expand/st10a-out.jsonld b/tests/expand/st10a-out.jsonld
@@ -1,14 +1,10 @@
 [{
   "@id": "http://example/s",
-  "http://example/p": [{
+  "@reifies": [{
+    "@id": "http://example/s1",
     "@reifies": [{
-      "@id": "http://example/s1",
-      "http://example/p1": [{
-        "@reifies": [{
-          "@id": "http://example/s2",
-          "http://example/p2": [{"@id": "http://example/o2"}]
-        }]
-      }]
+      "@id": "http://example/s2",
+      "http://example/p2": [{"@id": "http://example/o2"}]
     }]
   }]
 }]
diff --git a/tests/expand/st11a-in.jsonld b/tests/expand/st11a-in.jsonld
@@ -1,8 +1,6 @@
 {
   "@id": "ex:s",
-  "ex:prop": {
-    "@reifies": {
-      "@id": "ex:rei"
-    }
+  "@reifies": {
+    "@id": "ex:rei"
   }
 }
diff --git a/tests/expand/st12a-in.jsonld b/tests/expand/st12a-in.jsonld
@@ -1,8 +1,6 @@
 {
   "@id": "ex:s",
-  "ex:prop": {
-    "@reifies": {
-      "ex:p": ["value1", "value2"]
-    }
+  "@reifies": {
+    "ex:p": ["value1", "value2"]
   }
 }
diff --git a/tests/expand/st12a-out.jsonld b/tests/expand/st12a-out.jsonld
@@ -1,8 +1,6 @@
 [{
   "@id": "ex:s",
-  "ex:prop": [{
-    "@reifies": [{
-      "ex:p": [{"@value": "value1"}, {"@value": "value2"}]
-    }]
+  "@reifies": [{
+    "ex:p": [{"@value": "value1"}, {"@value": "value2"}]
   }]
 }]
diff --git a/tests/expand/st13a-in.jsonld b/tests/expand/st13a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:prop": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "@type": ["ex:Type1", "ex:Type2"]
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "@type": ["ex:Type1", "ex:Type2"]
   }
 }
diff --git a/tests/expand/st13a-out.jsonld b/tests/expand/st13a-out.jsonld
@@ -1,9 +1,7 @@
 [{
   "@id": "ex:s",
-  "ex:prop": [{
-    "@reifies": [{
-      "@id": "ex:rei",
-      "@type": ["ex:Type1", "ex:Type2"]
-    }]
+  "@reifies": [{
+    "@id": "ex:rei",
+    "@type": ["ex:Type1", "ex:Type2"]
   }]
 }]
diff --git a/tests/expand/st14a-in.jsonld b/tests/expand/st14a-in.jsonld
@@ -1,10 +1,8 @@
 {
   "@id": "ex:s",
-  "ex:prop": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "@type": "ex:Type",
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "@type": "ex:Type",
+    "ex:prop": "value"
   }
 }
diff --git a/tests/expand/st14a-out.jsonld b/tests/expand/st14a-out.jsonld
@@ -1,10 +1,8 @@
 [{
   "@id": "ex:s",
-  "ex:prop": [{
-    "@reifies": [{
-      "@id": "ex:rei",
-      "@type": ["ex:Type"],
-      "ex:prop": [{"@value": "value"}]
-    }]
+  "@reifies": [{
+    "@id": "ex:rei",
+    "@type": ["ex:Type"],
+    "ex:prop": [{"@value": "value"}]
   }]
 }]
diff --git a/tests/toRdf/st04a-in.jsonld b/tests/toRdf/st04a-in.jsonld
@@ -1,8 +1,6 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "ex:prop": "value"
   }
 }
diff --git a/tests/toRdf/st04a-out.nq b/tests/toRdf/st04a-out.nq
@@ -1,2 +1 @@
-<ex:s> <ex:p> _:b1 .
-_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b2 <ex:prop> "value")>> .
+<ex:s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b0 <ex:prop> "value")>> .
diff --git a/tests/toRdf/st05-out.nq b/tests/toRdf/st05-out.nq
@@ -1,2 +1 @@
-_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
-_:b0 <ex:prop> "value2" .
+<ex:s> <ex:p> <<(<ex:rei> <ex:prop> "value")>> .
diff --git a/tests/toRdf/st05a-in.jsonld b/tests/toRdf/st05a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": "value"
   }
 }
diff --git a/tests/toRdf/st05a-out.nq b/tests/toRdf/st05a-out.nq
@@ -1,2 +1 @@
-<ex:s> <ex:p> _:b0 .
-_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <ex:rei> <ex:prop> "value" )>> .
+<ex:s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> "value")>> .
diff --git a/tests/toRdf/st06a-in.jsonld b/tests/toRdf/st06a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "_:rei",
-      "ex:prop": "value"
-    }
+  "@reifies": {
+    "@id": "_:rei",
+    "ex:prop": "value"
   }
 }
diff --git a/tests/toRdf/st06a-out.nq b/tests/toRdf/st06a-out.nq
@@ -1,2 +1 @@
-<ex:s> <ex:p> _:b0 .
-_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b1 <ex:prop> "value")>> .
+<ex:s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:b0 <ex:prop> "value")>> .
diff --git a/tests/toRdf/st07a-in.jsonld b/tests/toRdf/st07a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "@type": "ex:Type"
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "@type": "ex:Type"
   }
 }
diff --git a/tests/toRdf/st07a-out.nq b/tests/toRdf/st07a-out.nq
@@ -1,2 +1 @@
-<ex:s> <ex:p> _:b0 .
-_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <ex:Type>)>> .
+<ex:s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <ex:Type>)>> .
diff --git a/tests/toRdf/st08a-in.jsonld b/tests/toRdf/st08a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "ex:prop": {"@id": "ex:value"}
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": {"@id": "ex:value"}
   }
 }
diff --git a/tests/toRdf/st08a-out.nq b/tests/toRdf/st08a-out.nq
@@ -1,2 +1 @@
-<ex:s> <ex:p> _:b0 .
-_:b0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> <ex:value>)>> .
+<ex:s> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<ex:rei> <ex:prop> <ex:value>)>> .
diff --git a/tests/toRdf/st09a-in.jsonld b/tests/toRdf/st09a-in.jsonld
@@ -1,9 +1,7 @@
 {
   "@id": "ex:s",
-  "ex:p": {
-    "@reifies": {
-      "@id": "ex:rei",
-      "ex:prop": {"@id": "_:value"}
-    }
+  "@reifies": {
+    "@id": "ex:rei",
+    "ex:prop": {"@id": "_:value"}
   }
 }
diff --git a/tests/toRdf/st09a-out.nq b/tests/toRdf/st09a-out.nq
diff --git a/tests/toRdf/st10a-in.jsonld b/tests/toRdf/st10a-in.jsonld
diff --git a/tests/toRdf/st10a-out.nq b/tests/toRdf/st10a-out.nq
diff --git a/tests/toRdf/st11a-in.jsonld b/tests/toRdf/st11a-in.jsonld
diff --git a/tests/toRdf/st12a-in.jsonld b/tests/toRdf/st12a-in.jsonld
diff --git a/tests/toRdf/st12a-out.nq b/tests/toRdf/st12a-out.nq
diff --git a/tests/toRdf/st13a-in.jsonld b/tests/toRdf/st13a-in.jsonld
diff --git a/tests/toRdf/st13a-out.nq b/tests/toRdf/st13a-out.nq
diff --git a/tests/toRdf/st14a-in.jsonld b/tests/toRdf/st14a-in.jsonld
diff --git a/tests/toRdf/st14a-out.nq b/tests/toRdf/st14a-out.nq

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"@id": "ex:s",`
`3`		`- "ex:p": {`
`4`		`- "@reifies": {`
`5`		`- "ex:prop": "value"`
`6`		`- }`
	`3`	`+ "@reifies": {`
	`4`	`+ "ex:prop": "value"`
`7`	`5`	`}`
`8`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"@id": "ex:s",`
`3`		`- "ex:p": {`
`4`		`- "@reifies": {`
`5`		`- "@id": "ex:rei",`
`6`		`- "ex:prop": "value"`
`7`		`- }`
	`3`	`+ "@reifies": {`
	`4`	`+ "@id": "ex:rei",`
	`5`	`+ "ex:prop": "value"`
`8`	`6`	`}`
`9`	`7`	`}`