Add tests for expanding and compacting named graphs where term defini…

…tion includes `@graphid`.

test-suite/tests/compact-0080-in.jsonld

@@ -1,8 +1,8 @@
 [{
   "http://example.org/input": [{
+    "@id": "http://example.org/gid",
     "@graph": [{
       "http://example.org/value": [{"@value": "x"}]
-    }],
-    "@id": "http://example.org/id"
+    }]
   }]
 }]

test-suite/tests/compact-0080-out.jsonld

@@ -1,12 +1,10 @@
 {
   "@context": {
     "@vocab": "http://example.org/",
-    "input": {
-      "@container": "@graph"
-    }
+    "input": {"@container": "@graph"}
   },
   "input": {
-    "@id": "http://example.org/id",
+    "@id": "http://example.org/gid",
     "@graph": [
       {
         "value": "x"

test-suite/tests/compact-0081-context.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph", "@graphId": "gid"}
+  }
+}

test-suite/tests/compact-0081-in.jsonld

@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.org/gid",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]

test-suite/tests/compact-0081-out.jsonld

@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph", "@graphId": "gid"}
+  },
+  "input": {
+    "value": "x"
+  }
+}

test-suite/tests/compact-0082-context.jsonld

@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph", "@graphId": "nomatch"}
+  }
+}

test-suite/tests/compact-0082-in.jsonld

@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.org/gid",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]

test-suite/tests/compact-0082-out.jsonld

@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph", "@graphId": "nomatch"}
+  },
+  "input": {
+    "@id": "http://example.org/gid",
+    "@graph": [
+      {
+        "value": "x"
+      }
+    ]
+  }
+}

test-suite/tests/compact-manifest.jsonld

@@ -658,12 +658,30 @@
     }, {
       "@id": "#t0080",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
-      "name": "Do not compact a graph having @id with a term having an @graph container",
-      "purpose": "Graph compaction works only on simple graphs",
+      "name": "Does not compact graph with @id without @graphId",
+      "purpose": "Graph compaction works only on graphs with matching identifier",
       "input": "compact-0080-in.jsonld",
       "context": "compact-0080-context.jsonld",
       "expect": "compact-0080-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0081",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compacts named graph",
+      "purpose": "Graph compaction works if term @graphId matches graph @id",
+      "input": "compact-0081-in.jsonld",
+      "context": "compact-0081-context.jsonld",
+      "expect": "compact-0081-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0082",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Does not compacts graph with @id without matching @graphId",
+      "purpose": "Graph compaction works only on graphs with matching identifier",
+      "input": "compact-0082-in.jsonld",
+      "context": "compact-0082-context.jsonld",
+      "expect": "compact-0082-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#tc001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],

test-suite/tests/expand-0082-in.jsonld

@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph", "@graphId": "gid"}
+  },
+  "input": {
+    "value": "x"
+  }
+}

test-suite/tests/expand-0082-out.jsonld

@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.org/gid",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]

test-suite/tests/expand-0083-in.jsonld

@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph", "@graphId": "_:gid"}
+  },
+  "input": {
+    "value": "x"
+  }
+}

test-suite/tests/expand-0083-out.jsonld

@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "_:gid",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]

test-suite/tests/expand-manifest.jsonld

@@ -578,10 +578,26 @@
       "@id": "#t0081",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Does not create an @graph container if value is a graph",
-      "purpose": "Use of [@graph, @set] containers where value is already a graph",
+      "purpose": "Don't double-expand an already expanded graph",
       "input": "expand-0081-in.jsonld",
       "expect": "expand-0081-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0082",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Creates a @graph container with an @graphId",
+      "purpose": "Compaction of named graphs",
+      "input": "expand-0082-in.jsonld",
+      "expect": "expand-0082-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0083",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Creates a @graph container with an blank @graphId",
+      "purpose": "Creates a @graph container with an @graphId which is a blank node",
+      "input": "expand-0083-in.jsonld",
+      "expect": "expand-0083-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#tc001",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],