Update templates and vocab to use expectErrorCode, and regen test HTML

Author: rubensworks

tests/expand-manifest.html

@@ -4961,6 +4961,62 @@ <h2>
 </dd>
 </dl>
 </dd>
+<dt id='te048'>
+Test te048 Invalid term as relative IRI
+</dt>
+<dd>
+<dl class='entry'>
+<dt>id</dt>
+<dd>#te048</dd>
+<dt>Type</dt>
+<dd>jld:NegativeEvaluationTest, jld:ExpandTest</dd>
+<dt>Purpose</dt>
+<dd>Verifies that a relative IRI cannot be used as a term.</dd>
+<dt>input</dt>
+<dd>
+<a href='expand/e048-in.jsonld'>expand/e048-in.jsonld</a>
+</dd>
+<dt>expect</dt>
+<dd>
+invalid IRI mapping
+</dd>
+<dt>Options</dt>
+<dd>
+<dl class='options'>
+<dt>specVersion</dt>
+<dd>json-ld-1.1</dd>
+</dl>
+</dd>
+</dl>
+</dd>
+<dt id='te049'>
+Test te049 A relative IRI cannot be used as a prefix
+</dt>
+<dd>
+<dl class='entry'>
+<dt>id</dt>
+<dd>#te049</dd>
+<dt>Type</dt>
+<dd>jld:NegativeEvaluationTest, jld:ExpandTest</dd>
+<dt>Purpose</dt>
+<dd>Verifies that a relative IRI cannot be used as a term.</dd>
+<dt>input</dt>
+<dd>
+<a href='expand/e049-in.jsonld'>expand/e049-in.jsonld</a>
+</dd>
+<dt>expect</dt>
+<dd>
+invalid term definition
+</dd>
+<dt>Options</dt>
+<dd>
+<dl class='options'>
+<dt>specVersion</dt>
+<dd>json-ld-1.1</dd>
+</dl>
+</dd>
+</dl>
+</dd>
 <dt id='tec01'>
 Test tec01 Invalid keyword in term definition
 </dt>

tests/template.haml

@@ -177,7 +177,7 @@
                   %dt="expect"
                   %dd
                     - if entry['@type'].to_s.include?('Negative')
-                      =entry['expect']
+                      =entry['expectErrorCode']
                     - else
                       %a{href: entry['expect']}=entry['expect']
                   - if entry['option']

tests/vocab.html

@@ -62,7 +62,7 @@
       "@id": "jld:Test",
       "rdfs:label": "Superclass of all JSON-LD tests",
       "@type": "rdfs:Class",
-      "rdfs:comment": "All JSON-LD tests have an input file referenced using `mf:action` (aliased as \"input\" in test manifest). Positive and Negative Evaluation Tests also have a result file referenced using `mf:result` (aliased as \"expect\" in test manifest). Other tests may take different inputs and options as defined for each test class. Tests should be run with the processingMode option set to \"json-ld-1.1\", unless specified explicitly as a test option."
+      "rdfs:comment": "All JSON-LD tests have an input file referenced using `mf:action` (aliased as \"input\" in test manifest). Positive and Negative Evaluation Tests also have a result file referenced using `mf:result` (aliased as \"expect\" and \"expectErrorCode\" for respectively Positive and Negative Evaluation Tests in test manifest). Other tests may take different inputs and options as defined for each test class. Tests should be run with the processingMode option set to \"json-ld-1.1\", unless specified explicitly as a test option."
     },
     {
       "@id": "jld:useNativeTypes",
@@ -108,7 +108,7 @@
       "rdfs:label": "Positive Evaluation Test",
       "@type": "rdfs:Class",
       "rdfs:subClassOf": "jld:Test",
-      "rdfs:comment": "A Negative Evaluation test is successful when the result of processing the input file specified as `mf:action` (aliased as \"input\" in test manifest) results in the error identified by the literal value of `mf:result` (aliased as \"expect\" in test manifest). The specifics of invoking test, including the interpretation of options (`:option`) and other input files are specified through another class. See the [README](https://w3c.github.io/json-ld-api/tests/) for more details on running tests."
+      "rdfs:comment": "A Negative Evaluation test is successful when the result of processing the input file specified as `mf:action` (aliased as \"input\" in test manifest) results in the error identified by the literal value of `mf:result` (aliased as \"expectErrorCode\" in test manifest). The specifics of invoking test, including the interpretation of options (`:option`) and other input files are specified through another class. See the [README](https://w3c.github.io/json-ld-api/tests/) for more details on running tests."
     },
     {
       "@id": "jld:HtmlTest",
@@ -318,8 +318,8 @@ <h2>Test Case Classes</h2>
 <dt><strong>Negative Syntax Test</strong></dt>
 <dd><p>A type of test specifically for syntax testing. Syntax tests are not required to have an associated result, only an action. Negative syntax tests are tests of which the result should be a parser error.</p>
 </dd>
-<dt><strong>Positive Evaluation Test</strong></dt>
-<dd><p>A Negative Evaluation test is successful when the result of processing the input file specified as <code>mf:action</code> (aliased as &quot;input&quot; in test manifest) results in the error identified by the literal value of <code>mf:result</code> (aliased as &quot;expect&quot; in test manifest). The specifics of invoking test, including the interpretation of options (<code>:option</code>) and other input files are specified through another class. See the <a href="https://w3c.github.io/json-ld-api/tests/">README</a> for more details on running tests.</p>
+<dt><strong>Negative Evaluation Test</strong></dt>
+<dd><p>A Negative Evaluation test is successful when the result of processing the input file specified as <code>mf:action</code> (aliased as &quot;input&quot; in test manifest) results in the error identified by the literal value of <code>mf:result</code> (aliased as &quot;expectErrorCode&quot; in test manifest). The specifics of invoking test, including the interpretation of options (<code>:option</code>) and other input files are specified through another class. See the <a href="https://w3c.github.io/json-ld-api/tests/">README</a> for more details on running tests.</p>
 </dd>
 <dt><strong>Positive Evaluation Test</strong></dt>
 <dd><p>A Positive Evaluation test is successful when the result of processing the input file specified as <code>mf:action</code> (aliased as &quot;input&quot; in test manifest) exactly matches the output file specified as <code>mf:result</code> (aliased as &quot;expect&quot; in test manifest) using the comparison defined in another class. The specifics of invoking test, including the interpretation of options (<code>:option</code>) and other input files are specified through another class.</p>
@@ -331,7 +331,7 @@ <h2>Test Case Classes</h2>
 <dd><p>Options passed to the test runner to affect invocation of the appropriate API method.</p>
 </dd>
 <dt><strong>Superclass of all JSON-LD tests</strong></dt>
-<dd><p>All JSON-LD tests have an input file referenced using <code>mf:action</code> (aliased as &quot;input&quot; in test manifest). Positive and Negative Evaluation Tests also have a result file referenced using <code>mf:result</code> (aliased as &quot;expect&quot; in test manifest). Other tests may take different inputs and options as defined for each test class. Tests should be run with the processingMode option set to &quot;json-ld-1.1&quot;, unless specified explicitly as a test option.</p>
+<dd><p>All JSON-LD tests have an input file referenced using <code>mf:action</code> (aliased as &quot;input&quot; in test manifest). Positive and Negative Evaluation Tests also have a result file referenced using <code>mf:result</code> (aliased as &quot;expect&quot; and &quot;expectErrorCode&quot; for respectively Positive and Negative Evaluation Tests in test manifest). Other tests may take different inputs and options as defined for each test class. Tests should be run with the processingMode option set to &quot;json-ld-1.1&quot;, unless specified explicitly as a test option.</p>
 </dd>
 <dt><strong>To RDF Evaluation Test</strong></dt>
 <dd><p>A <code>ToRDFTest</code> modifies either a <code>PositiveEvaluationTest</code>, <code>NegativeEvaluationTest</code>, <code>PositiveSyntaxTest</code> or <code>NegativeSyntaxTest</code>.</p>

tests/vocab.jsonld

@@ -56,7 +56,7 @@
       "@id": "jld:Test",
       "rdfs:label": "Superclass of all JSON-LD tests",
       "@type": "rdfs:Class",
-      "rdfs:comment": "All JSON-LD tests have an input file referenced using `mf:action` (aliased as \"input\" in test manifest). Positive and Negative Evaluation Tests also have a result file referenced using `mf:result` (aliased as \"expect\" in test manifest). Other tests may take different inputs and options as defined for each test class. Tests should be run with the processingMode option set to \"json-ld-1.1\", unless specified explicitly as a test option."
+      "rdfs:comment": "All JSON-LD tests have an input file referenced using `mf:action` (aliased as \"input\" in test manifest). Positive and Negative Evaluation Tests also have a result file referenced using `mf:result` (aliased as \"expect\" and \"expectErrorCode\" for respectively Positive and Negative Evaluation Tests in test manifest). Other tests may take different inputs and options as defined for each test class. Tests should be run with the processingMode option set to \"json-ld-1.1\", unless specified explicitly as a test option."
     },
     {
       "@id": "jld:useNativeTypes",
@@ -99,10 +99,10 @@
     },
     {
       "@id": "jld:NegativeEvaluationTest",
-      "rdfs:label": "Positive Evaluation Test",
+      "rdfs:label": "Negative Evaluation Test",
       "@type": "rdfs:Class",
       "rdfs:subClassOf": "jld:Test",
-      "rdfs:comment": "A Negative Evaluation test is successful when the result of processing the input file specified as `mf:action` (aliased as \"input\" in test manifest) results in the error identified by the literal value of `mf:result` (aliased as \"expect\" in test manifest). The specifics of invoking test, including the interpretation of options (`:option`) and other input files are specified through another class. See the [README](https://w3c.github.io/json-ld-api/tests/) for more details on running tests."
+      "rdfs:comment": "A Negative Evaluation test is successful when the result of processing the input file specified as `mf:action` (aliased as \"input\" in test manifest) results in the error identified by the literal value of `mf:result` (aliased as \"expectErrorCode\" in test manifest). The specifics of invoking test, including the interpretation of options (`:option`) and other input files are specified through another class. See the [README](https://w3c.github.io/json-ld-api/tests/) for more details on running tests."
     },
     {
       "@id": "jld:HtmlTest",

tests/vocab.ttl

@@ -25,7 +25,8 @@
     All JSON-LD tests have an input file referenced using
     `mf:action` (aliased as "input" in test manifest).
     Positive and Negative Evaluation Tests also have a result file
-    referenced using `mf:result` (aliased as "expect" in test manifest).
+    referenced using `mf:result` (aliased as "expect" and "expectErrorCode" for
+    respectively Positive and Negative Evaluation Tests in test manifest).
     Other tests may take different inputs and options as defined for each test class.
     Tests should be run with the processingMode option set to "json-ld-1.1",
     unless specified explicitly as a test option.
@@ -44,13 +45,13 @@
   """ .
 
 :NegativeEvaluationTest a rdfs:Class ;
-  rdfs:label "Positive Evaluation Test" ;
+  rdfs:label "Negative Evaluation Test" ;
   rdfs:subClassOf :Test ;
   rdfs:comment """
     A Negative Evaluation test is successful when the result of processing
     the input file specified as `mf:action` (aliased as "input" in test manifest)
     results in the error identified by the literal value of
-    `mf:result` (aliased as "expect" in test manifest).
+    `mf:result` (aliased as "expectErrorCode" in test manifest).
     The specifics of invoking test, including
     the interpretation of options (`:option`) and other input files are
     specified through another class.