From 76c6e3cafe6ace1aaa9d3ec3c5cc4ddaafd05de0 Mon Sep 17 00:00:00 2001
From: "A.J. Stein" <alexander.stein@nist.gov>
Date: Sat, 10 Jun 2023 00:23:12 -0400
Subject: [PATCH] Remove narrow and open tests for flag elements.

The reason these tests exist only for field is they have a target. In
current Metaschema syntax, allowed-value for flag, because of the virtue
of how it works, does not have a target (it is always implied '.') and
some the variety of non-dot targets, even if implied, are not possible
like they are for field.
---
 .../json-value_flag_constrained-narrow.json   | 72 -------------------
 ...lue_flag_constrained-narrow_metaschema.xml | 39 ----------
 .../json-value_flag_constrained-sortof.json   | 72 -------------------
 ...lue_flag_constrained-sortof_metaschema.xml | 38 ----------
 4 files changed, 221 deletions(-)
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow_metaschema.xml
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof_metaschema.xml

diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow.json
deleted file mode 100644
index 2fdb6e277..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-value_flag_constrained-narrow-schema.json",
-  "$comment": "JSON value testing mini metaschema: JSON Schema",
-  "type": "object",
-  "definitions": {
-    "json-value_flag_constrained-narrow-json-value_flag_constrained-narrow:root": {
-      "title": "Root",
-      "description": "Root root root.",
-      "$id": "#assembly_json-value_flag_constrained-narrow_root",
-      "type": "object",
-      "properties": {
-        "constrained-narrow": {
-          "$ref": "#field_json-value_flag_constrained-narrow_constrained-narrow"
-        }
-      },
-      "additionalProperties": false
-    },
-    "json-value_flag_constrained-narrow-json-value_flag_constrained-narrow:constrained-narrow": {
-      "title": "Constrained narrow",
-      "description": "Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.",
-      "$id": "#field_json-value_flag_constrained-narrow_constrained-narrow",
-      "type": "object",
-      "properties": {
-        "some": {
-          "title": "Some Flag",
-          "description": "Some flag some flag some flag.",
-          "allOf": [
-            {
-              "$ref": "#/definitions/StringDatatype"
-            },
-            {
-              "enum": [
-                "one",
-                "two",
-                "three",
-                "four"
-              ]
-            }
-          ]
-        },
-        "token-value": {
-          "$ref": "#/definitions/TokenDatatype"
-        }
-      },
-      "required": [
-        "token-value"
-      ],
-      "additionalProperties": false
-    },
-    "StringDatatype": {
-      "description": "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-      "type": "string",
-      "pattern": "^\\S(.*\\S)?$"
-    },
-    "TokenDatatype": {
-      "description": "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-      "type": "string",
-      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
-    }
-  },
-  "properties": {
-    "root": {
-      "$ref": "#assembly_json-value_flag_constrained-narrow_root"
-    }
-  },
-  "required": [
-    "root"
-  ],
-  "additionalProperties": false,
-  "maxProperties": 1
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow_metaschema.xml
deleted file mode 100644
index abd6386ca..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-narrow_metaschema.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
-    <schema-name>JSON value testing mini metaschema</schema-name>
-    <schema-version>0.1</schema-version>
-    <short-name>json-value_flag_constrained-narrow</short-name>
-    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
-    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
-    <define-assembly name="root">
-        <formal-name>Root</formal-name>
-        <description>Root root root.</description>
-        <root-name>root</root-name>
-        <model>
-            <field ref="constrained-narrow"/>
-        </model>
-    </define-assembly>
-
-    <define-field 
-        as-type="token"
-        name="constrained-narrow">
-        <formal-name>Constrained narrow</formal-name>
-        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-            <constraint>
-                <allowed-values allow-other="no">
-                    <enum value="one"/>
-                    <enum value="two"/>
-                    <enum value="three"/>
-                    <enum value="four"/>
-                </allowed-values>
-            </constraint>
-        </define-flag>
-    </define-field>
-</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof.json
deleted file mode 100644
index 4bb7e9527..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-value_flag_constrained_sortof-schema.json",
-  "$comment": "JSON value testing mini metaschema: JSON Schema",
-  "type": "object",
-  "definitions": {
-    "json-value_flag_constrained_sortof-json-value_flag_constrained_sortof:root": {
-      "title": "Root",
-      "description": "Root root root.",
-      "$id": "#assembly_json-value_flag_constrained_sortof_root",
-      "type": "object",
-      "properties": {
-        "constrained-sortof": {
-          "$ref": "#field_json-value_flag_constrained_sortof_constrained-sortof"
-        }
-      },
-      "additionalProperties": false
-    },
-    "json-value_flag_constrained_sortof-json-value_flag_constrained_sortof:constrained-sortof": {
-      "title": "Constrained, sort of",
-      "description": "Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.",
-      "$id": "#field_json-value_flag_constrained_sortof_constrained-sortof",
-      "type": "object",
-      "properties": {
-        "some": {
-          "title": "Some Flag",
-          "description": "Some flag some flag some flag.",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/StringDatatype"
-            },
-            {
-              "enum": [
-                "one",
-                "two",
-                "three",
-                "four"
-              ]
-            }
-          ]
-        },
-        "token-value": {
-          "$ref": "#/definitions/TokenDatatype"
-        }
-      },
-      "required": [
-        "token-value"
-      ],
-      "additionalProperties": false
-    },
-    "StringDatatype": {
-      "description": "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-      "type": "string",
-      "pattern": "^\\S(.*\\S)?$"
-    },
-    "TokenDatatype": {
-      "description": "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-      "type": "string",
-      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
-    }
-  },
-  "properties": {
-    "root": {
-      "$ref": "#assembly_json-value_flag_constrained_sortof_root"
-    }
-  },
-  "required": [
-    "root"
-  ],
-  "additionalProperties": false,
-  "maxProperties": 1
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof_metaschema.xml
deleted file mode 100644
index cb3e1f4e7..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value_flag_constrained-sortof_metaschema.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
-    <schema-name>JSON value testing mini metaschema</schema-name>
-    <schema-version>0.1</schema-version>
-    <short-name>json-value_flag_constrained_sortof</short-name>
-    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
-    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
-    <define-assembly name="root">
-        <formal-name>Root</formal-name>
-        <description>Root root root.</description>
-        <root-name>root</root-name>
-        <model>
-            <field ref="constrained-sortof"/>
-        </model>
-    </define-assembly>
-    <define-field 
-        as-type="token"
-        name="constrained-sortof">
-        <formal-name>Constrained, sort of</formal-name>
-        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-            <constraint>
-                <allowed-values allow-other="yes">
-                    <enum value="one"/>
-                    <enum value="two"/>
-                    <enum value="three"/>
-                    <enum value="four"/>
-                </allowed-values>
-            </constraint>
-        </define-flag>
-    </define-field>
-</METASCHEMA>