From 6446c7301d18a32b2e8cf5deece01b390081f667 Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Wed, 28 Dec 2022 18:29:35 -0500
Subject: [PATCH] Wrap up fix and test updates.

---
 .../json-schema-gen/json-schema-gen.xspec     | 220 +++++++++++-------
 ...lue-testing-mini-jsonschema-CORRECTED.json | 116 ---------
 ...ue-testing-mini-jsonschema-CORRECTED2.json | 112 ---------
 ...esting-mini-jsonschema-CORRECTED3-json.xml | 163 -------------
 ...ue-testing-mini-jsonschema-CORRECTED3.json | 120 ----------
 .../json-schema-gen/testing01-valid.json      |  24 --
 .../json-schema-gen/testing02-valid.json      |   8 -
 .../json-schema-gen/testing03-valid.json      |  24 --
 .../json-schema-gen/testing04-INVALID.json    |   8 -
 .../json-schema-gen/testing05-valid.json      |  24 --
 .../json-schema-gen/testing06-INVALID.json    |  12 -
 11 files changed, 137 insertions(+), 694 deletions(-)
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED2.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3-json.xml
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/testing01-valid.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/testing02-valid.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/testing03-valid.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/testing04-INVALID.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/testing05-valid.json
 delete mode 100644 test-suite/metaschema-xspec/json-schema-gen/testing06-INVALID.json

diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
index 44f11fe67..cabd29c44 100644
--- a/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
@@ -6,98 +6,152 @@
    stylesheet="../../../toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl"
    run-as="external" xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
 
-   <!--unconstrained constrained-open constrained-closed constrained-narrow constrained-sortof-->
-   <x:scenario label="defining a token value with no enumerations">
-      <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
-         select="/*/m:define-field[@name='unconstrained']"/>
-      <x:expect label="the result should exclude enumerations" xmlns="http://www.w3.org/2005/xpath-functions">
-         <map key="oscal-value-testing-mini-oscal-value-testing-mini:unconstrained">
-            <string key="title">Unconstrained</string>
-            <string key="description">A field whose value is constrained only by its nominal datatype, 'token'.</string>
-            <string key="$id">#field_oscal-value-testing-mini_unconstrained</string>
-            <string key="type">object</string>
-            <map key="properties">
-               <map key="some">
-                  <string key="title">Some Flag</string>
-                  <string key="description">Some flag some flag some flag.</string>
-                  <string key="$ref">#/definitions/StringDatatype</string>
+   <x:scenario label="When generating a JSON schema from composed Metaschema definitions">
+      <x:scenario label="if it has a defined field with no constraint and no allowed-values">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='unconstrained']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:unconstrained">
+               <string key="title">Unconstrained</string>
+               <string key="description">A field whose value is constrained only by its nominal datatype, 'token'.</string>
+               <string key="$id">#field_oscal-value-testing-mini_unconstrained</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
                </map>
-               <map key="token-value">
-                  <string key="$ref">#/definitions/TokenDatatype</string>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+      
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target of '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-closed']"/>
+         <x:expect label="the resulting JSON Schema should have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed">
+               <string key="title">Constrained closed</string>
+               <string key="description">Because allow-other is 'no' an enumeration can be given in the JSON Schema.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-closed</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <array key="allOf">
+                        <map>
+                           <string key="$ref">#/definitions/TokenDatatype</string>
+                        </map>
+                        <map>
+                           <array key="enum">
+                              <string>one</string>
+                              <string>two</string>
+                              <string>three</string>
+                              <string>four</string>
+                           </array>
+                        </map>
+                     </array>
+                  </map>
                </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
             </map>
-            <array key="required">
-               <string>token-value</string>
-            </array>
-            <boolean key="additionalProperties">false</boolean>
-         </map>
-      </x:expect>
-   </x:scenario>
+         </x:expect>
+      </x:scenario>
    
-   <x:scenario label="defining a token value with enumerations">
-      <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
-         select="/*/m:define-field[@name='constrained-closed']"/>
-      <x:expect label="the result should *include* enumerations"
-         xmlns="http://www.w3.org/2005/xpath-functions">
-         <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed">
-            <string key="title">Constrained closed</string>
-            <string key="description">Because allow-other is 'no' an enumeration can be given in the JSON Schema.</string>
-            <string key="$id">#field_oscal-value-testing-mini_constrained-closed</string>
-            <string key="type">object</string>
-            <map key="properties">
-               <map key="some">
-                  <string key="title">Some Flag</string>
-                  <string key="description">Some flag some flag some flag.</string>
-                  <string key="$ref">#/definitions/StringDatatype</string>
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, no explicit target, and permissive enforcement of allow-other='yes'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-open']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-open">
+               <string key="title">Constrained open</string>
+               <string key="description">Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-open</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
                </map>
-               <map key="token-value">
-                  <array key="allOf">
-                     <map>
-                        <string key="$ref">#/definitions/TokenDatatype</string>
-                     </map>
-                     <map>
-                        <array key="enum">
-                           <string>one</string>
-                           <string>two</string>
-                           <string>three</string>
-                           <string>four</string>
-                        </array>
-                     </map>
-                  </array>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target other than '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-narrow']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow">
+               <string key="title">Constrained narrow</string>
+               <string key="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.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-narrow</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
                </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
             </map>
-            <array key="required">
-               <string>token-value</string>
-            </array>
-            <boolean key="additionalProperties">false</boolean>
-         </map>
-      </x:expect>
-   </x:scenario>
+         </x:expect>
+      </x:scenario>
    
-   <x:scenario label="defining a token value permissive enums with allow-other='yes'">
-      <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
-         select="/*/m:define-field[@name='constrained-narrow']"/>
-      <x:expect label="the result should exclude enumerations" xmlns="http://www.w3.org/2005/xpath-functions">
-         <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow">
-            <string key="title">Constrained narrow</string>
-            <string key="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.</string>
-            <string key="$id">#field_oscal-value-testing-mini_constrained-narrow</string>
-            <string key="type">object</string>
-            <map key="properties">
-               <map key="some">
-                  <string key="title">Some Flag</string>
-                  <string key="description">Some flag some flag some flag.</string>
-                  <string key="$ref">#/definitions/StringDatatype</string>
-               </map>
-               <map key="token-value">
-                  <string key="$ref">#/definitions/TokenDatatype</string>
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, permissive enforcement of allow-other='yes' and explicit target other than '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-sortof']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-sortof">
+               <string key="title">Constrained, sort of</string>
+               <string key="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.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-sortof</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
                </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
             </map>
-            <array key="required">
-               <string>token-value</string>
-            </array>
-            <boolean key="additionalProperties">false</boolean>
-         </map>
-      </x:expect>
+         </x:expect>
+      </x:scenario>
    </x:scenario>
 </x:description>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED.json b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED.json
deleted file mode 100644
index 1b2175745..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED.json
+++ /dev/null
@@ -1,116 +0,0 @@
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/0.1/oscal-value-testing-mini-schema.json",
-    "$comment" : "JSON value testing mini metaschema: JSON Schema",
-    "type" : "object",
-    "definitions" : 
-    { "oscal-value-testing-mini-oscal-value-testing-mini:root" : 
-      { "title" : "Root",
-        "description" : "Root root root.",
-        "$id" : "#assembly_oscal-value-testing-mini_root",
-        "type" : "object",
-        "properties" : 
-        { "unconstrained" : 
-          { "$ref" : "#field_oscal-value-testing-mini_unconstrained" },
-          "constrained-open" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-open" },
-          "constrained-closed" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-closed" },
-          "constrained-narrow" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-narrow" },
-          "constrained-sortof" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-sortof" } },
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:unconstrained" : 
-      { "title" : "Unconstrained",
-        "description" : "A field whose value is constrained only by its nominal datatype, 'token'.",
-        "$id" : "#field_oscal-value-testing-mini_unconstrained",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-open" : 
-      { "title" : "Constrained open",
-        "description" : "Because allow-other is 'yes' no enumeration can be given in the JSON Schema.",
-        "$id" : "#field_oscal-value-testing-mini_constrained-open",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed" : 
-      { "title" : "Constrained closed",
-        "description" : "Because allow-other is 'no' an enumeration can be given in the JSON Schema.",
-        "$id" : "#field_oscal-value-testing-mini_constrained-closed",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string",
-            "enum" : 
-                [ "one",
-                  "two",
-                  "three",
-                  "four" ] } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false
-         },
-      "oscal-value-testing-mini-oscal-value-testing-mini: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_oscal-value-testing-mini_constrained-narrow",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini: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_oscal-value-testing-mini_constrained-sortof",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "StringDatatype" : 
-      { "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" } },
-    "properties" : 
-    { "root" : 
-      { "$ref" : "#assembly_oscal-value-testing-mini_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-testing-mini-jsonschema-CORRECTED2.json b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED2.json
deleted file mode 100644
index 03ec73487..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED2.json
+++ /dev/null
@@ -1,112 +0,0 @@
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/0.1/oscal-value-testing-mini-schema.json",
-    "$comment" : "JSON value testing mini metaschema: JSON Schema",
-    "type" : "object",
-    "definitions" : 
-    { "oscal-value-testing-mini-oscal-value-testing-mini:root" : 
-      { "title" : "Root",
-        "description" : "Root root root.",
-        "$id" : "#assembly_oscal-value-testing-mini_root",
-        "type" : "object",
-        "properties" : 
-        { "unconstrained" : 
-          { "$ref" : "#field_oscal-value-testing-mini_unconstrained" },
-          "constrained-open" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-open" },
-          "constrained-closed" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-closed" },
-          "constrained-narrow" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-narrow" },
-          "constrained-sortof" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-sortof" } },
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:unconstrained" : 
-      { "title" : "Unconstrained",
-        "description" : "A field whose value is constrained only by its nominal datatype, 'token'.",
-        "$id" : "#field_oscal-value-testing-mini_unconstrained",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "$ref" : "#/definitions/TokenDatatype"
-          } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-open" : 
-      { "title" : "Constrained open",
-        "description" : "Because allow-other is 'yes' no enumeration can be given in the JSON Schema.",
-        "$id" : "#field_oscal-value-testing-mini_constrained-open",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          {  "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed" : 
-      { "title" : "Constrained closed",
-        "description" : "Because allow-other is 'no' an enumeration can be given in the JSON Schema.",
-        "$id" : "#field_oscal-value-testing-mini_constrained-closed",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          {  "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false
-         },
-      "oscal-value-testing-mini-oscal-value-testing-mini: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_oscal-value-testing-mini_constrained-narrow",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          {  "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini: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_oscal-value-testing-mini_constrained-sortof",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "StringDatatype" : 
-      { "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" } },
-    "properties" : 
-    { "root" : 
-      { "$ref" : "#assembly_oscal-value-testing-mini_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-testing-mini-jsonschema-CORRECTED3-json.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3-json.xml
deleted file mode 100644
index a020357e9..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3-json.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map xmlns="http://www.w3.org/2005/xpath-functions">
-   <string key="$schema">http://json-schema.org/draft-07/schema#</string>
-   <string key="$id">http://csrc.nist.gov/ns/oscal/0.1/oscal-value-testing-mini-schema.json</string>
-   <string key="$comment">JSON value testing mini metaschema: JSON Schema</string>
-   <string key="type">object</string>
-   <map key="definitions">
-      <map key="oscal-value-testing-mini-oscal-value-testing-mini:root">
-         <string key="title">Root</string>
-         <string key="description">Root root root.</string>
-         <string key="$id">#assembly_oscal-value-testing-mini_root</string>
-         <string key="type">object</string>
-         <map key="properties">
-            <map key="unconstrained">
-               <string key="$ref">#field_oscal-value-testing-mini_unconstrained</string>
-            </map>
-            <map key="constrained-open">
-               <string key="$ref">#field_oscal-value-testing-mini_constrained-open</string>
-            </map>
-            <map key="constrained-closed">
-               <string key="$ref">#field_oscal-value-testing-mini_constrained-closed</string>
-            </map>
-            <map key="constrained-narrow">
-               <string key="$ref">#field_oscal-value-testing-mini_constrained-narrow</string>
-            </map>
-            <map key="constrained-sortof">
-               <string key="$ref">#field_oscal-value-testing-mini_constrained-sortof</string>
-            </map>
-         </map>
-         <boolean key="additionalProperties">false</boolean>
-      </map>
-      <map key="oscal-value-testing-mini-oscal-value-testing-mini:unconstrained">
-         <string key="title">Unconstrained</string>
-         <string key="description">A field whose value is constrained only by its nominal datatype, 'token'.</string>
-         <string key="$id">#field_oscal-value-testing-mini_unconstrained</string>
-         <string key="type">object</string>
-         <map key="properties">
-            <map key="some">
-               <string key="title">Some Flag</string>
-               <string key="description">Some flag some flag some flag.</string>
-               <string key="$ref">#/definitions/StringDatatype</string>
-            </map>
-            <map key="token-value">
-               <string key="$ref">#/definitions/TokenDatatype</string>
-            </map>
-         </map>
-         <array key="required">
-            <string>token-value</string>
-         </array>
-         <boolean key="additionalProperties">false</boolean>
-      </map>
-      <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-open">
-         <string key="title">Constrained open</string>
-         <string key="description">Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</string>
-         <string key="$id">#field_oscal-value-testing-mini_constrained-open</string>
-         <string key="type">object</string>
-         <map key="properties">
-            <map key="some">
-               <string key="title">Some Flag</string>
-               <string key="description">Some flag some flag some flag.</string>
-               <string key="$ref">#/definitions/StringDatatype</string>
-            </map>
-            <map key="token-value">
-               <string key="$ref">#/definitions/TokenDatatype</string>
-            </map>
-         </map>
-         <array key="required">
-            <string>token-value</string>
-         </array>
-         <boolean key="additionalProperties">false</boolean>
-      </map>
-      <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed">
-         <string key="title">Constrained closed</string>
-         <string key="description">Because allow-other is 'no' an enumeration can be given in the JSON Schema.</string>
-         <string key="$id">#field_oscal-value-testing-mini_constrained-closed</string>
-         <string key="type">object</string>
-         <map key="properties">
-            <map key="some">
-               <string key="title">Some Flag</string>
-               <string key="description">Some flag some flag some flag.</string>
-               <string key="$ref">#/definitions/StringDatatype</string>
-            </map>
-            <map key="token-value">
-               <array key="allOf">
-                  <map>
-                     <string key="$ref">#/definitions/TokenDatatype</string>
-                  </map>
-                  <map>
-                     <array key="enum">
-                        <string>one</string>
-                        <string>two</string>
-                        <string>three</string>
-                        <string>four</string>
-                     </array>
-                  </map>
-               </array>
-            </map>
-         </map>
-         <array key="required">
-            <string>token-value</string>
-         </array>
-         <boolean key="additionalProperties">false</boolean>
-      </map>
-      <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow">
-         <string key="title">Constrained narrow</string>
-         <string key="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.</string>
-         <string key="$id">#field_oscal-value-testing-mini_constrained-narrow</string>
-         <string key="type">object</string>
-         <map key="properties">
-            <map key="some">
-               <string key="title">Some Flag</string>
-               <string key="description">Some flag some flag some flag.</string>
-               <string key="$ref">#/definitions/StringDatatype</string>
-            </map>
-            <map key="token-value">
-               <string key="$ref">#/definitions/TokenDatatype</string>
-            </map>
-         </map>
-         <array key="required">
-            <string>token-value</string>
-         </array>
-         <boolean key="additionalProperties">false</boolean>
-      </map>
-      <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-sortof">
-         <string key="title">Constrained, sort of</string>
-         <string key="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.</string>
-         <string key="$id">#field_oscal-value-testing-mini_constrained-sortof</string>
-         <string key="type">object</string>
-         <map key="properties">
-            <map key="some">
-               <string key="title">Some Flag</string>
-               <string key="description">Some flag some flag some flag.</string>
-               <string key="$ref">#/definitions/StringDatatype</string>
-            </map>
-            <map key="token-value">
-               <string key="type">string</string>
-            </map>
-         </map>
-         <array key="required">
-            <string>token-value</string>
-         </array>
-         <boolean key="additionalProperties">false</boolean>
-      </map>
-      <map key="StringDatatype">
-         <string key="type">string</string>
-         <string key="pattern">^\S(.*\S)?$</string>
-      </map>
-      <map key="TokenDatatype">
-         <string key="type">string</string>
-         <string key="pattern">^(\p{L}|_)(\p{L}|\p{N}|[.\-_])*$</string>
-      </map>
-   </map>
-   <map key="properties">
-      <map key="root">
-         <string key="$ref">#assembly_oscal-value-testing-mini_root</string>
-      </map>
-   </map>
-   <array key="required">
-      <string>root</string>
-   </array>
-   <boolean key="additionalProperties">false</boolean>
-   <number key="maxProperties">1</number>
-</map>
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3.json b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3.json
deleted file mode 100644
index 5b9420986..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema-CORRECTED3.json
+++ /dev/null
@@ -1,120 +0,0 @@
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/0.1/oscal-value-testing-mini-schema.json",
-    "$comment" : "JSON value testing mini metaschema: JSON Schema",
-    "type" : "object",
-    "definitions" : 
-    { "oscal-value-testing-mini-oscal-value-testing-mini:root" : 
-      { "title" : "Root",
-        "description" : "Root root root.",
-        "$id" : "#assembly_oscal-value-testing-mini_root",
-        "type" : "object",
-        "properties" : 
-        { "unconstrained" : 
-          { "$ref" : "#field_oscal-value-testing-mini_unconstrained" },
-          "constrained-open" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-open" },
-          "constrained-closed" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-closed" },
-          "constrained-narrow" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-narrow" },
-          "constrained-sortof" : 
-          { "$ref" : "#field_oscal-value-testing-mini_constrained-sortof" } },
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:unconstrained" : 
-      { "title" : "Unconstrained",
-        "description" : "A field whose value is constrained only by its nominal datatype, 'token'.",
-        "$id" : "#field_oscal-value-testing-mini_unconstrained",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "$ref" : "#/definitions/TokenDatatype"
-          } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-open" : 
-      { "title" : "Constrained open",
-        "description" : "Because allow-other is 'yes' no enumeration can be given in the JSON Schema.",
-        "$id" : "#field_oscal-value-testing-mini_constrained-open",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          {  "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed" : 
-      { "title" : "Constrained closed",
-        "description" : "Because allow-other is 'no' an enumeration can be given in the JSON Schema.",
-        "$id" : "#field_oscal-value-testing-mini_constrained-closed",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : {
-            "allOf" : [
-              { "$ref" : "#/definitions/TokenDatatype" },
-              { "enum" : 
-                [ "one",
-                  "two",
-                  "three",
-                  "four" ] }  
-             ] }
-           },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false
-         },
-      "oscal-value-testing-mini-oscal-value-testing-mini: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_oscal-value-testing-mini_constrained-narrow",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          {  "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "oscal-value-testing-mini-oscal-value-testing-mini: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_oscal-value-testing-mini_constrained-sortof",
-        "type" : "object",
-        "properties" : 
-        { "some" : 
-          { "title" : "Some Flag",
-            "description" : "Some flag some flag some flag.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "token-value" : 
-          { "type" : "string" } },
-        "required" : 
-        [ "token-value" ],
-        "additionalProperties" : false },
-      "StringDatatype" : 
-      { "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" } },
-    "properties" : 
-    { "root" : 
-      { "$ref" : "#assembly_oscal-value-testing-mini_root" } },
-    "required" : 
-    [ "root" ],
-    "additionalProperties" : false,
-    "maxProperties" : 1 }
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/testing01-valid.json b/test-suite/metaschema-xspec/json-schema-gen/testing01-valid.json
deleted file mode 100644
index 764870fa2..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/testing01-valid.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "root": {
-        "unconstrained": {
-            "some": "a",
-            "token-value": "any"
-        },
-        "constrained-open": {
-            "some": "b",
-            "token-value": "one"
-        },
-        "constrained-closed": {
-            "some": "c",
-            "token-value": "two"
-        },
-        "constrained-narrow": {
-            "some": "d",
-            "token-value": "three"
-        },
-        "constrained-sortof": {
-            "some": "e",
-            "token-value": "four"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/testing02-valid.json b/test-suite/metaschema-xspec/json-schema-gen/testing02-valid.json
deleted file mode 100644
index 188047ffc..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/testing02-valid.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "root": {
-        "unconstrained": {
-            "some": "a",
-            "token-value": "anything"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/testing03-valid.json b/test-suite/metaschema-xspec/json-schema-gen/testing03-valid.json
deleted file mode 100644
index a69802130..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/testing03-valid.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "root": {
-        "unconstrained": {
-            "some": "a",
-            "token-value": "any"
-        },
-        "constrained-open": {
-            "some": "b",
-            "token-value": "one"
-        },
-        "constrained-closed": {
-            "some": "c",
-            "token-value": "three"
-        },
-        "constrained-narrow": {
-            "some": "d",
-            "token-value": "three"
-        },
-        "constrained-sortof": {
-            "some": "e",
-            "token-value": "four"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/testing04-INVALID.json b/test-suite/metaschema-xspec/json-schema-gen/testing04-INVALID.json
deleted file mode 100644
index c19e4829e..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/testing04-INVALID.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "root": {
-        "constrained-closed": {
-            "some": "c",
-            "token-value": "FIVE"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/testing05-valid.json b/test-suite/metaschema-xspec/json-schema-gen/testing05-valid.json
deleted file mode 100644
index 5e0fc39f5..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/testing05-valid.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "root": {
-        "unconstrained": {
-            "some": "a",
-            "token-value": "any"
-        },
-        "constrained-open": {
-            "some": "b",
-            "token-value": "old"
-        },
-        "constrained-closed": {
-            "some": "c",
-            "token-value": "three"
-        },
-        "constrained-narrow": {
-            "some": "d",
-            "token-value": "value"
-        },
-        "constrained-sortof": {
-            "some": "e",
-            "token-value": "works"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/testing06-INVALID.json b/test-suite/metaschema-xspec/json-schema-gen/testing06-INVALID.json
deleted file mode 100644
index b43f7a3f5..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/testing06-INVALID.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "root": {
-        "unconstrained": {
-            "some": "a",
-            "token-value": "any OLD"
-        },
-        "constrained-open": {
-            "some": "b",
-            "token-value": "STRING value"
-        }
-    }
-}
\ No newline at end of file