Merge remote-tracking branch 'origin/master' into issue-430-containers

# Conflicts:
#	test-suite/tests/compact-manifest.jsonld
#	test-suite/tests/expand-manifest.jsonld

Author: gkellogg

test-suite/tests/compact-manifest.jsonld

@@ -592,71 +592,80 @@
       "purpose": "Compaction using a scoped context uses term scope for selecting proper term",
       "input": "compact-c001-in.jsonld",
       "context": "compact-c001-context.jsonld",
-      "expect": "compact-c001-out.jsonld"
+      "expect": "compact-c001-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc002",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "overriding a term",
       "purpose": "Compaction using a scoped context uses term scope for selecting proper term",
       "input": "compact-c002-in.jsonld",
       "context": "compact-c002-context.jsonld",
-      "expect": "compact-c002-out.jsonld"
+      "expect": "compact-c002-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc003",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "property and value with different terms mapping to the same expanded property",
       "purpose": "Compaction using a scoped context uses term scope for selecting proper term",
       "input": "compact-c003-in.jsonld",
       "context": "compact-c003-context.jsonld",
-      "expect": "compact-c003-out.jsonld"
+      "expect": "compact-c003-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc004",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "deep @context affects nested nodes",
       "purpose": "Compaction using a scoped context uses term scope for selecting proper term",
       "input": "compact-c004-in.jsonld",
       "context": "compact-c004-context.jsonld",
-      "expect": "compact-c004-out.jsonld"
+      "expect": "compact-c004-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc005",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "scoped context layers on intemediate contexts",
       "purpose": "Compaction using a scoped context uses term scope for selecting proper term",
       "input": "compact-c005-in.jsonld",
       "context": "compact-c005-context.jsonld",
-      "expect": "compact-c005-out.jsonld"
+      "expect": "compact-c005-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "Indexes to object not having an @id",
       "purpose": "Compaction using @container: @id",
       "input": "compact-m001-in.jsonld",
       "context": "compact-m001-context.jsonld",
-      "expect": "compact-m001-out.jsonld"
+      "expect": "compact-m001-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm002",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "Indexes to object already having an @id",
       "purpose": "Compaction using @container: @id",
       "input": "compact-m002-in.jsonld",
       "context": "compact-m002-context.jsonld",
-      "expect": "compact-m002-out.jsonld"
+      "expect": "compact-m002-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm003",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "Indexes to object not having an @type",
       "purpose": "Compaction using @container: @type",
       "input": "compact-m003-in.jsonld",
       "context": "compact-m003-context.jsonld",
-      "expect": "compact-m003-out.jsonld"
+      "expect": "compact-m003-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm004",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
       "name": "Indexes to object already having an @type",
       "purpose": "Compaction using @container: @type",
       "input": "compact-m004-in.jsonld",
       "context": "compact-m004-context.jsonld",
-      "expect": "compact-m004-out.jsonld"
+      "expect": "compact-m004-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }
   ]
 }

test-suite/tests/expand-manifest.jsonld

@@ -564,63 +564,72 @@
       "name": "adding new term",
       "purpose": "Expansion using a scoped context uses term scope for selecting proper term",
       "input": "expand-c001-in.jsonld",
-      "expect": "expand-c001-out.jsonld"
+      "expect": "expand-c001-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc002",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "overriding a term",
       "purpose": "Expansion using a scoped context uses term scope for selecting proper term",
       "input": "expand-c002-in.jsonld",
-      "expect": "expand-c002-out.jsonld"
+      "expect": "expand-c002-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc003",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "property and value with different terms mapping to the same expanded property",
       "purpose": "Expansion using a scoped context uses term scope for selecting proper term",
       "input": "expand-c003-in.jsonld",
-      "expect": "expand-c003-out.jsonld"
+      "expect": "expand-c003-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc004",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "deep @context affects nested nodes",
       "purpose": "Expansion using a scoped context uses term scope for selecting proper term",
       "input": "expand-c004-in.jsonld",
-      "expect": "expand-c004-out.jsonld"
+      "expect": "expand-c004-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tc005",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "scoped context layers on intemediate contexts",
       "purpose": "Expansion using a scoped context uses term scope for selecting proper term",
       "input": "expand-c005-in.jsonld",
-      "expect": "expand-c005-out.jsonld"
+      "expect": "expand-c005-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm001",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Adds @id to object not having an @id",
       "purpose": "Expansion using @container: @id",
       "input": "expand-m001-in.jsonld",
-      "expect": "expand-m001-out.jsonld"
+      "expect": "expand-m001-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm002",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Retains @id in object already having an @id",
       "purpose": "Expansion using @container: @id",
       "input": "expand-m002-in.jsonld",
-      "expect": "expand-m002-out.jsonld"
+      "expect": "expand-m002-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm003",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Adds @type to object not having an @type",
       "purpose": "Expansion using @container: @type",
       "input": "expand-m003-in.jsonld",
-      "expect": "expand-m003-out.jsonld"
+      "expect": "expand-m003-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }, {
       "@id": "#tm004",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Prepends @type in object already having an @type",
       "purpose": "Expansion using @container: @type",
       "input": "expand-m004-in.jsonld",
-      "expect": "expand-m004-out.jsonld"
+      "expect": "expand-m004-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1"}
     }
   ]
 }