Fix test output for html/f004 for default extractAllScripts to false.

gkellogg · gkellogg · commit 11e6c7d7f5bd · 2024-10-25T14:48:58.000-07:00
Add html/f005 with extractAllScripts set to true. For #603.
diff --git a/tests/html-manifest.html b/tests/html-manifest.html
@@ -982,7 +982,7 @@ <h2>
           </dl>
         </dd>
         <dt id='tf004'>
-          Test tf004 Flattens all script elements by default
+          Test tf004 Flattens first script element by default
         </dt>
         <dd>
           <dl class='entry'>
@@ -1015,6 +1015,42 @@ <h2>
             </dd>
           </dl>
         </dd>
+        <dt id='tf005'>
+          Test tf005 Flattens all script elements if extractAllScripts set to true
+        </dt>
+        <dd>
+          <dl class='entry'>
+            <dt>id</dt>
+            <dd>#tf005</dd>
+            <dt>Type</dt>
+            <dd>jld:PositiveEvaluationTest, jld:FlattenTest, jld:HtmlTest</dd>
+            <dt>Purpose</dt>
+            <dd>Tests embedded JSON-LD in HTML multiple script elements</dd>
+            <dt>input</dt>
+            <dd>
+              <a href='html/f005-in.html'>html/f005-in.html</a>
+            </dd>
+            <dt>context</dt>
+            <dd>
+              <a href='html/f005-context.jsonld'>html/f005-context.jsonld</a>
+            </dd>
+            <dt>expect</dt>
+            <dd>
+              <a href='html/f005-out.jsonld'>html/f005-out.jsonld</a>
+            </dd>
+            <dt>Options</dt>
+            <dd>
+              <dl class='options'>
+                <dt>specVersion</dt>
+                <dd>json-ld-1.1</dd>
+                <dt>processorFeature</dt>
+                <dd>HTML Script Extraction</dd>
+                <dt>extractAllScripts</dt>
+                <dd>true</dd>
+              </dl>
+            </dd>
+          </dl>
+        </dd>
         <dt id='tr001'>
           Test tr001 Transforms embedded JSON-LD script element
         </dt>
diff --git a/tests/html-manifest.jsonld b/tests/html-manifest.jsonld
@@ -275,12 +275,25 @@
   }, {
     "@id": "#tf004",
     "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest", "jld:HtmlTest"],
-    "name": "Flattens all script elements by default",
+    "name": "Flattens first script element by default",
     "purpose": "Tests embedded JSON-LD in HTML multiple script elements",
     "input": "html/f004-in.html",
     "context": "html/f004-context.jsonld",
     "expect": "html/f004-out.jsonld",
     "option": {"specVersion": "json-ld-1.1", "processorFeature": "HTML Script Extraction"}
+  }, {
+    "@id": "#tf005",
+    "@type": ["jld:PositiveEvaluationTest", "jld:FlattenTest", "jld:HtmlTest"],
+    "name": "Flattens all script elements if extractAllScripts set to true",
+    "purpose": "Tests embedded JSON-LD in HTML multiple script elements",
+    "input": "html/f005-in.html",
+    "context": "html/f005-context.jsonld",
+    "expect": "html/f005-out.jsonld",
+    "option": {
+      "specVersion": "json-ld-1.1",
+      "processorFeature": "HTML Script Extraction",
+      "extractAllScripts": true
+    }
   }, {
     "@id": "#tr001",
     "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest", "jld:HtmlTest"],
diff --git a/tests/html/f004-out.jsonld b/tests/html/f004-out.jsonld
@@ -4,8 +4,6 @@
     "foo": {"@id": "http://example.com/foo", "@container": "@list"}
   },
   "@graph": [
-    {"@id": "_:b0", "foo": ["bar"]},
-    {"@id": "_:b1", "ex:foo": "foo"},
-    {"@id": "_:b2", "ex:bar": "bar"}
+    {"@id": "_:b0", "foo": ["bar"]}
   ]
 }
diff --git a/tests/html/f005-context.jsonld b/tests/html/f005-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "ex": "http://example.com/",
+    "foo": {"@id": "http://example.com/foo", "@container": "@list"}
+  }
+}
diff --git a/tests/html/f005-in.html b/tests/html/f005-in.html
@@ -0,0 +1,18 @@
+<html>
+  <head>
+    <script type="application/ld+json">
+    {
+      "@context": {
+        "foo": {"@id": "http://example.com/foo", "@container": "@list"}
+      },
+      "foo": [{"@value": "bar"}]
+    }
+    </script>
+    <script type="application/ld+json">
+    [
+      {"http://example.com/foo": {"@value": "foo"}},
+      {"http://example.com/bar": {"@value": "bar"}}
+    ]
+    </script>
+  </head>
+</html>
diff --git a/tests/html/f005-out.jsonld b/tests/html/f005-out.jsonld
@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "ex": "http://example.com/",
+    "foo": {"@id": "http://example.com/foo", "@container": "@list"}
+  },
+  "@graph": [
+    {"@id": "_:b0", "foo": ["bar"]},
+    {"@id": "_:b1", "ex:foo": "foo"},
+    {"@id": "_:b2", "ex:bar": "bar"}
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`"foo": {"@id": "http://example.com/foo", "@container": "@list"}`
`5`	`5`	`},`
`6`	`6`	`"@graph": [`
`7`		`- {"@id": "_:b0", "foo": ["bar"]},`
`8`		`- {"@id": "_:b1", "ex:foo": "foo"},`
`9`		`- {"@id": "_:b2", "ex:bar": "bar"}`
	`7`	`+ {"@id": "_:b0", "foo": ["bar"]}`
`10`	`8`	`]`
`11`	`9`	`}`