Corrections to unit tests

david-waltermire · Aug 16, 2019 · 6a18ab5 · 6a18ab5
1 parent 97a249c
commit 6a18ab5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 36 deletions.
diff --git a/build/metaschema/unit-testing/datatypes/datatypes-prose_json-schema.json b/build/metaschema/unit-testing/datatypes/datatypes-prose_json-schema.json
@@ -37,17 +37,19 @@
             "title": "Plain text",
             "description": "plain text, no markup",
             "$id": "#/definitions/field-flag-plaintext",
+            "type": "object",
             "properties": {
                 "length": {
                     "title": "Length",
                     "description": "The length.",
                     "type": "integer",
-                    "minimum": 1
+                    "minimum": 1,
+                    "multipleOf": 1.0
                 },
-                "STRVALUE": {
-                   "type": "string"
-                }
-            }
+                "STRVALUE": {"type": "string"}
+            },
+            "required": ["STRVALUE"],
+            "additionalProperties": false
         },
         "field-richtext": {
             "title": "Rich text",
@@ -59,56 +61,46 @@
             "title": "Rich text",
             "description": "Rich text supports markup",
             "$id": "#/definitions/field-flag-richtext",
+            "type": "object",
             "properties": {
                 "length": {
                     "title": "Length",
                     "description": "The length.",
                     "type": "integer",
+                    "multipleOf": 1.0,
                     "minimum": 1
                 },
-                "RICHTEXT": {
-                   "type": "string"
-                }
-            }
+                "RICHTEXT": {"type": "string"}
+            },
+            "required": ["RICHTEXT"],
+            "additionalProperties": false
         },
         "field-prose": {
             "title": "Prose",
             "description": "Prose permits multiple paragraphs, lists, tables etc.",
             "$id": "#/definitions/field-prose",
-            "oneOf": [
-                {"type": "string"},
-                {
-                    "type": "array",
-                    "items": {"type": "string"},
-                    "minItems": 2
-                }
-            ]
+            "type": "string"
         },
         "field-flag-prose": {
             "title": "Prose",
             "description": "Prose permits multiple paragraphs, lists, tables etc.",
             "$id": "#/definitions/field-flag-prose",
+            "type" : "object",
             "properties": {
                 "length": {
                     "title": "Length",
                     "description": "The length.",
                     "type": "integer",
+                    "multipleOf": 1.0,
                     "minimum": 1
                 },
-                "PROSE": {
-                    "oneOf": [
-                        {"type": "string"},
-                        {
-                            "type": "array",
-                            "items": {"type": "string"},
-                            "minItems": 2
-                        }
-                    ]
-                }
-            }
+                "PROSE": {"type": "string"}                
+            },
+            "required": ["PROSE"],
+            "additionalProperties": false
         }
     },
     "properties": {
         "parent": {"$ref": "#/definitions/parent"}
     }
-}
+}
diff --git a/build/metaschema/unit-testing/datatypes/datatypes-prose_test-valid-PASS.json b/build/metaschema/unit-testing/datatypes/datatypes-prose_test-valid-PASS.json
@@ -1,8 +1,8 @@
 {
     "parent": {
-        "date": "2019-07-08TZ",
-        "plaintext": "Some *plain* text",
-        "richtext": "Some *rich* text",
-        "prose": [ "Here's some *extra prose*" ]
+        "field-date": "2019-07-08TZ",
+        "field-plaintext": "Some *plain* text",
+        "field-richtext": "Some *rich* text",
+        "field-prose": "Here's some *extra prose*"
     }
 }
diff --git a/build/metaschema/unit-testing/flag/flag-basic_json-schema.json b/build/metaschema/unit-testing/flag/flag-basic_json-schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "http://csrc.nist.gov/ns/oscal/unit-testing/flag-basic-schema.json",
-    "$comment": "Metaschema Unit Test: flag: basic flag",
+    "$comment": "Metaschema Unit Test: flag: basic flag: JSON Schema",
     "type": "object",
     "definitions": {
         "parent": {

diff --git a/build/metaschema/unit-testing/flag/flag-basic_metaschema.xml b/build/metaschema/unit-testing/flag/flag-basic_metaschema.xml
@@ -8,7 +8,7 @@
  xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
  xmlns:o="http://csrc.nist.gov/ns/oscal/example"
  root="parent">
-  <schema-name>Metaschema Unit Test: group-as</schema-name>
+  <schema-name>Metaschema Unit Test: flag: basic flag</schema-name>
   <schema-version>1.0-milestone1</schema-version>
   <short-name>metaschema-group-as</short-name>
   <namespace>http://csrc.nist.gov/ns/oscal/unit-testing/flag-basic</namespace>

diff --git a/build/metaschema/unit-testing/group-as/group-as-by-key_test_valid_PASS.json b/build/metaschema/unit-testing/group-as/group-as-by-key_test_valid_PASS.json
@@ -2,7 +2,7 @@
   "parent": {
     "props": {
       "id3": {"STRVALUE": "test3"},
-      "id3": {"STRVALUE": ""},
+      "id2": {"STRVALUE": ""},
       "id1": {"STRVALUE": "test1"}
     }
   }