Add more type-scoped tests.

Author: davidlehn

tests/compact-manifest.jsonld

@@ -1121,6 +1121,15 @@
       "context": "compact/c023-context.jsonld",
       "expect": "compact/c023-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc024",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "type-scoped + property-scoped + values evaluates against previous context",
+      "purpose": "type-scoped + property-scoped + values evaluates against previous context",
+      "input": "compact/c024-in.jsonld",
+      "context": "compact/c024-context.jsonld",
+      "expect": "compact/c024-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#te001",
       "@type": [ "jld:NegativeEvaluationTest", "jld:CompactTest" ],

tests/compact/c024-context.jsonld

@@ -0,0 +1,34 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "Outer": {
+      "@id": "ex:Outer",
+      "@context": {
+        "nested": "ex:nested"
+      }
+    },
+    "Inner": {
+      "@id": "ex:Inner",
+      "@context": {
+        "@version": 1.1,
+        "val": "@value",
+        "foo": {
+          "@id": "ex:foo",
+          "@container": "@set",
+          "@type": "ex:Number",
+          "@context": {
+            "value": "@value"
+          }
+        },
+        "bar": {
+          "@id": "ex:bar",
+          "@container": "@set",
+          "@type": "@id",
+          "@context": {
+            "@base": "http://example/"
+          }
+        }
+      }
+    }
+  }
+}

tests/compact/c024-in.jsonld

@@ -0,0 +1,11 @@
+[{
+  "@type": ["ex:Outer"],
+  "ex:nested": [{
+    "@type": ["ex:Inner"],
+    "ex:foo": {"@type": "ex:Number", "@value": "1"},
+    "ex:bar": [
+      {"@id": "http://example/a"},
+      {"@id": "http://example/b"}
+    ]
+  }]
+}]

tests/compact/c024-out.jsonld

@@ -0,0 +1,40 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "Outer": {
+      "@id": "ex:Outer",
+      "@context": {
+        "nested": "ex:nested"
+      }
+    },
+    "Inner": {
+      "@id": "ex:Inner",
+      "@context": {
+        "@version": 1.1,
+        "val": "@value",
+        "foo": {
+          "@id": "ex:foo",
+          "@container": "@set",
+          "@type": "ex:Number",
+          "@context": {
+            "value": "@value"
+          }
+        },
+        "bar": {
+          "@id": "ex:bar",
+          "@container": "@set",
+          "@type": "@id",
+          "@context": {
+            "@base": "http://example/"
+          }
+        }
+      }
+    }
+  },
+  "@type": "Outer",
+  "nested": {
+    "@type": "Inner",
+    "foo": ["1"],
+    "bar": ["a", "b"]
+  }
+}

tests/expand-manifest.jsonld

@@ -1024,6 +1024,14 @@
       "input": "expand/c023-in.jsonld",
       "expect": "expand/c023-out.jsonld",
       "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#tc024",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "type-scoped + property-scoped + values evaluates against previous context",
+      "purpose": "type-scoped + property-scoped + values evaluates against previous context",
+      "input": "expand/c024-in.jsonld",
+      "expect": "expand/c024-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#te001",
       "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],

tests/expand/c024-in.jsonld

@@ -0,0 +1,40 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "Outer": {
+      "@id": "ex:Outer",
+      "@context": {
+        "nested": "ex:nested"
+      }
+    },
+    "Inner": {
+      "@id": "ex:Inner",
+      "@context": {
+        "@version": 1.1,
+        "val": "@value",
+        "foo": {
+          "@id": "ex:foo",
+          "@container": "@set",
+          "@type": "ex:Number",
+          "@context": {
+            "value": "@value"
+          }
+        },
+        "bar": {
+          "@id": "ex:bar",
+          "@container": "@set",
+          "@type": "@id",
+          "@context": {
+            "@base": "http://example/"
+          }
+        }
+      }
+    }
+  },
+  "@type": "Outer",
+  "nested": {
+    "@type": "Inner",
+    "foo": [{"value": "1"}, "2"],
+    "bar": [{"@id": "a"}, "b"]
+  }
+}

tests/expand/c024-out.jsonld

@@ -0,0 +1,14 @@
+[{
+  "@type": ["ex:Outer"],
+  "ex:nested": [{
+    "@type": ["ex:Inner"],
+    "ex:foo": [
+      {"@value": "1"},
+      {"@type": "ex:Number", "@value": "2"}
+    ],
+    "ex:bar": [
+      {"@id": "http://example/a"},
+      {"@id": "http://example/b"}
+    ]
+  }]
+}]