Move some expand/toRdf tests to avoid rebase collisions.

Author: gkellogg

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"],

tests/expand/er57-in.jsonld

@@ -3,7 +3,7 @@
     "prop": {
       "@id": "ex:prop", 
       "@type": "@json",
-      "@container": "@list"
+      "@container": "@set"
     }
   },
   "prop": "value"

tests/expand/er58-in.jsonld

@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "prop": {
+      "@id": "ex:prop", 
+      "@type": "@json",
+      "@container": "@list"
+    }
+  },
+  "prop": "value"
+}
+

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"],

tests/toRdf/er57-in.jsonld

@@ -3,7 +3,7 @@
     "prop": {
       "@id": "ex:prop", 
       "@type": "@json",
-      "@container": "@list"
+      "@container": "@set"
     }
   },
   "prop": "value"

tests/toRdf/er58-in.jsonld

@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "prop": {
+      "@id": "ex:prop", 
+      "@type": "@json",
+      "@container": "@list"
+    }
+  },
+  "prop": "value"
+}