From 8ec76422edbb338af19d1c135c1a1c5c5311b436 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 29 Jul 2024 15:42:39 -0700
Subject: [PATCH] Move some expand/toRdf tests to avoid rebase collisions.

---
 tests/expand-manifest.jsonld |  7 +++++++
 tests/expand/er57-in.jsonld  |  2 +-
 tests/expand/er58-in.jsonld  | 11 +++++++++++
 tests/toRdf-manifest.jsonld  | 26 +++++++++++++-------------
 tests/toRdf/er57-in.jsonld   |  2 +-
 tests/toRdf/er58-in.jsonld   | 10 ++++++++++
 6 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 tests/expand/er58-in.jsonld
 create mode 100644 tests/toRdf/er58-in.jsonld

diff --git a/tests/expand-manifest.jsonld b/tests/expand-manifest.jsonld
index eb97cc26..79be31a2 100644
--- a/tests/expand-manifest.jsonld
+++ b/tests/expand-manifest.jsonld
@@ -1833,6 +1833,13 @@
       "purpose": "The value for a @json @set term MUST be an array.",
       "input": "expand/er57-in.jsonld",
       "expectErrorCode": "invalid set or list object"
+    }, {
+      "@id": "#ter58",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
+      "name": "Array not found for @json @set.",
+      "purpose": "The value for a @json @set term MUST be an array.",
+      "input": "expand/er57-in.jsonld",
+      "expectErrorCode": "invalid set or list object"
     }, {
       "@id": "#ter58",
       "@type": ["jld:NegativeEvaluationTest", "jld:ExpandTest"],
diff --git a/tests/expand/er57-in.jsonld b/tests/expand/er57-in.jsonld
index 3ea8be4c..07e6339b 100644
--- a/tests/expand/er57-in.jsonld
+++ b/tests/expand/er57-in.jsonld
@@ -3,7 +3,7 @@
     "prop": {
       "@id": "ex:prop", 
       "@type": "@json",
-      "@container": "@list"
+      "@container": "@set"
     }
   },
   "prop": "value"
diff --git a/tests/expand/er58-in.jsonld b/tests/expand/er58-in.jsonld
new file mode 100644
index 00000000..90091bf2
--- /dev/null
+++ b/tests/expand/er58-in.jsonld
@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "prop": {
+      "@id": "ex:prop", 
+      "@type": "@json",
+      "@container": "@list"
+    }
+  },
+  "prop": "value"
+}
+
diff --git a/tests/toRdf-manifest.jsonld b/tests/toRdf-manifest.jsonld
index 35fcf945..9cc6a22b 100644
--- a/tests/toRdf-manifest.jsonld
+++ b/tests/toRdf-manifest.jsonld
@@ -2252,19 +2252,19 @@
       "input": "expand/er56-in.jsonld",
       "expectErrorCode": "keyword redefinition"
     }, {
-     "@id": "#ter56",
-     "@type": ["jld:NegativeEvaluationTest", "jld:ToRDFTest" ],
-     "name": "Array not found for @json @list.",
-     "purpose": "The value for a @json @list term MUST be an array.",
-     "input": "toRdf/er57-in.jsonld",
-     "expectErrorCode": "invalid set or list object"
-    }, {
-     "@id": "#ter57",
-     "@type": ["jld:NegativeEvaluationTest", "jld:ToRDFTest" ],
-     "name": "Array not found for @json @set.",
-     "purpose": "The value for a @json @set term MUST be an array.",
-     "input": "toRdf/er56-in.jsonld",
-     "expectErrorCode": "invalid set or list object"
+      "@id": "#ter57",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ToRDFTest" ],
+      "name": "Array not found for @json @list.",
+      "purpose": "The value for a @json @list term MUST be an array.",
+      "input": "toRdf/er57-in.jsonld",
+      "expectErrorCode": "invalid set or list object"
+    }, {
+      "@id": "#ter58",
+      "@type": ["jld:NegativeEvaluationTest", "jld:ToRDFTest" ],
+      "name": "Array not found for @json @set.",
+      "purpose": "The value for a @json @set term MUST be an array.",
+      "input": "toRdf/er58-in.jsonld",
+      "expectErrorCode": "invalid set or list object"
     }, {
       "@id": "#tin01",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
diff --git a/tests/toRdf/er57-in.jsonld b/tests/toRdf/er57-in.jsonld
index 3ea8be4c..07e6339b 100644
--- a/tests/toRdf/er57-in.jsonld
+++ b/tests/toRdf/er57-in.jsonld
@@ -3,7 +3,7 @@
     "prop": {
       "@id": "ex:prop", 
       "@type": "@json",
-      "@container": "@list"
+      "@container": "@set"
     }
   },
   "prop": "value"
diff --git a/tests/toRdf/er58-in.jsonld b/tests/toRdf/er58-in.jsonld
new file mode 100644
index 00000000..3ea8be4c
--- /dev/null
+++ b/tests/toRdf/er58-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "prop": {
+      "@id": "ex:prop", 
+      "@type": "@json",
+      "@container": "@list"
+    }
+  },
+  "prop": "value"
+}