From 7f4e5cad7e56dc74ab686a5b32accb034a1b9599 Mon Sep 17 00:00:00 2001 From: Wendell Piez Date: Wed, 13 Jul 2022 13:01:28 -0400 Subject: [PATCH] Removing outdated artifacts from schema generation unit testing.md --- .../old/allowed-values-basic_xml-schema.xsd | 197 ------- .../old/collapsible_json-schema.json | 59 --- .../old/charstrings_json-schema.json | 77 --- .../datatypes/old/charstrings_xml-schema.xsd | 158 ------ .../old/datatypes-date_json-schema.json | 62 --- .../old/datatypes-date_xml-schema.xsd | 77 --- .../datatypes-datetime-no-tz_xml-schema.xsd | 77 --- .../old/datatypes-datetime_json-schema.json | 64 --- .../old/datatypes-datetime_xml-schema.xsd | 87 ---- .../old/datatypes-prose_json-schema.json | 106 ---- .../old/datatypes-prose_xml-schema.xsd | 393 -------------- .../old/datatypes-uri_json-schema.json | 63 --- .../old/datatypes-uri_xml-schema.xsd | 107 ---- .../old/datatypes-uuid_json-schema.json | 42 -- .../old/datatypes-uuid_xml-schema.xsd | 72 --- .../flag/old/flag-basic_json-schema.json | 38 -- .../flag/old/flag-basic_xml-schema.xsd | 77 --- .../flag/old/flag-override_xml-schema.xsd | 187 ------- .../group-as-array-bounded_json-schema.json | 33 -- .../old/group-as-array-bounded_xml-schema.xsd | 47 -- .../group-as-array-invalid-max_xml-schema.xsd | 47 -- .../group-as-array-optional_json-schema.json | 30 -- .../group-as-array-optional_xml-schema.xsd | 47 -- .../old/group-as-array_json-schema.json | 32 -- .../old/group-as-array_xml-schema.xsd | 47 -- .../old/group-as-by-key_json-schema.json | 43 -- .../old/group-as-by-key_xml-schema.xsd | 58 --- .../old/group-as-misc_json-schema.json | 123 ----- .../group-as/old/group-as-misc_xml-schema.xsd | 491 ------------------ ...ngleton-or-array-optional_json-schema.json | 34 -- ...singleton-or-array-optional_xml-schema.xsd | 47 -- ...oup-as-singleton-or-array_json-schema.json | 36 -- ...group-as-singleton-or-array_xml-schema.xsd | 47 -- .../old/json-value-key-field_json-schema.json | 49 -- .../old/json-value-key-field_xml-schema.xsd | 88 ---- .../old/json-value-key-label_json-schema.json | 54 -- .../old/json-value-key-label_xml-schema.xsd | 88 ---- ...lobal-and-local_generated-json-schema.json | 83 --- .../global-and-local_generated-xml-schema.xsd | 150 ------ ...nd-scoped-local_generated-json-schema.json | 70 --- ...-and-scoped-local_generated-xml-schema.xsd | 150 ------ .../old/modular_xml-schema.xsd | 169 ------ test-suite/schema-generation/testing.md | 18 - ...atatypes-token_metaschema_JSON-SCHEMA.json | 42 -- .../datatypes-token_metaschema_XML-SCHEMA.xsd | 72 --- 45 files changed, 4138 deletions(-) delete mode 100644 test-suite/schema-generation/allowed-values/old/allowed-values-basic_xml-schema.xsd delete mode 100644 test-suite/schema-generation/collapsible/old/collapsible_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/charstrings_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/charstrings_xml-schema.xsd delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-date_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-date_xml-schema.xsd delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-datetime-no-tz_xml-schema.xsd delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-datetime_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-datetime_xml-schema.xsd delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-prose_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-prose_xml-schema.xsd delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-uri_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-uri_xml-schema.xsd delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-uuid_json-schema.json delete mode 100644 test-suite/schema-generation/datatypes/old/datatypes-uuid_xml-schema.xsd delete mode 100644 test-suite/schema-generation/flag/old/flag-basic_json-schema.json delete mode 100644 test-suite/schema-generation/flag/old/flag-basic_xml-schema.xsd delete mode 100644 test-suite/schema-generation/flag/old/flag-override_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array-bounded_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array-bounded_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array-invalid-max_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array-optional_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array-optional_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-array_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-by-key_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-by-key_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-misc_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-misc_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_xml-schema.xsd delete mode 100644 test-suite/schema-generation/group-as/old/group-as-singleton-or-array_json-schema.json delete mode 100644 test-suite/schema-generation/group-as/old/group-as-singleton-or-array_xml-schema.xsd delete mode 100644 test-suite/schema-generation/json-value-key/old/json-value-key-field_json-schema.json delete mode 100644 test-suite/schema-generation/json-value-key/old/json-value-key-field_xml-schema.xsd delete mode 100644 test-suite/schema-generation/json-value-key/old/json-value-key-label_json-schema.json delete mode 100644 test-suite/schema-generation/json-value-key/old/json-value-key-label_xml-schema.xsd delete mode 100644 test-suite/schema-generation/local-declarations/old/global-and-local_generated-json-schema.json delete mode 100644 test-suite/schema-generation/local-declarations/old/global-and-local_generated-xml-schema.xsd delete mode 100644 test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-json-schema.json delete mode 100644 test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-xml-schema.xsd delete mode 100644 test-suite/schema-generation/local-declarations/old/modular_xml-schema.xsd delete mode 100644 test-suite/schema-generation/token/old/datatypes-token_metaschema_JSON-SCHEMA.json delete mode 100644 test-suite/schema-generation/token/old/datatypes-token_metaschema_XML-SCHEMA.xsd diff --git a/test-suite/schema-generation/allowed-values/old/allowed-values-basic_xml-schema.xsd b/test-suite/schema-generation/allowed-values/old/allowed-values-basic_xml-schema.xsd deleted file mode 100644 index d209bdea2..000000000 --- a/test-suite/schema-generation/allowed-values/old/allowed-values-basic_xml-schema.xsd +++ /dev/null @@ -1,197 +0,0 @@ - - - - - Metaschema Unit Test: allowed values - 1.0-milestone1 - metaschema-allowed-values - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Small odd flag - Odd integers from 1 to 11 inclusive - - - Small odd flag: Odd integers from 1 to 11 inclusive - - - - - - -

One

- - - - - - -

Three

- - - - - - -

Five

- - - - - - -

Seven

- - - - - - -

Nine

- - - - - - -

Eleven

- - - - - - - - - - - child - child assembly - - - child: child assembly - - - - - - - - Small even flag - Even integers from 2 to 10 inclusive - - - Small even flag: Even integers from 2 to 10 inclusive - - - - - - -

Two

- - - - - - -

Four

- - - - - - -

Six

- - - - - - -

Eight

- - - - - - -

Ten

- - - - - - - - - - - Date - One of several 2020 dates - - - Date: One of several 2020 dates - - - - - - - - - - -

New Year's Day 2020

- - - - - - -

Leap Day 2020

- - - - - - -

July Fourth 2020

- - - - - - diff --git a/test-suite/schema-generation/collapsible/old/collapsible_json-schema.json b/test-suite/schema-generation/collapsible/old/collapsible_json-schema.json deleted file mode 100644 index 79eb6eebe..000000000 --- a/test-suite/schema-generation/collapsible/old/collapsible_json-schema.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "http://csrc.nist.gov/ns/metaschema/unit-test/collapsible-schema.json", - "$comment": "Metaschema Unit Test: collapsible: JSON Schema", - "type": "object", - "definitions": { - "parent": { - "title": "parent", - "description": "parent assembly", - "$id": "#/definitions/parent", - "type": "object", - "properties": { - "props": { - "anyOf": [ - {"$ref": "#/definitions/prop"}, - { - "type": "array", - "items": {"$ref": "#/definitions/prop"}, - "minItems": 1 - } - ] - } - }, - "required": ["props"], - "additionalProperties": false - }, - "prop": { - "title": "prop", - "description": "prop field", - "$id": "#/definitions/prop", - "type": "object", - "properties": { - "name": { - "title": "A simple flag", - "description": "A simpleflag", - "type": "string" - }, - "STRVALUE": { - "anyOf": [ - {"type": "string"}, - { - "type": "array", - "items": {"type": "string"}, - "minItems": 1 - } - ] - } - }, - "required": ["STRVALUE"], - "additionalProperties": false - } - }, - "properties": { - "parent": {"$ref": "#/definitions/parent"} - }, - "required": ["parent"], - "additionalProperties": false, - "maxProperties": 1 -} \ No newline at end of file diff --git a/test-suite/schema-generation/datatypes/old/charstrings_json-schema.json b/test-suite/schema-generation/datatypes/old/charstrings_json-schema.json deleted file mode 100644 index d37439f60..000000000 --- a/test-suite/schema-generation/datatypes/old/charstrings_json-schema.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-dateTime/metaschema-datatypes-dateTime-1.0-milestone1-schema.json", - "$comment" : "Metaschema Unit Test: datatypes-dateTime", - "type" : "object", - "definitions" : { - "MetaschemaDatatypesDatetimeExamplesAssemblyType" : { - "$id" : "#/definitions/MetaschemaDatatypesDatetimeExamplesAssemblyType", - "$comment" : "Definition MetaschemaDatatypesDatetimeExamplesAssemblyType: inline(false:false)", - "title" : "Examples", - "description" : "Some character strings of different sorts", - "type" : "object", - "properties" : { - "character-strings" : { - "oneOf" : [ { - "$comment" : "InstancePropertyDefinitionOrRef MetaschemaDatatypesDatetimeCharstringFieldType: inline(false:false)", - "$ref" : "#/definitions/MetaschemaDatatypesDatetimeCharstringFieldType" - }, { - "type" : "array", - "items" : { - "$comment" : "InstancePropertyDefinitionOrRef MetaschemaDatatypesDatetimeCharstringFieldType: inline(false:false)", - "$ref" : "#/definitions/MetaschemaDatatypesDatetimeCharstringFieldType" - }, - "minItems" : 2 - } ] - }, - "markup-lines" : { - "oneOf" : [ { - "$comment" : "InstancePropertyDefinitionOrRef MetaschemaDatatypesDatetimeMarkuplineFieldType: inline(false:false)", - "$ref" : "#/definitions/MetaschemaDatatypesDatetimeMarkuplineFieldType" - }, { - "type" : "array", - "items" : { - "$comment" : "InstancePropertyDefinitionOrRef MetaschemaDatatypesDatetimeMarkuplineFieldType: inline(false:false)", - "$ref" : "#/definitions/MetaschemaDatatypesDatetimeMarkuplineFieldType" - }, - "minItems" : 2 - } ] - } - }, - "additionalProperties" : false - }, - "MetaschemaDatatypesDatetimeCharstringFieldType" : { - "$id" : "#/definitions/MetaschemaDatatypesDatetimeCharstringFieldType", - "$comment" : "Definition MetaschemaDatatypesDatetimeCharstringFieldType: inline(false:false)", - "title" : "Character string", - "description" : "String of characters", - "$ref" : "#/definitions/StringDatatype" - }, - "MetaschemaDatatypesDatetimeMarkuplineFieldType" : { - "$id" : "#/definitions/MetaschemaDatatypesDatetimeMarkuplineFieldType", - "$comment" : "Definition MetaschemaDatatypesDatetimeMarkuplineFieldType: inline(false:false)", - "title" : "Markup line", - "description" : "Characters, and more", - "$ref" : "#/definitions/MarkupLineDatatype" - }, - "MarkupLineDatatype" : { - "type" : "string", - "pattern" : "^[^\n]+$" - }, - "StringDatatype" : { - "type" : "string", - "pattern" : "^\\S(.*\\S)?$" - } - }, - "properties" : { - "$schema" : { - "type" : "string", - "format" : "uri-reference" - }, - "examples" : { - "$ref" : "#/definitions/MetaschemaDatatypesDatetimeExamplesAssemblyType" - } - }, - "required" : [ "examples" ], - "additionalProperties" : false -} diff --git a/test-suite/schema-generation/datatypes/old/charstrings_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/charstrings_xml-schema.xsd deleted file mode 100644 index ff9c22e77..000000000 --- a/test-suite/schema-generation/datatypes/old/charstrings_xml-schema.xsd +++ /dev/null @@ -1,158 +0,0 @@ - - - - Metaschema Unit Test: datatypes-dateTime - 1.0-milestone1 - metaschema-datatypes-dateTime - - - - - - - Examples - Some character strings of different sorts - - -

- Examples: Some character strings of different sorts

- - - - - - - - Character string - String of characters - - -

- Character string: String of characters

- - - - - - - - Markup line - Characters, and more - - -

- Markup line: Characters, and more

- - - - - - - - - - - - - - A string, but not empty and not whitespace-only - (whitespace is U+9, U+10, U+32 or [ \n\t]+ ) - - - - The OSCAL 'string' datatype restricts the XSD type by prohibiting leading - and trailing whitespace, and something (not only whitespace) is required. - - - - - A trimmed string, at least one character with no - leading or trailing whitespace. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An insert can be used to identify a placeholder for dynamically inserting text related to a specific object, which is referenced by the object's identifier using an id-ref. This insert mechanism allows the selection of which text value from the object to dynamically include based on the application's display requirements. - - - - The type of object to include from (e.g., parameter, control, component, role, etc.) - - - - - The identity of the object to insert a value for. The identity will be selected from the index of objects of the specified type. The specific value to include is based on the application's display requirements, which will likely use a specific data element associated with the type (e.g., title, identifier, value, etc.) that is appropriate for the application. - - - - diff --git a/test-suite/schema-generation/datatypes/old/datatypes-date_json-schema.json b/test-suite/schema-generation/datatypes/old/datatypes-date_json-schema.json deleted file mode 100644 index af1c7c67d..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-date_json-schema.json +++ /dev/null @@ -1,62 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-dateTime-schema.json", - "$comment" : "Metaschema Unit Test: datatypes-dateTime: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "flag-date" : - { "type" : "string", - "pattern" : "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})?$", - "title" : "Date Flag", - "description" : "date flag, time zone optional" }, - "field-dates" : - { "anyOf" : - [ - { "$ref" : "#/definitions/field-date" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/field-date" }, - "minItems" : 1 } ] }, - "children" : - { "anyOf" : - [ - { "$ref" : "#/definitions/child" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/child" }, - "minItems" : 1 } ] } }, - "required" : - [ "flag-date" ], - "additionalProperties" : false }, - "child" : - { "title" : "child", - "description" : "child assembly", - "$id" : "#/definitions/child", - "type" : "object", - "properties" : - { "field-date" : - { "$ref" : "#/definitions/field-date" } }, - "required" : - [ "field-date" ], - "additionalProperties" : false }, - "field-date" : - { "title" : "Date", - "description" : "Time zone optional", - "$id" : "#/definitions/field-date", - "type" : "string", - "pattern" : "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})?$" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/datatypes/old/datatypes-date_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/datatypes-date_xml-schema.xsd deleted file mode 100644 index cf542bfda..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-date_xml-schema.xsd +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Metaschema Unit Test: datatypes-dateTime - 1.0-milestone1 - metaschema-datatypes-dateTime - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Date Flag - date flag, time zone optional - - - Date Flag: date flag, time zone optional - - - - - - - child - child assembly - - - child: child assembly - - - - - - - - - Date - Time zone optional - - - Date: Time zone optional - - - - - - diff --git a/test-suite/schema-generation/datatypes/old/datatypes-datetime-no-tz_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/datatypes-datetime-no-tz_xml-schema.xsd deleted file mode 100644 index be3302dc7..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-datetime-no-tz_xml-schema.xsd +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Metaschema Unit Test: datatypes-dateTime - 1.0-milestone1 - metaschema-datatypes-dateTime - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Date and Time Flag - datetime flag - - - Date and Time Flag: datetime flag - - - - - - - child - child assembly - - - child: child assembly - - - - - - - - - Date and Time - No time zone - - - Date and Time: No time zone - - - - - - diff --git a/test-suite/schema-generation/datatypes/old/datatypes-datetime_json-schema.json b/test-suite/schema-generation/datatypes/old/datatypes-datetime_json-schema.json deleted file mode 100644 index 14bb7b6af..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-datetime_json-schema.json +++ /dev/null @@ -1,64 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-dateTime-schema.json", - "$comment" : "Metaschema Unit Test: datatypes-dateTime: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "flag-datetime" : - { "title" : "Date and Time Flag", - "description" : "datetime flag", - "type" : "string", - "format" : "date-time", - "pattern" : "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})$" }, - "field-datetimes" : - { "anyOf" : - [ - { "$ref" : "#/definitions/field-datetime" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/field-datetime" }, - "minItems" : 1 } ] }, - "children" : - { "anyOf" : - [ - { "$ref" : "#/definitions/child" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/child" }, - "minItems" : 1 } ] } }, - "required" : - [ "flag-datetime" ], - "additionalProperties" : false }, - "child" : - { "title" : "child", - "description" : "child assembly", - "$id" : "#/definitions/child", - "type" : "object", - "properties" : - { "field-datetime" : - { "$ref" : "#/definitions/field-datetime" } }, - "required" : - [ "field-datetime" ], - "additionalProperties" : false }, - "field-datetime" : - { "title" : "Date and Time", - "description" : "With time zone", - "$id" : "#/definitions/field-datetime", - "type" : "string", - "format" : "date-time", - "pattern" : "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})$" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/datatypes/old/datatypes-datetime_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/datatypes-datetime_xml-schema.xsd deleted file mode 100644 index e538b7489..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-datetime_xml-schema.xsd +++ /dev/null @@ -1,87 +0,0 @@ - - - - - Metaschema Unit Test: datatypes-dateTime - 1.0-milestone1 - metaschema-datatypes-dateTime - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Date and Time Flag - datetime flag - - - Date and Time Flag: datetime flag - - - - - - - child - child assembly - - - child: child assembly - - - - - - - - - Date and Time - With time zone - - - Date and Time: With time zone - - - - - - - - The xs:dateTime with a required timezone. - - - - - - diff --git a/test-suite/schema-generation/datatypes/old/datatypes-prose_json-schema.json b/test-suite/schema-generation/datatypes/old/datatypes-prose_json-schema.json deleted file mode 100644 index 16448eafa..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-prose_json-schema.json +++ /dev/null @@ -1,106 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-schema.json", - "$comment" : "Metaschema Unit Test: datatypes: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "field-date" : - { "$ref" : "#/definitions/field-date" }, - "field-plaintext" : - { "$ref" : "#/definitions/field-plaintext" }, - "field-flag-plaintext" : - { "$ref" : "#/definitions/field-flag-plaintext" }, - "field-richtext" : - { "$ref" : "#/definitions/field-richtext" }, - "field-flag-richtext" : - { "$ref" : "#/definitions/field-flag-richtext" }, - "field-prose" : - { "$ref" : "#/definitions/field-prose" }, - "field-flag-prose" : - { "$ref" : "#/definitions/field-flag-prose" } }, - "additionalProperties" : false }, - "field-date" : - { "title" : "Date", - "description" : "With time zone", - "$id" : "#/definitions/field-date", - "type" : "string", - "pattern" : "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))(Z|[+-][0-9]{2}:[0-9]{2})$" }, - "field-plaintext" : - { "title" : "Plain text", - "description" : "plain text, no markup", - "$id" : "#/definitions/field-plaintext", - "type" : "string" }, - "field-flag-plaintext" : - { "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, - "multipleOf" : 1 }, - "STRVALUE" : - { "type" : "string" } }, - "required" : - [ "STRVALUE" ], - "additionalProperties" : false }, - "field-richtext" : - { "title" : "Rich text", - "description" : "Rich text supports markup", - "$id" : "#/definitions/field-richtext", - "type" : "string" }, - "field-flag-richtext" : - { "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, - "minimum" : 1 }, - "RICHTEXT" : - { "type" : "string" } }, - "required" : - [ "RICHTEXT" ], - "additionalProperties" : false }, - "field-prose" : - { "title" : "Prose", - "description" : "Prose permits multiple paragraphs, lists, tables etc.", - "$id" : "#/definitions/field-prose", - "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, - "minimum" : 1 }, - "PROSE" : - { "type" : "string" } }, - "required" : - [ "PROSE" ], - "additionalProperties" : false } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/datatypes/old/datatypes-prose_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/datatypes-prose_xml-schema.xsd deleted file mode 100644 index b377aeb5f..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-prose_xml-schema.xsd +++ /dev/null @@ -1,393 +0,0 @@ - - - - - Metaschema Unit Test: datatypes - 1.0-milestone1 - metaschema-datatypes - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - - - Prose - Prose permits multiple paragraphs, lists, tables etc. - - - Prose: Prose permits multiple paragraphs, lists, tables etc. - - - - - - - - - Prose - Prose permits multiple paragraphs, lists, tables etc. - - - Prose: Prose permits multiple paragraphs, lists, tables etc. - - - - - - - - - - - Date - With time zone - - - Date: With time zone - - - - - - - - - Plain text - plain text, no markup - - - Plain text: plain text, no markup - - - - - - - - - Plain text - plain text, no markup - - - Plain text: plain text, no markup - - - - - - - Length - The length. - - - Length: The length. - - - - - - - - - - - - - - Length - The length. - - - Length: The length. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The xs:date with a required timezone. - - - - - - diff --git a/test-suite/schema-generation/datatypes/old/datatypes-uri_json-schema.json b/test-suite/schema-generation/datatypes/old/datatypes-uri_json-schema.json deleted file mode 100644 index 4a5f57bb4..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-uri_json-schema.json +++ /dev/null @@ -1,63 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-uri-schema.json", - "$comment" : "Metaschema Unit Test: URIs: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "uri-flag" : - { "title" : "Universal Resource Identifier Flag", - "description" : "Per W3C", - "type" : "string", - "format" : "uri" }, - "uri-reference-flag" : - { "title" : "Universal Resource Identifier Reference Flag", - "description" : "Per W3C, can be a relative URI", - "type" : "string", - "format" : "uri-reference" }, - "uri-fields" : - { "anyOf" : - [ - { "$ref" : "#/definitions/uri-field" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/uri-field" }, - "minItems" : 1 } ] }, - "uri-reference-fields" : - { "anyOf" : - [ - { "$ref" : "#/definitions/uri-reference-field" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/uri-reference-field" }, - "minItems" : 1 } ] } }, - "required" : - [ "uri-flag", - "uri-reference-flag" ], - "additionalProperties" : false }, - "uri-field" : - { "title" : "Universal Resource Identifier Flag", - "description" : "Per W3C", - "$id" : "#/definitions/uri-field", - "type" : "string", - "format" : "uri" }, - "uri-reference-field" : - { "title" : "Universal Resource Identifier Flag", - "description" : "Per W3C", - "$id" : "#/definitions/uri-reference-field", - "type" : "string", - "format" : "uri-reference" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/datatypes/old/datatypes-uri_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/datatypes-uri_xml-schema.xsd deleted file mode 100644 index 562830cad..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-uri_xml-schema.xsd +++ /dev/null @@ -1,107 +0,0 @@ - - - - - Metaschema Unit Test: URIs - 1.0-milestone1 - metaschema-datatypes-uri - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Universal Resource Identifier Flag - Per W3C - - - Universal Resource Identifier Flag: Per W3C - - - - - - Universal Resource Identifier Reference Flag - Per W3C, can be a relative URI - - - Universal Resource Identifier Reference Flag: Per W3C, can be a relative URI - - - - - - - Universal Resource Identifier Flag - Per W3C - - - Universal Resource Identifier Flag: Per W3C - - - - - - - - - Universal Resource Identifier Flag - Per W3C - - - Universal Resource Identifier Flag: Per W3C - - - - - - - - A URI - - - - - - Requires a scheme with colon per RFC 3986 - - - - - - - A URI reference, such as a relative URL - - - - - - diff --git a/test-suite/schema-generation/datatypes/old/datatypes-uuid_json-schema.json b/test-suite/schema-generation/datatypes/old/datatypes-uuid_json-schema.json deleted file mode 100644 index d030b97e6..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-uuid_json-schema.json +++ /dev/null @@ -1,42 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-uri-schema.json", - "$comment" : "Metaschema Unit Test: UUID Datatype: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "uuid-flag" : - { "title" : "Universally Unique Identifier Flag", - "description" : "A version 4 UUID per RFC 4122.", - "type" : "string", - "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, - "uuid-fields" : - { "anyOf" : - [ - { "$ref" : "#/definitions/uuid-field" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/uuid-field" }, - "minItems" : 1 } ] } }, - "required" : - [ "uuid-flag" ], - "additionalProperties" : false }, - "uuid-field" : - { "title" : "Universally Unique Identifier Field", - "description" : "A version 4 UUID per RFC 4122.", - "$id" : "#/definitions/uuid-field", - "type" : "string", - "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/datatypes/old/datatypes-uuid_xml-schema.xsd b/test-suite/schema-generation/datatypes/old/datatypes-uuid_xml-schema.xsd deleted file mode 100644 index 4321b850f..000000000 --- a/test-suite/schema-generation/datatypes/old/datatypes-uuid_xml-schema.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Metaschema Unit Test: UUID Datatype - 1.0-milestone2 - metaschema-datatypes-uuid - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - Universally Unique Identifier Flag - A version 4 UUID per RFC 4122. - - - Universally Unique Identifier Flag: A version 4 UUID per RFC 4122. - - - - - - - Universally Unique Identifier Field - A version 4 UUID per RFC 4122. - - - Universally Unique Identifier Field: A version 4 UUID per RFC 4122. - - - - - - - - A Type 4 ('random' or 'pseudorandom' UUID per RFC 4122 - - - - - - A sequence of 8-4-4-4-12 hex digits, with extra constraints in the 13th and 17-18th places for version 4 - - - - - diff --git a/test-suite/schema-generation/flag/old/flag-basic_json-schema.json b/test-suite/schema-generation/flag/old/flag-basic_json-schema.json deleted file mode 100644 index 38d6e440b..000000000 --- a/test-suite/schema-generation/flag/old/flag-basic_json-schema.json +++ /dev/null @@ -1,38 +0,0 @@ - - { "$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: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "flag" : - { "type" : "string", - "title" : "Flag", - "description" : "A basic flag" }, - "flag-required" : - { "type" : "string", - "title" : "Required Flag", - "description" : "A basic required flag" }, - "flag-constrained" : - { "type" : "number", - "pattern" : "^(\\+|-)?([0-9]+(\\.[0-9]*)?|\\.[0-9]+)$", - "title" : "Constrained Flag", - "description" : "With decimal values", - "enum" : - [ 1, - 1.1 ] } }, - "required" : - [ "flag-required" ], - "additionalProperties" : false } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/flag/old/flag-basic_xml-schema.xsd b/test-suite/schema-generation/flag/old/flag-basic_xml-schema.xsd deleted file mode 100644 index 959d79357..000000000 --- a/test-suite/schema-generation/flag/old/flag-basic_xml-schema.xsd +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Metaschema Unit Test: flag: basic flag - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - Flag - A basic flag - - - Flag: A basic flag - - - - - - Required Flag - A basic required flag - - - Required Flag: A basic required flag - - - - - - Constrained Flag - With decimal values - - - Constrained Flag: With decimal values - - - - - - -

one-dot-oh

- - - - - - -

one-dot-one

- - - - - - - - diff --git a/test-suite/schema-generation/flag/old/flag-override_xml-schema.xsd b/test-suite/schema-generation/flag/old/flag-override_xml-schema.xsd deleted file mode 100644 index d770f3e8c..000000000 --- a/test-suite/schema-generation/flag/old/flag-override_xml-schema.xsd +++ /dev/null @@ -1,187 +0,0 @@ - - - - - Metaschema Unit Test: flag: basic flag - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - propB field - propB field ... - - - propB field: propB field ... - - - - - - - name flag - name flag ... - - - name flag: name flag ... - - - - - - -

Z

- - - - - - - - - - - - - - - - Child 1 - A child with a unique set of properties. - - - Child 1: A child with a unique set of properties. - - - - - - - propA field - propA field ... - - - propA field: propA field ... - - - - - - - name flag - name flag ... - - - name flag: name flag ... - - - - - - -

E

- - - - - - -

F

- - - - - - - - - - - - - - - - Child 2 - A child with a unique set of properties. - - - Child 2: A child with a unique set of properties. - - - - - - - propA field - propA field ... - - - propA field: propA field ... - - - - - - - name flag - name flag ... - - - name flag: name flag ... - - - - - - -

G

- - - - - - -

H

- - - - - - - - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-array-bounded_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-array-bounded_json-schema.json deleted file mode 100644 index ba0e9a33c..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array-bounded_json-schema.json +++ /dev/null @@ -1,33 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-array-bounded-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "type" : "array", - "items" : - { "$ref" : "#/definitions/prop" }, - "minItems" : 2, - "maxItems" : 3 } }, - "required" : - [ "props" ], - "additionalProperties" : false }, - "prop" : - { "title" : "prop", - "description" : "prop field", - "$id" : "#/definitions/prop", - "type" : "string" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-array-bounded_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-array-bounded_xml-schema.xsd deleted file mode 100644 index 18c8b8ea5..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array-bounded_xml-schema.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-array-invalid-max_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-array-invalid-max_xml-schema.xsd deleted file mode 100644 index 756544c0c..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array-invalid-max_xml-schema.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-array-optional_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-array-optional_json-schema.json deleted file mode 100644 index 34648a38b..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array-optional_json-schema.json +++ /dev/null @@ -1,30 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-array-optional-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "type" : "array", - "items" : - { "$ref" : "#/definitions/prop" }, - "minItems" : 1 } }, - "additionalProperties" : false }, - "prop" : - { "title" : "prop", - "description" : "prop field", - "$id" : "#/definitions/prop", - "type" : "string" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-array-optional_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-array-optional_xml-schema.xsd deleted file mode 100644 index b37cacd9e..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array-optional_xml-schema.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-array_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-array_json-schema.json deleted file mode 100644 index 74853f9cc..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array_json-schema.json +++ /dev/null @@ -1,32 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-array-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "type" : "array", - "items" : - { "$ref" : "#/definitions/prop" }, - "minItems" : 1 } }, - "required" : - [ "props" ], - "additionalProperties" : false }, - "prop" : - { "title" : "prop", - "description" : "prop field", - "$id" : "#/definitions/prop", - "type" : "string" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-array_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-array_xml-schema.xsd deleted file mode 100644 index 00883128f..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-array_xml-schema.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-by-key_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-by-key_json-schema.json deleted file mode 100644 index 35444619a..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-by-key_json-schema.json +++ /dev/null @@ -1,43 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-by-key-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "type" : "object", - "minProperties" : 1, - "additionalProperties" : - { "allOf" : - [ - { "$ref" : "#/definitions/prop" }, - - { "not" : - { "type" : "string" } } ] } } }, - "required" : - [ "props" ], - "additionalProperties" : false }, - "prop" : - { "title" : "prop", - "description" : "prop field", - "$id" : "#/definitions/prop", - "type" : "object", - "properties" : - { "STRVALUE" : - { "type" : "string" } }, - "required" : - [ "STRVALUE" ], - "additionalProperties" : false } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-by-key_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-by-key_xml-schema.xsd deleted file mode 100644 index f747e48a2..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-by-key_xml-schema.xsd +++ /dev/null @@ -1,58 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - - ID - Identifier - - - ID: Identifier - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-misc_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-misc_json-schema.json deleted file mode 100644 index 3f1d6e2b9..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-misc_json-schema.json +++ /dev/null @@ -1,123 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-by-key-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "root" : - { "title" : "Root", - "description" : "...", - "$id" : "#/definitions/root", - "type" : "object", - "properties" : - { "information-types" : - { "type" : "array", - "minItems" : 1, - "items" : - { "title" : "Information Type", - "description" : "Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.", - "$id" : "#/definitions/information-type", - "type" : "object", - "properties" : - { "uuid" : - { "title" : "Information Type Universally Unique Identifier", - "description" : "A globally unique identifier that can be used to reference this information type entry elsewhere in an OSCAL document. A UUID should be consistantly used for a given resource across revisions of the document.", - "type" : "string", - "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, - "title" : - { "title" : "title field", - "description" : "A human readable name for the information type. This title should be meaningful within the context of the system.", - "$id" : "#/definitions/title", - "type" : "string" }, - "description" : - { "title" : "Information Type Description", - "description" : "A summary of how this information type is used within the system.", - "$id" : "#/definitions/description", - "type" : "string" }, - "information-type-ids" : - { "type" : "object", - "minProperties" : 1, - "additionalProperties" : - { "allOf" : - [ - { "title" : "Information Type Identifier", - "description" : "An identifier qualified by the given identification system used, such as NIST SP 800-60.", - "$id" : "#/definitions/information-type-id", - "type" : "object", - "properties" : - { "id" : - { "type" : "string" } }, - "required" : - [ "id" ], - "additionalProperties" : false }, - - { "not" : - { "type" : "string" } } ] } }, - "confidentiality-impact" : - { "title" : "Confidentiality Impact Level", - "description" : "The expected level of impact resulting from the unauthorized disclosure of information.", - "$id" : "#/definitions/confidentiality-impact", - "type" : "object", - "properties" : - { "base" : - { "title" : "Base Level (Confidentiality, Integrity, or Availability)", - "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.", - "$id" : "#/definitions/base", - "type" : "string" }, - "selected" : - { "title" : "Selected Level (Confidentiality, Integrity, or Availability)", - "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.", - "$id" : "#/definitions/selected", - "type" : "string" } }, - "additionalProperties" : false }, - "integrity-impact" : - { "title" : "Integrity Impact Level", - "description" : "The expected level of impact resulting from the unauthorized modification of information.", - "$id" : "#/definitions/integrity-impact", - "type" : "object", - "properties" : - { "base" : - { "title" : "Base Level (Confidentiality, Integrity, or Availability)", - "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.", - "$id" : "#/definitions/base", - "type" : "string" }, - "selected" : - { "title" : "Selected Level (Confidentiality, Integrity, or Availability)", - "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.", - "$id" : "#/definitions/selected", - "type" : "string" } }, - "additionalProperties" : false }, - "availability-impact" : - { "title" : "Availability Impact Level", - "description" : "The expected level of impact resulting from the disruption of access to or use of information or the information system.", - "$id" : "#/definitions/availability-impact", - "type" : "object", - "properties" : - { "base" : - { "title" : "Base Level (Confidentiality, Integrity, or Availability)", - "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.", - "$id" : "#/definitions/base", - "type" : "string" }, - "selected" : - { "title" : "Selected Level (Confidentiality, Integrity, or Availability)", - "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.", - "$id" : "#/definitions/selected", - "type" : "string" } }, - "additionalProperties" : false } }, - "required" : - [ "title", - "description", - "confidentiality-impact", - "integrity-impact", - "availability-impact" ], - "additionalProperties" : false } } }, - "required" : - [ "information-types" ], - "additionalProperties" : false } }, - "properties" : - { "root" : - { "$ref" : "#/definitions/root" } }, - "required" : - [ "root" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-misc_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-misc_xml-schema.xsd deleted file mode 100644 index 8301673f4..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-misc_xml-schema.xsd +++ /dev/null @@ -1,491 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - root - - - - - - - Root - ... - - - Root: ... - - - - - - - Information Type - Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60. - - - Information Type: Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60. - - - - - - - - - - - - - - - - - Information Type Identifier - An identifier qualified by the given identification system used, such as NIST SP 800-60. - - - Information Type Identifier: An identifier qualified by the given identification system used, such as NIST SP 800-60. - - - - - - - Information Type Identification System - Specifies the information type identification system used. - - - Information Type Identification System: Specifies the information type identification system used. - - - - - - - - -

Based on the - section identifiers in NIST Special Publication 800-60 Volume II - Revision 1

- - - - - - - - - - - - - - - - - Confidentiality Impact Level - The expected level of impact resulting from the unauthorized disclosure of information. - - - Confidentiality Impact Level: The expected level of impact resulting from the unauthorized disclosure of information. - - - - - - - Base Level (Confidentiality, Integrity, or Availability) - The prescribed base (Confidentiality, Integrity, or Availability) security impact level. - - - Base Level (Confidentiality, Integrity, or Availability): The prescribed base (Confidentiality, Integrity, or Availability) security impact level. - - - - - - - - - - - Selected Level (Confidentiality, Integrity, or Availability) - The selected (Confidentiality, Integrity, or Availability) security impact level. - - - Selected Level (Confidentiality, Integrity, or Availability): The selected (Confidentiality, Integrity, or Availability) security impact level. - - - - - - - - - - - - - - Integrity Impact Level - The expected level of impact resulting from the unauthorized modification of information. - - - Integrity Impact Level: The expected level of impact resulting from the unauthorized modification of information. - - - - - - - Base Level (Confidentiality, Integrity, or Availability) - The prescribed base (Confidentiality, Integrity, or Availability) security impact level. - - - Base Level (Confidentiality, Integrity, or Availability): The prescribed base (Confidentiality, Integrity, or Availability) security impact level. - - - - - - - - - - - Selected Level (Confidentiality, Integrity, or Availability) - The selected (Confidentiality, Integrity, or Availability) security impact level. - - - Selected Level (Confidentiality, Integrity, or Availability): The selected (Confidentiality, Integrity, or Availability) security impact level. - - - - - - - - - - - - - - Availability Impact Level - The expected level of impact resulting from the disruption of access to or use of information or the information system. - - - Availability Impact Level: The expected level of impact resulting from the disruption of access to or use of information or the information system. - - - - - - - Base Level (Confidentiality, Integrity, or Availability) - The prescribed base (Confidentiality, Integrity, or Availability) security impact level. - - - Base Level (Confidentiality, Integrity, or Availability): The prescribed base (Confidentiality, Integrity, or Availability) security impact level. - - - - - - - - - - - Selected Level (Confidentiality, Integrity, or Availability) - The selected (Confidentiality, Integrity, or Availability) security impact level. - - - Selected Level (Confidentiality, Integrity, or Availability): The selected (Confidentiality, Integrity, or Availability) security impact level. - - - - - - - - - - - - - - Information Type Universally Unique Identifier - A globally unique identifier that can be used to reference this information type entry elsewhere in an OSCAL document. A UUID should be consistantly used for a given resource across revisions of the document. - - - Information Type Universally Unique Identifier: A globally unique identifier that can be used to reference this information type entry elsewhere in an OSCAL document. A UUID should be consistantly used for a given resource across revisions of the document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A Type 4 ('random' or 'pseudorandom' UUID per RFC 4122 - - - - - - A sequence of 8-4-4-4-12 hex digits, with extra constraints in the 13th and 17-18th places for version 4 - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_json-schema.json deleted file mode 100644 index 44fa40825..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_json-schema.json +++ /dev/null @@ -1,34 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-singleton-or-array-optional-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "anyOf" : - [ - { "$ref" : "#/definitions/prop" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/prop" }, - "minItems" : 1 } ] } }, - "additionalProperties" : false }, - "prop" : - { "title" : "prop", - "description" : "prop field", - "$id" : "#/definitions/prop", - "type" : "string" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_xml-schema.xsd deleted file mode 100644 index 5b7dff743..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array-optional_xml-schema.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - diff --git a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array_json-schema.json b/test-suite/schema-generation/group-as/old/group-as-singleton-or-array_json-schema.json deleted file mode 100644 index dc423516a..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array_json-schema.json +++ /dev/null @@ -1,36 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-singleton-or-array-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "anyOf" : - [ - { "$ref" : "#/definitions/prop" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/prop" }, - "minItems" : 1 } ] } }, - "required" : - [ "props" ], - "additionalProperties" : false }, - "prop" : - { "title" : "prop", - "description" : "prop field", - "$id" : "#/definitions/prop", - "type" : "string" } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array_xml-schema.xsd b/test-suite/schema-generation/group-as/old/group-as-singleton-or-array_xml-schema.xsd deleted file mode 100644 index a5a326747..000000000 --- a/test-suite/schema-generation/group-as/old/group-as-singleton-or-array_xml-schema.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - prop - prop field - - - prop: prop field - - - - - - diff --git a/test-suite/schema-generation/json-value-key/old/json-value-key-field_json-schema.json b/test-suite/schema-generation/json-value-key/old/json-value-key-field_json-schema.json deleted file mode 100644 index cc4aa6144..000000000 --- a/test-suite/schema-generation/json-value-key/old/json-value-key-field_json-schema.json +++ /dev/null @@ -1,49 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/json-value-key-field-schema.json", - "$comment" : "Metaschema Unit Test: json-value-key-field: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "props" : - { "anyOf" : - [ - { "$ref" : "#/definitions/prop" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/prop" }, - "minItems" : 1 } ] } }, - "additionalProperties" : false }, - "prop" : - { "title" : "Property", - "description" : "A value with a name, attributed to the containing control, subcontrol, part, or group.", - "$id" : "#/definitions/prop", - "type" : "object", - "properties" : - { "id" : - { "type" : "string", - "title" : "Identifier", - "description" : "Unique identifier of the containing object" }, - "ns" : - { "type" : "string", - "title" : "Namespace", - "description" : "A namespace qualifying the name." }, - "class" : - { "type" : "string", - "title" : "Class", - "description" : "Indicating the type or classification of the containing object" } }, - "minProperties" : 1, - "maxProperties" : 4 } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/json-value-key/old/json-value-key-field_xml-schema.xsd b/test-suite/schema-generation/json-value-key/old/json-value-key-field_xml-schema.xsd deleted file mode 100644 index 211969752..000000000 --- a/test-suite/schema-generation/json-value-key/old/json-value-key-field_xml-schema.xsd +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Metaschema Unit Test: json-value-key-field - 1.0-milestone1 - json-value-key-field - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Property - A value with a name, attributed to the containing control, subcontrol, part, or group. - - - Property: A value with a name, attributed to the containing control, subcontrol, part, or group. - - - - - - - Name - Identifying the purpose and intended use of the property, part or other object. - - - Name: Identifying the purpose and intended use of the property, part or other object. - - - - - - Identifier - Unique identifier of the containing object - - - Identifier: Unique identifier of the containing object - - - - - - Namespace - A namespace qualifying the name. - - - Namespace: A namespace qualifying the name. - - - - - - Class - Indicating the type or classification of the containing object - - - Class: Indicating the type or classification of the containing object - - - - - - diff --git a/test-suite/schema-generation/json-value-key/old/json-value-key-label_json-schema.json b/test-suite/schema-generation/json-value-key/old/json-value-key-label_json-schema.json deleted file mode 100644 index 1bc65ac42..000000000 --- a/test-suite/schema-generation/json-value-key/old/json-value-key-label_json-schema.json +++ /dev/null @@ -1,54 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/json-value-key-label-schema.json", - "$comment" : "Metaschema Unit Test: json-value-key-label: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "links" : - { "anyOf" : - [ - { "$ref" : "#/definitions/link" }, - - { "type" : "array", - "items" : - { "$ref" : "#/definitions/link" }, - "minItems" : 1 } ] } }, - "additionalProperties" : false }, - "link" : - { "title" : "Link", - "description" : "A reference to a local or remote resource", - "$id" : "#/definitions/link", - "type" : "object", - "properties" : - { "href" : - { "type" : "string", - "format" : "uri-reference", - "title" : "hypertext reference", - "description" : "A link to a document or document fragment (actual, nominal or projected)" }, - "rel" : - { "type" : "string", - "title" : "Relation", - "description" : "Purpose of the link" }, - "media-type" : - { "type" : "string", - "title" : "Media type", - "description" : "Describes the media type of a linked resource" }, - "text" : - { "type" : "string" } }, - "required" : - [ "text", - "href" ], - "additionalProperties" : false } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/json-value-key/old/json-value-key-label_xml-schema.xsd b/test-suite/schema-generation/json-value-key/old/json-value-key-label_xml-schema.xsd deleted file mode 100644 index aedc0425f..000000000 --- a/test-suite/schema-generation/json-value-key/old/json-value-key-label_xml-schema.xsd +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Metaschema Unit Test: json-value-key-label - 1.0-milestone1 - json-value-key-label - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - - Link - A reference to a local or remote resource - - - Link: A reference to a local or remote resource - - - - - - - hypertext reference - A link to a document or document fragment (actual, nominal or projected) - - - hypertext reference: A link to a document or document fragment (actual, nominal or projected) - - - - - - Relation - Purpose of the link - - - Relation: Purpose of the link - - - - - - Media type - Describes the media type of a linked resource - - - Media type: Describes the media type of a linked resource - - - - - - - - A URI reference, such as a relative URL - - - - - - diff --git a/test-suite/schema-generation/local-declarations/old/global-and-local_generated-json-schema.json b/test-suite/schema-generation/local-declarations/old/global-and-local_generated-json-schema.json deleted file mode 100644 index 27fc97139..000000000 --- a/test-suite/schema-generation/local-declarations/old/global-and-local_generated-json-schema.json +++ /dev/null @@ -1,83 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-singleton-or-array-optional-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "local-flag" : - { "title" : "Flag defined locally", - "description" : "Has a local definition", - "type" : "string" }, - "global-flag" : - { "title" : "Flag defined globally", - "description" : "Has a global definition", - "type" : "string" }, - "local-field" : - { "title" : "Field defined locally", - "description" : "Has a local definition", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" }, - "local-assemblies" : - { "anyOf" : - [ - { "title" : "Assembly defined locally", - "description" : "Has a local definition", - "type" : "object", - "properties" : - { "local-field2" : - { "title" : "Field defined locally", - "description" : "Has a local definition", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" } }, - "additionalProperties" : false }, - - { "type" : "array", - "minItems" : 1, - "items" : - { "title" : "Assembly defined locally", - "description" : "Has a local definition", - "type" : "object", - "properties" : - { "local-field2" : - { "title" : "Field defined locally", - "description" : "Has a local definition", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" } }, - "additionalProperties" : false } } ] }, - "global-assembly" : - { "$ref" : "#/definitions/global-assembly" } }, - "additionalProperties" : false }, - "global-field" : - { "title" : "Field defined globally", - "description" : "Has a global definition", - "$id" : "#/definitions/global-field", - "type" : "string" }, - "global-assembly" : - { "title" : "Assembly defined globally", - "description" : "Has a global definition", - "$id" : "#/definitions/global-assembly", - "type" : "object", - "properties" : - { "local-field2" : - { "title" : "Field defined locally", - "description" : "Has a local definition", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" } }, - "additionalProperties" : false } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/local-declarations/old/global-and-local_generated-xml-schema.xsd b/test-suite/schema-generation/local-declarations/old/global-and-local_generated-xml-schema.xsd deleted file mode 100644 index 06d39e62b..000000000 --- a/test-suite/schema-generation/local-declarations/old/global-and-local_generated-xml-schema.xsd +++ /dev/null @@ -1,150 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - Field defined locally - Has a local definition - - - Field defined locally: Has a local definition - - - - - - - - - - - - Assembly defined locally - Has a local definition - - - Assembly defined locally: Has a local definition - - - - - - - Field defined locally - Has a local definition - - - Field defined locally: Has a local definition - - - - - - - - - - - - - - - - Flag defined locally - Has a local definition - - - Flag defined locally: Has a local definition - - - - - - Flag defined globally - Has a global definition - - - Flag defined globally: Has a global definition - - - - - - - Field defined globally - Has a global definition - - - Field defined globally: Has a global definition - - - - - - - - - Assembly defined globally - Has a global definition - - - Assembly defined globally: Has a global definition - - - - - - - Field defined locally - Has a local definition - - - Field defined locally: Has a local definition - - - - - - - - - - diff --git a/test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-json-schema.json b/test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-json-schema.json deleted file mode 100644 index 9ebd7212e..000000000 --- a/test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-json-schema.json +++ /dev/null @@ -1,70 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/group-as-singleton-or-array-optional-schema.json", - "$comment" : "Metaschema Unit Test: group-as: JSON Schema", - "type" : "object", - "definitions" : - { "parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#/definitions/parent", - "type" : "object", - "properties" : - { "local-flag" : - { "title" : "Flag defined locally", - "description" : "Has a local definition", - "type" : "string" }, - "global-flag" : - { "title" : "Flag defined globally", - "description" : "Has a global definition", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" }, - "top-level-local-field" : - { "title" : "Field defined with scope='local', at top level", - "description" : "Should result in a local definition", - "$id" : "#/definitions/top-level-local-field", - "type" : "string" }, - "top-level-local-assembly" : - { "title" : "Assembly defined with scope='local', at top level", - "description" : "Should result as local", - "$id" : "#/definitions/top-level-local-assembly", - "type" : "object", - "properties" : - { "top-level-local-field" : - { "title" : "Field defined with scope='local', at top level", - "description" : "Should result in a local definition", - "$id" : "#/definitions/top-level-local-field", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" } }, - "additionalProperties" : false }, - "global-assembly" : - { "$ref" : "#/definitions/global-assembly" } }, - "additionalProperties" : false }, - "global-field" : - { "title" : "Field defined globally", - "description" : "Has a global definition", - "$id" : "#/definitions/global-field", - "type" : "string" }, - "global-assembly" : - { "title" : "Assembly defined globally", - "description" : "Has a global definition", - "$id" : "#/definitions/global-assembly", - "type" : "object", - "properties" : - { "local-field2" : - { "title" : "Field defined locally", - "description" : "Has a local definition", - "$id" : "#/definitions/local-field2", - "type" : "string" }, - "global-field" : - { "$ref" : "#/definitions/global-field" } }, - "additionalProperties" : false } }, - "properties" : - { "parent" : - { "$ref" : "#/definitions/parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-xml-schema.xsd b/test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-xml-schema.xsd deleted file mode 100644 index 11475e4ad..000000000 --- a/test-suite/schema-generation/local-declarations/old/global-and-scoped-local_generated-xml-schema.xsd +++ /dev/null @@ -1,150 +0,0 @@ - - - - - Metaschema Unit Test: group-as - 1.0-milestone1 - metaschema-group-as - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - Field defined with scope='local', at top level - Should result in a local definition - - - Field defined with scope='local', at top level: Should result in a local definition - - - - - - - - - - - Assembly defined with scope='local', at top level - Should result as local - - - Assembly defined with scope='local', at top level: Should result as local - - - - - - - Field defined with scope='local', at top level - Should result in a local definition - - - Field defined with scope='local', at top level: Should result in a local definition - - - - - - - - - - - - - - - - Flag defined locally - Has a local definition - - - Flag defined locally: Has a local definition - - - - - - Flag defined globally - Has a global definition - - - Flag defined globally: Has a global definition - - - - - - - Field defined globally - Has a global definition - - - Field defined globally: Has a global definition - - - - - - - - - Assembly defined globally - Has a global definition - - - Assembly defined globally: Has a global definition - - - - - - - Field defined locally - Has a local definition - - - Field defined locally: Has a local definition - - - - - - - - - - diff --git a/test-suite/schema-generation/local-declarations/old/modular_xml-schema.xsd b/test-suite/schema-generation/local-declarations/old/modular_xml-schema.xsd deleted file mode 100644 index db76cdd16..000000000 --- a/test-suite/schema-generation/local-declarations/old/modular_xml-schema.xsd +++ /dev/null @@ -1,169 +0,0 @@ - - - - - OSCAL Control Catalog Format - 1.0.0-milestone3 - oscal-catalog - -

For exercising Metaschema semantics with respect to modular assembly and composition.

- - root-assembly - - - - - - Assembly defined in a module - XXX - - - Assembly defined in a module: XXX - - - - - - - - Field, defined in a module as 'local' - XXX - - - Field, defined in a module as 'local': XXX - - - - - - - - - - - Locally defined field - XXX - - - Locally defined field: XXX - - - - - - - - - - - Locally defined flag - XXX - - - Locally defined flag: XXX - - - - - - - Field, defined in a module (global by default) - XXX - - - Field, defined in a module (global by default): XXX - - - - - - - - - - Nominal root - XXX - - - Nominal root: XXX - - - - - - - - Field, defined at top level as 'local' - XXX - - - Field, defined at top level as 'local': XXX - - - - - - - - - - - Locally defined field - XXX - - - Locally defined field: XXX - - - - - - - - - - - Flag, defined at top level - XXX - - - Flag, defined at top level: XXX - - - - - - Locally defined flag - XXX - - - Locally defined flag: XXX - - - - - - - Field, defined at top level (global by default) - XXX - - - Field, defined at top level (global by default): XXX - - - - - - diff --git a/test-suite/schema-generation/testing.md b/test-suite/schema-generation/testing.md index 148ee53d4..7911daf67 100644 --- a/test-suite/schema-generation/testing.md +++ b/test-suite/schema-generation/testing.md @@ -1,22 +1,4 @@ -# TODO - -- [x] Generate nominal targets (present results) of stable examples -- [ ] Validate all samples to these nominal target schema instances - - [ ] XProc 1.0 to do XSD runs? -- [ ] try comparing variants (java-oscalcli vs/and XSLT M4 schemas) -- [x] Stabilize XSpec testing -- [ ] Isolate unstable examples -- [ ] Mock up examples with intended targets -- [ ] Repair or build unit tests -- [ ] Repair code - foreach - - [ ] Isolate problem - - [ ] Unit test (to verify solution) - - [ ] composition - `../metaschema-xspec` - - [ ] JSON Schema - - [ ] XSD - - [ ] converter generators - # Running the unit tests Each subdirectory contains unit tests for a family of functionalities in Metaschema. They can overlap. diff --git a/test-suite/schema-generation/token/old/datatypes-token_metaschema_JSON-SCHEMA.json b/test-suite/schema-generation/token/old/datatypes-token_metaschema_JSON-SCHEMA.json deleted file mode 100644 index 37aefbf44..000000000 --- a/test-suite/schema-generation/token/old/datatypes-token_metaschema_JSON-SCHEMA.json +++ /dev/null @@ -1,42 +0,0 @@ - - { "$schema" : "http://json-schema.org/draft-07/schema#", - "$id" : "http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-uri/1.0-milestone2/metaschema-datatypes-token-schema.json", - "$comment" : "Metaschema Unit Test: Token Datatype: JSON Schema", - "type" : "object", - "definitions" : - { "metaschema-datatypes-token-metaschema-datatypes-token:parent" : - { "title" : "parent", - "description" : "parent assembly", - "$id" : "#assembly_metaschema-datatypes-token_parent", - "type" : "object", - "properties" : - { "token-flag" : - { "title" : "A metaschema 'token', a string without spaces suitable for use as a key value)", - "description" : "Corresponds to XML NCName (no-colon name).", - "type" : "string", - "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" }, - "token-fields" : - { "anyOf" : - [ - { "$ref" : "#field_metaschema-datatypes-token_token-field" }, - - { "type" : "array", - "minItems" : 1, - "items" : - { "$ref" : "#field_metaschema-datatypes-token_token-field" } } ] } }, - "required" : - [ "token-flag" ], - "additionalProperties" : false }, - "metaschema-datatypes-token-metaschema-datatypes-token:token-field" : - { "title" : "A metaschema 'token', a string without spaces for use as a key value", - "description" : "Corresponds to XML NCName (no-colon name).", - "$id" : "#field_metaschema-datatypes-token_token-field", - "type" : "string", - "pattern" : "^[_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][_A-Za-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-\\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$" } }, - "properties" : - { "parent" : - { "$ref" : "#assembly_metaschema-datatypes-token_parent" } }, - "required" : - [ "parent" ], - "additionalProperties" : false, - "maxProperties" : 1 } \ No newline at end of file diff --git a/test-suite/schema-generation/token/old/datatypes-token_metaschema_XML-SCHEMA.xsd b/test-suite/schema-generation/token/old/datatypes-token_metaschema_XML-SCHEMA.xsd deleted file mode 100644 index 5a555deb9..000000000 --- a/test-suite/schema-generation/token/old/datatypes-token_metaschema_XML-SCHEMA.xsd +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Metaschema Unit Test: Token Datatype - 1.0-milestone2 - metaschema-datatypes-token - parent - - - - - - - parent - parent assembly - - - parent: parent assembly - - - - - - - - A metaschema 'token', a string without spaces suitable for use as a key value) - Corresponds to XML NCName (no-colon name). - - - A metaschema 'token', a string without spaces suitable for use as a key value): Corresponds to XML NCName (no-colon name). - - - - - - - A metaschema 'token', a string without spaces for use as a key value - Corresponds to XML NCName (no-colon name). - - - A metaschema 'token', a string without spaces for use as a key value: Corresponds to XML NCName (no-colon name). - - - - - - A string token following the rules of XML "no colon" names, with no whitespace. (XML names are single alphabetic characters - followed by alphanumeric characters, periods, underscores or dashes.) - - - - - - A single token may not contain whitespace. - - - - -