Fix frame expansion flag propagation (#172)

filip26 · Jun 2, 2021 · cdf74ed · cdf74ed
1 parent 8571228
commit cdf74ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/com/apicatalog/jsonld/expansion/Expansion.java b/src/main/java/com/apicatalog/jsonld/expansion/Expansion.java
@@ -89,6 +89,7 @@ public JsonValue compute() throws JsonLdError {
 
             return ArrayExpansion
                         .with(activeContext, element.asJsonArray(), activeProperty, baseUrl)
+                        .frameExpansion(frameExpansion)
                         .expand();
         }
 

diff --git a/src/main/java/com/apicatalog/jsonld/expansion/ObjectExpansion1314.java b/src/main/java/com/apicatalog/jsonld/expansion/ObjectExpansion1314.java
@@ -198,7 +198,7 @@ public void expand() throws JsonLdError {
                                             || value.asJsonArray().stream().anyMatch(JsonUtils::isNotString)
                                     )
                             ) {
-                        throw new JsonLdError(JsonLdErrorCode.INVALID_KEYWORD_ID_VALUE);
+                        throw new JsonLdError(JsonLdErrorCode.INVALID_KEYWORD_ID_VALUE, "An @id entry was encountered whose value [" + value + "] was not a string.");
 
                     // 13.4.3.2
                     } else if (JsonUtils.isString(value)) {

diff --git a/src/test/resources/com/apicatalog/jsonld/test/manifest.json b/src/test/resources/com/apicatalog/jsonld/test/manifest.json
@@ -96,8 +96,14 @@
       "name": "ToRDF: document relative subject",
       "input": "issue145-in.json",
       "expect": "issue145-out.nq"
-    }    
-
-
+    },    
+    {
+      "@id": "#t0012",
+      "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
+      "name": "Frame: @container: @id",
+      "input": "issue172-in.json",
+      "expect": "issue172-out.json",
+      "frame": "issue172-frame.json"
+    }
   ]
 }