Update anno tests to reflect test strategy (#3704)

As approved by the working group on 9 September.

* Fixed lint errors.

annotation-model/annotations/3.1-annotationContextValidated.json

@@ -5,7 +5,7 @@
   "expectedResult": "valid",
   "onUnexpectedResult" : "failAndContinue",
   "errorMessage": "ERROR: Annotation is missing @context key or 'http://www.w3.org/ns/anno.jsonld' is not a value of @context.",
-  "title": "Annotation has **_@context_ key** and '**http://www.w3.org/ns/anno.jsonld**' is **a value of _@context_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
+  "title": "Implements **_@context_ key** and '**http://www.w3.org/ns/anno.jsonld**' is **a value of _@context_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
   "description": "True when the Annotation has @context key and 'http://www.w3.org/ns/anno.jsonld' is an @context value (Section 3.1)",
   "type": "object",
   "required": [ "@context" ],

annotation-model/annotations/3.1-annotationIdValidated.json

@@ -5,7 +5,7 @@
   "expectedResult": "valid",
   "onUnexpectedResult" : "failAndContinue",
   "errorMessage": "ERROR: Annotation is missing id key or its value is not a single string of format uri.",
-  "title": "Annotation has **_id_ key** which has a **single value** that is a **string of format uri** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
+  "title": "Implements **Annotation _id_ key** which has a **single value** that is a **string of format uri** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
   "description": "True when the Annotation has a single id that is a string of format uri (Section 3.1)",
     "$ref": "id.json#/definitions/idValueFound"
 }

annotation-model/annotations/3.1-annotationTypeValidated.json

@@ -5,7 +5,7 @@
   "expectedResult": "valid",
   "onUnexpectedResult" : "failAndContinue",
   "errorMessage": "ERROR: Annotation is missing type key or 'Annotation' is not a value of type.",
-  "title": "Annotation has **_type_ key** and '**Annotation**' is **a value of _type_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
+  "title": "Implements  **Annotation _type_ key** and '**Annotation**' is **a value of _type_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
   "allOf": [
   { "$ref": "annotations.json#/definitions/annotationTypeValueFound"}
   ]

annotation-model/annotations/3.1-targetKeyFound.json

@@ -5,7 +5,7 @@
   "expectedResult": "valid",
   "onUnexpectedResult" : "failAndContinue",
   "errorMessage": "Error: Annotation is missing target  key.",
-  "title": "Annotation has a **_target_ key** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
+  "title": "Implements **_target_ key** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)",
   "description": "True when the Annotation has a target key (Section 3.1)",
   "type": "object",
   "required": ["target" ]

annotation-model/annotations/3.2-bodyObjectsRecognized.json

@@ -6,7 +6,7 @@
     "onUnexpectedResult" : "failAndContinue",
     "errorMessage": "ERROR: One or more Bodies of the Annotation is not one of a string of format uri, an External Web Resource, a Choice or Set, a Specific Resource.",
     "title": "If present, each **_body_** is one of a **string of format uri**, an **External Web Resource**, an **Embedded Textual Body**, a **Choice** or **Set**, or a **Specific Resource** - [model 3.2](https://www.w3.org/TR/annotation-model/#bodies-and-targets), [model 4](https://www.w3.org/TR/annotation-model/#specific-resources)",
-    "description": "True when all Body(ies) are one of a string of format uri, an External Web Resource, a Choice or Set, a Specific Resource (Sections 3.2, Section 4)",
+    "description": "True when all Bodies are one of a string of format uri, an External Web Resource, a Choice or Set, a Specific Resource (Sections 3.2, Section 4)",
     "type": "object",
     "properties":
       {

annotation-model/annotations/3.3.1-annotationCreatedImplemented.json

@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "id": "3.3.1-annotationCreatedImplemented.json",
-  "assertionType": "may",
+  "assertionType": "should",
   "expectedResult": "valid",
   "onUnexpectedResult" : "passAndContinue",
-  "errorMessage": "Valid Annotation-level created key not found. Annotation may have zero or exactly one created key value.",
+  "errorMessage": "Valid Annotation-level created key not found. Annotation should have exactly one created key value.",
   "title": "Implements Annotation-level **_created_ key** which has a **single value** that is a **string of format date-time** - [model 3.3.1](https://www.w3.org/TR/annotation-model/#lifecycle-information)",
   "description": "True when the Annotation implements exactly one created key value (Section 3.3.1)",
   "allOf":

annotation-model/annotations/3.3.7-annotationViaValidated.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "3.3.7-annotationviaValidated.json",
+  "id": "3.3.7-annotationViaValidated.json",
   "assertionType": "must",
   "expectedResult": "valid",
   "onUnexpectedResult" : "failAndContinue",

annotation-model/annotations/annotationMusts-manual.html

@@ -1,7 +1,8 @@
 <!doctype html>
 <html>
 <head>
-<title>Annotation has all required keys and all annotation keys used meet required value constraints</title>
+<title>A single ANNOTATION has all required keys and all annotation keys used meet required value constraints</title>
+<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
@@ -11,26 +12,12 @@
 setup({explicit_timeout: true, explicit_done: true });
 
 var theDefinitions=[
-  "definitions/compositeDetected.json",
-  "definitions/processingLanguageDetected.json",
-  "definitions/textDirectionDetected.json",
-  "definitions/independentsDetected.json",
   "definitions/specificResource.json",
-  "definitions/stringUri.json",
   "definitions/choiceSet.json",
   "definitions/bodyTarget.json",
-  "definitions/listDetected.json",
-  "definitions/formatDetected.json",
   "definitions/annotations.json",
   "definitions/otherProperties.json",
-  "definitions/choiceDetected.json",
-  "definitions/externalWebResource.json",
-  "definitions/externalWebResourceDetected.json",
-  "definitions/languageDetected.json",
-  "definitions/textualBody.json",
-  "definitions/id.json",
-  "definitions/itemsDetected.json",
-  "definitions/specificResourceDetected.json"
+  "definitions/id.json"
 ];
 
 var theTestFile="annotationMusts.test";

annotation-model/annotations/annotationMusts.test

@@ -1,9 +1,9 @@
 {
   "@context": "https://www.w3.org/ns/JSONtest-v1.jsonld",
-  "name": "Annotation has all required keys and all annotation keys used meet required value constraints",
-  "description": "Web Annotations: <ul> <li>MUST include certain properties (keys)</li> <li>MUST NOT have both body and bodyValue keys simultaneously</li> <li>MUST satisfy model constraints on values of required and any optional Annotation keys used</li> </ul> Note: Optional Annotation keys, optional constraints on key values, and optional and required details of body(ies) and target(s) checked by other tests.",
+  "name": "A single ANNOTATION has all required keys and all annotation keys used meet required value constraints",
+  "description": "Web Annotations: <ul> <li>MUST include certain properties (keys)</li> <li>MUST NOT have both body and bodyValue keys simultaneously</li> <li>MUST satisfy model constraints on values of required and any optional Annotation keys used</li> </ul> Note: Implementation of optional Annotation keys (features), optional constraints on key values, and optional keys and constraints on Agents involved in an Annotation checked by other tests.",
   "testType": "manual",
-  "ref": "https://www.w3.org/TR/annotation-model/#annotations",
+  "ref": "https://www.w3.org/TR/annotation-model/",
   "assertions": [
     "annotations/3.1-annotationContextValidated.json",
     "annotations/3.1-annotationIdValidated.json",
@@ -18,6 +18,46 @@
     "annotations/3.3.1-annotationGeneratedValidated.json",
     "annotations/3.3.6-annotationRightsValidated.json",
     "annotations/3.3.7-annotationCanonicalValidated.json",
-    "annotations/3.3.7-annotationViaValidated.json"
+    "annotations/3.3.7-annotationViaValidated.json",
+    "annotations/bodiesTargets/3.2.1-bodyTextDirectionValidated.json",
+    "annotations/bodiesTargets/3.3.1-bodyCreatedValidated.json",
+    "annotations/bodiesTargets/3.3.1-bodyModifiedValidated.json",
+    "annotations/bodiesTargets/3.3.6-bodyRightsValidated.json",
+    "annotations/bodiesTargets/3.3.7-bodyCanonicalValidated.json",
+    "annotations/bodiesTargets/3.3.7-bodyViaValidated.json",
+    "annotations/bodiesTargets/3.2.7-bodyEWRNoItems.json",
+    "annotations/bodiesTargets/3.3.5-bodyEWRNoPurpose.json",
+    "annotations/bodiesTargets/3.2.4-bodyChoiceSetNoValue.json",
+    "annotations/bodiesTargets/4-bodyChoiceSetNoSource.json",
+    "annotations/bodiesTargets/3.3.5-bodyChoiceSetNoPurpose.json",
+    "annotations/bodiesTargets/3.2.7-bodyEmbeddedTextualNoItems.json",
+    "annotations/bodiesTargets/4-bodyEmbeddedTextualNoSource.json",
+    "annotations/bodiesTargets/3.2.7-bodySpecificResourceNoItems.json",
+    "annotations/bodiesTargets/4-bodySpecificResourceNoValue.json",
+    "annotations/bodiesTargets/3.2.1-targTextDirectionValidated.json",
+    "annotations/bodiesTargets/3.3.1-targCreatedValidated.json",
+    "annotations/bodiesTargets/3.3.1-targModifiedValidated.json",
+    "annotations/bodiesTargets/3.3.6-targRightsValidated.json",
+    "annotations/bodiesTargets/3.3.7-targCanonicalValidated.json",
+    "annotations/bodiesTargets/3.3.7-targViaValidated.json",
+    "annotations/bodiesTargets/3.2.7-targEWRNoItems.json",
+    "annotations/bodiesTargets/3.3.5-targEWRNoPurpose.json",
+    "annotations/bodiesTargets/3.2.4-targChoiceSetNoValue.json",
+    "annotations/bodiesTargets/4-targChoiceSetNoSource.json",
+    "annotations/bodiesTargets/3.3.5-targChoiceSetNoPurpose.json",
+    "annotations/bodiesTargets/3.2.7-targSpecificResourceNoItems.json",
+    "annotations/bodiesTargets/4-targSpecificResourceNoValue.json",
+    "annotations/bodiesTargets/3.2.4-targNoTypeTextualBody.json",
+    "annotations/specificResource/4.2-selectorValidIfPresent.json",
+    "annotations/specificResource/4.3-stateValidIfPresent.json",
+    "annotations/specificResource/4.3.3-refinedByValidated.json",
+    "annotations/specificResource/4.4-styleClassValidIfPresent.json",
+    "annotations/specificResource/4.2-fragmentCssXPathSelectorValid.json",
+    "annotations/specificResource/4.2.4-textQuoteSelectorValid.json",
+    "annotations/specificResource/4.2-TextDataPositionSelectorValid.json",
+    "annotations/specificResource/4.2.7-svgSelectorValid.json",
+    "annotations/specificResource/4.2.8-rangeSelectorValid.json",
+    "annotations/specificResource/4.3.1-timeStateValid.json",
+    "annotations/specificResource/4.3.2-httpRequestStateValid.json"
   ]
 }

annotation-model/annotations/annotationOptionals-manual.html

@@ -2,6 +2,7 @@
 <html>
 <head>
 <title>Annotation implements optional keys and meets optional key value constraints</title>
+<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
@@ -11,26 +12,12 @@
 setup({explicit_timeout: true, explicit_done: true });
 
 var theDefinitions=[
-  "definitions/compositeDetected.json",
-  "definitions/processingLanguageDetected.json",
-  "definitions/textDirectionDetected.json",
-  "definitions/independentsDetected.json",
   "definitions/specificResource.json",
-  "definitions/stringUri.json",
   "definitions/choiceSet.json",
   "definitions/bodyTarget.json",
-  "definitions/listDetected.json",
-  "definitions/formatDetected.json",
   "definitions/annotations.json",
   "definitions/otherProperties.json",
-  "definitions/choiceDetected.json",
-  "definitions/externalWebResource.json",
-  "definitions/externalWebResourceDetected.json",
-  "definitions/languageDetected.json",
-  "definitions/textualBody.json",
-  "definitions/id.json",
-  "definitions/itemsDetected.json",
-  "definitions/specificResourceDetected.json"
+  "definitions/id.json"
 ];
 
 var theTestFile="annotationOptionals.test";

annotation-model/annotations/annotationOptionals.test

@@ -5,21 +5,87 @@
   "testType": "manual",
   "ref": "https://www.w3.org/TR/annotation-model/#other-properties",
   "assertions": [
-    "annotations/3.1-bodyKeyFound.json",
     "annotations/3.3.1-annotationSingleCreatorImplemented.json",
     "annotations/3.3.1-annotationCreatedImplemented.json",
     "annotations/3.3.5-annotationSingleMotivationImplemented.json",
     "annotations/3.2.5-bodyValueImplemented.json",
-    "annotations/3.3.1-annotationCreatorImplemented.json",
-    "annotations/3.3.1-annotationGeneratorImplemented.json",
     "annotations/3.3.1-annotationGeneratedImplemented.json",
     "annotations/3.3.1-annotationModifiedImplemented.json",
     "annotations/3.3.3-annotationAudienceImplemented.json",
     "annotations/3.3.5-annotationMotivationImplemented.json",
     "annotations/3.3.6-annotationRightsImplemented.json",
     "annotations/3.3.7-annotationCanonicalImplemented.json",
     "annotations/3.3.7-annotationViaImplemented.json",
-    "annotations/4.4-annotationStylesheetImplemented.json"
-
+    "annotations/4.4-annotationStylesheetImplemented.json",
+    "annotations/3.1-bodyKeyFound.json",
+    "annotations/bodiesTargets/3.2.1-bodySingleFormat.json",
+    "annotations/bodiesTargets/3.2.1-bodySingleLanguage.json",
+    "annotations/bodiesTargets/3.3.1-bodySingleCreator.json",
+    "annotations/bodiesTargets/3.3.1-bodyCreated.json",
+    "annotations/bodiesTargets/3.2.1-bodyFormat.json",
+    "annotations/bodiesTargets/3.2.1-bodyLanguage.json",
+    "annotations/bodiesTargets/3.2.2-bodyType.json",
+    "annotations/bodiesTargets/3.2.1-bodyProcessingLanguage.json",
+    "annotations/bodiesTargets/3.2.1-bodyTextDirection.json",
+    "annotations/bodiesTargets/3.3.1-bodyModified.json",
+    "annotations/bodiesTargets/3.3.3-bodyAudience.json",
+    "annotations/bodiesTargets/3.3.4-bodyAccessibility.json",
+    "annotations/bodiesTargets/3.3.5-bodyPurpose.json",
+    "annotations/bodiesTargets/3.3.6-bodyRights.json",
+    "annotations/bodiesTargets/3.3.7-bodyCanonical.json",
+    "annotations/bodiesTargets/3.3.7-bodyVia.json",
+    "annotations/bodiesTargets/3.2.1-bodyEWR.json",
+    "annotations/bodiesTargets/3.2.4-bodyETB.json",
+    "annotations/bodiesTargets/3.2.4-bodyETBTypeTextualBody.json",
+    "annotations/bodiesTargets/3.2.4-bodyETBTypeText.json",
+    "annotations/bodiesTargets/3.2.7-bodyChoiceSet.json",
+    "annotations/bodiesTargets/3.2.7-bodyChoice.json",
+    "annotations/bodiesTargets/3.2.8-bodyList.json",
+    "annotations/bodiesTargets/3.2.8-bodyComposite.json",
+    "annotations/bodiesTargets/3.2.8-bodyIndependents.json",
+    "annotations/bodiesTargets/3.2.1-targSingleFormat.json",
+    "annotations/bodiesTargets/3.2.1-targSingleLanguage.json",
+    "annotations/bodiesTargets/3.3.1-targSingleCreator.json",
+    "annotations/bodiesTargets/3.3.1-targCreated.json",
+    "annotations/bodiesTargets/3.2.1-targFormat.json",
+    "annotations/bodiesTargets/3.2.1-targLanguage.json",
+    "annotations/bodiesTargets/3.2.2-targType.json",
+    "annotations/bodiesTargets/3.2.1-targProcessingLanguage.json",
+    "annotations/bodiesTargets/3.2.1-targTextDirection.json",
+    "annotations/bodiesTargets/3.3.1-targModified.json",
+    "annotations/bodiesTargets/3.3.3-targAudience.json",
+    "annotations/bodiesTargets/3.3.4-targAccessibility.json",
+    "annotations/bodiesTargets/3.3.5-targPurpose.json",
+    "annotations/bodiesTargets/3.3.6-targRights.json",
+    "annotations/bodiesTargets/3.3.7-targCanonical.json",
+    "annotations/bodiesTargets/3.3.7-targVia.json",
+    "annotations/bodiesTargets/3.2.1-targEWR.json",
+    "annotations/bodiesTargets/3.2.7-targChoiceSet.json",
+    "annotations/bodiesTargets/3.2.7-targChoice.json",
+    "annotations/bodiesTargets/3.2.8-targList.json",
+    "annotations/bodiesTargets/3.2.8-targComposite.json",
+    "annotations/bodiesTargets/3.2.8-targIndependents.json",
+    "annotations/bodiesTargets/4-bodySpecificResource.json",
+    "annotations/bodiesTargets/4-targSpecificResource.json",
+    "annotations/specificResource/4.3.3-refinedBy.json",
+    "annotations/specificResource/4.4-styleClass.json",
+    "annotations/specificResource/4.5-renderedVia.json",
+    "annotations/specificResource/4.6-scope.json",
+    "annotations/specificResource/4.2-selectorFound.json",
+    "annotations/specificResource/4.2.1-fragmentSelector.json",
+    "annotations/specificResource/4.2.1-conformsTo.json",
+    "annotations/specificResource/4.2.2-cssSelector.json",
+    "annotations/specificResource/4.2.3-xpathSelector.json",
+    "annotations/specificResource/4.2.4-textQuoteSelector.json",
+    "annotations/specificResource/4.2.4-prefix.json",
+    "annotations/specificResource/4.2.4-suffix.json",
+    "annotations/specificResource/4.2.5-textPositionSelector.json",
+    "annotations/specificResource/4.2.6-dataPositionSelector.json",
+    "annotations/specificResource/4.2.7-svgSelector.json",
+    "annotations/specificResource/4.2.8-rangeSelector.json",
+    "annotations/specificResource/4.3-stateFound.json",
+    "annotations/specificResource/4.3.1-timeState.json",
+    "annotations/specificResource/4.3.2-requestHeaderState.json",
+    "annotations/specificResource/4.3.1-cached.json"
   ]
 }