From b9eaca9a3a2ffc9b3fd734078f8dfe6360adc277 Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Thu, 7 Apr 2022 12:49:18 -0400
Subject: [PATCH 1/7] First draft of testing approach with current WIP prune
 phase transform.

---
 .../metaschema-prune-unused-definitions.xspec | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec

diff --git a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
new file mode 100644
index 000000000..a1a77437b
--- /dev/null
+++ b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description 
+    xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+    xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+    stylesheet="../metaschema-prune-unused-definitions.xsl"
+    run-as="external">
+    <x:scenario label="During Metaschema composition">
+        <x:scenario label="during the pruning phase">
+            <x:scenario label="a single root assembly with no references">
+                <x:context>
+                    <METASCHEMA>
+                        <define-assembly name="box">
+                            <formal-name>BOX</formal-name>
+                            <description>Just a box, no relationship to anything else.</description>
+                            <root-name>BOX</root-name>
+                        </define-assembly>
+                    </METASCHEMA>
+                </x:context>
+                <x:expect label="should not throw an exception"
+                    test="count($x:result//m:EXCEPTION) = 1"/>
+            </x:scenario>
+            <x:scenario label="top level definitions with correct references">
+                <x:context>
+                    <METASCHEMA>
+                        <define-assembly name="box">
+                            <formal-name>BOX</formal-name>
+                            <description>Just a box, no relationship to anything else.</description>
+                            <root-name>BOX</root-name>
+                        </define-assembly>
+                        <define-assembly name="folder">
+                            <formal-name>Folder</formal-name>
+                            <description>One or more folders belong in a box.</description>
+                            <model/>
+                        </define-assembly>
+                    </METASCHEMA>
+                </x:context>
+                <x:expect label="should not throw an exception"
+                    test="count($x:result//m:EXCEPTION) = 1"/>
+            </x:scenario>
+        </x:scenario>
+    </x:scenario>
+</x:description>

From eeeb60ac2516ead40fe321c7523f9b54f91fef7b Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Thu, 7 Apr 2022 13:07:08 -0400
Subject: [PATCH 2/7] Woops, maybe that is the real issue with a test.

---
 .../testing/metaschema-prune-unused-definitions.xspec      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
index a1a77437b..fbd780be4 100644
--- a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
+++ b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
@@ -18,7 +18,7 @@
                     </METASCHEMA>
                 </x:context>
                 <x:expect label="should not throw an exception"
-                    test="count($x:result//m:EXCEPTION) = 1"/>
+                    test="count($x:result//m:EXCEPTION) = 0"/>
             </x:scenario>
             <x:scenario label="top level definitions with correct references">
                 <x:context>
@@ -27,6 +27,9 @@
                             <formal-name>BOX</formal-name>
                             <description>Just a box, no relationship to anything else.</description>
                             <root-name>BOX</root-name>
+                            <model>
+                                <assembly ref="folder"   max-occurs="unbounded"/>
+                            </model>
                         </define-assembly>
                         <define-assembly name="folder">
                             <formal-name>Folder</formal-name>
@@ -36,7 +39,7 @@
                     </METASCHEMA>
                 </x:context>
                 <x:expect label="should not throw an exception"
-                    test="count($x:result//m:EXCEPTION) = 1"/>
+                    test="count($x:result//m:EXCEPTION) = 0"/>
             </x:scenario>
         </x:scenario>
     </x:scenario>

From 578ac9162f088bd30f6c9dcd50fc8dc66fb7137e Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Thu, 7 Apr 2022 13:34:04 -0400
Subject: [PATCH 3/7] Update tests after pairing with Wendell.

---
 .../metaschema-prune-unused-definitions.xspec | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
index fbd780be4..92da3dc4a 100644
--- a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
+++ b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
@@ -18,9 +18,9 @@
                     </METASCHEMA>
                 </x:context>
                 <x:expect label="should not throw an exception"
-                    test="count($x:result//m:EXCEPTION) = 0"/>
+                    test="$x:result//m:EXCEPTION => empty()"/>
             </x:scenario>
-            <x:scenario label="top level definitions with correct references">
+            <x:scenario label="top-level definitions with correct references.">
                 <x:context>
                     <METASCHEMA>
                         <define-assembly name="box">
@@ -28,18 +28,36 @@
                             <description>Just a box, no relationship to anything else.</description>
                             <root-name>BOX</root-name>
                             <model>
-                                <assembly ref="folder"   max-occurs="unbounded"/>
+                                <assembly ref="folder"/>
                             </model>
                         </define-assembly>
                         <define-assembly name="folder">
                             <formal-name>Folder</formal-name>
                             <description>One or more folders belong in a box.</description>
-                            <model/>
                         </define-assembly>
                     </METASCHEMA>
                 </x:context>
                 <x:expect label="should not throw an exception"
-                    test="count($x:result//m:EXCEPTION) = 0"/>
+                    test="$x:result//m:EXCEPTION => empty()"/>
+            </x:scenario>
+            <x:scenario label="top-level definitions with unused.">
+                <x:context>
+                    <METASCHEMA>
+                        <short-name>pruning003</short-name>
+                        <define-assembly name="box">
+                            <formal-name>BOX</formal-name>
+                            <description>Just a box, no relationship to anything else.</description>
+                            <root-name>BOX</root-name>
+                            <model/>
+                        </define-assembly>
+                        <define-assembly name="folder">
+                            <formal-name>Folder</formal-name>
+                            <description>One or more folders belong in a box.</description>
+                        </define-assembly>
+                    </METASCHEMA>
+                </x:context>
+                <x:expect label="should throw an 'unused-definition' exception."
+                    test="$x:result//m:EXCEPTION[@problem-type = 'unused-definition'] => string() => empty()"/>
             </x:scenario>
         </x:scenario>
     </x:scenario>

From 14f31582687e6c75b0b9819d1223cd8cadbddc6e Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Thu, 7 Apr 2022 18:24:41 -0400
Subject: [PATCH 4/7] Fix tests to align with Wendell exception msg check.

---
 .../metaschema-prune-unused-definitions.xspec    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
index 92da3dc4a..ff15d075c 100644
--- a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
+++ b/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x:description 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:x="http://www.jenitennison.com/xslt/xspec"
     xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
     xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
@@ -9,7 +10,7 @@
         <x:scenario label="during the pruning phase">
             <x:scenario label="a single root assembly with no references">
                 <x:context>
-                    <METASCHEMA>
+                    <METASCHEMA module="pruning001">
                         <define-assembly name="box">
                             <formal-name>BOX</formal-name>
                             <description>Just a box, no relationship to anything else.</description>
@@ -22,7 +23,7 @@
             </x:scenario>
             <x:scenario label="top-level definitions with correct references.">
                 <x:context>
-                    <METASCHEMA>
+                    <METASCHEMA module="pruning002">
                         <define-assembly name="box">
                             <formal-name>BOX</formal-name>
                             <description>Just a box, no relationship to anything else.</description>
@@ -42,8 +43,7 @@
             </x:scenario>
             <x:scenario label="top-level definitions with unused.">
                 <x:context>
-                    <METASCHEMA>
-                        <short-name>pruning003</short-name>
+                    <METASCHEMA module="pruning003">
                         <define-assembly name="box">
                             <formal-name>BOX</formal-name>
                             <description>Just a box, no relationship to anything else.</description>
@@ -56,8 +56,12 @@
                         </define-assembly>
                     </METASCHEMA>
                 </x:context>
-                <x:expect label="should throw an 'unused-definition' exception."
-                    test="$x:result//m:EXCEPTION[@problem-type = 'unused-definition'] => string() => empty()"/>
+                <x:expect label="throws only exception for an unused definition."
+                    test="count($x:result//m:EXCEPTION) eq 1"/>
+                <x:expect label="and should be of type unused-definition with the proper message."
+                    test="$x:result//m:EXCEPTION[@problem-type = 'unused-definition'] => exists()"/>
+                <x:expect label="and the error message indicates the specific definition that's unused."
+                    test="$x:result//m:EXCEPTION[@problem-type='unused-definition'] = 'REMOVING unused assembly definition for ''folder'' from pruning003'"/>
             </x:scenario>
         </x:scenario>
     </x:scenario>

From 8454f0096572b8c87cddc23d99051b7e20714595 Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Thu, 7 Apr 2022 18:29:13 -0400
Subject: [PATCH 5/7] Move pruning tests back to their own folder.

---
 .../{ => 4_pruning}/metaschema-prune-unused-definitions.xspec     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename toolchains/xslt-M4/compose/testing/{ => 4_pruning}/metaschema-prune-unused-definitions.xspec (100%)

diff --git a/toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
similarity index 100%
rename from toolchains/xslt-M4/compose/testing/metaschema-prune-unused-definitions.xspec
rename to toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec

From 098143c4829a3dc08369ce4629855c30cdf9657a Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Thu, 7 Apr 2022 18:38:26 -0400
Subject: [PATCH 6/7] Refactor test input XML docs into separate files

Make the tests more reusable across implementations.
---
 .../metaschema-prune-unused-definitions.xspec | 44 ++-----------------
 .../compose/testing/4_pruning/pruning001.xml  |  9 ++++
 .../compose/testing/4_pruning/pruning002.xml  | 16 +++++++
 .../compose/testing/4_pruning/pruning003.xml  | 14 ++++++
 4 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 toolchains/xslt-M4/compose/testing/4_pruning/pruning001.xml
 create mode 100644 toolchains/xslt-M4/compose/testing/4_pruning/pruning002.xml
 create mode 100644 toolchains/xslt-M4/compose/testing/4_pruning/pruning003.xml

diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
index ff15d075c..9940ee04b 100644
--- a/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
+++ b/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
@@ -4,58 +4,22 @@
     xmlns:x="http://www.jenitennison.com/xslt/xspec"
     xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
     xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-    stylesheet="../metaschema-prune-unused-definitions.xsl"
+    stylesheet="../../metaschema-prune-unused-definitions.xsl"
     run-as="external">
     <x:scenario label="During Metaschema composition">
         <x:scenario label="during the pruning phase">
             <x:scenario label="a single root assembly with no references">
-                <x:context>
-                    <METASCHEMA module="pruning001">
-                        <define-assembly name="box">
-                            <formal-name>BOX</formal-name>
-                            <description>Just a box, no relationship to anything else.</description>
-                            <root-name>BOX</root-name>
-                        </define-assembly>
-                    </METASCHEMA>
-                </x:context>
+                <x:context href="./pruning001.xml"/>
                 <x:expect label="should not throw an exception"
                     test="$x:result//m:EXCEPTION => empty()"/>
             </x:scenario>
             <x:scenario label="top-level definitions with correct references.">
-                <x:context>
-                    <METASCHEMA module="pruning002">
-                        <define-assembly name="box">
-                            <formal-name>BOX</formal-name>
-                            <description>Just a box, no relationship to anything else.</description>
-                            <root-name>BOX</root-name>
-                            <model>
-                                <assembly ref="folder"/>
-                            </model>
-                        </define-assembly>
-                        <define-assembly name="folder">
-                            <formal-name>Folder</formal-name>
-                            <description>One or more folders belong in a box.</description>
-                        </define-assembly>
-                    </METASCHEMA>
-                </x:context>
+                <x:context href="./pruning002.xml"/>
                 <x:expect label="should not throw an exception"
                     test="$x:result//m:EXCEPTION => empty()"/>
             </x:scenario>
             <x:scenario label="top-level definitions with unused.">
-                <x:context>
-                    <METASCHEMA module="pruning003">
-                        <define-assembly name="box">
-                            <formal-name>BOX</formal-name>
-                            <description>Just a box, no relationship to anything else.</description>
-                            <root-name>BOX</root-name>
-                            <model/>
-                        </define-assembly>
-                        <define-assembly name="folder">
-                            <formal-name>Folder</formal-name>
-                            <description>One or more folders belong in a box.</description>
-                        </define-assembly>
-                    </METASCHEMA>
-                </x:context>
+                <x:context href="./pruning003.xml"/>                
                 <x:expect label="throws only exception for an unused definition."
                     test="count($x:result//m:EXCEPTION) eq 1"/>
                 <x:expect label="and should be of type unused-definition with the proper message."
diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/pruning001.xml b/toolchains/xslt-M4/compose/testing/4_pruning/pruning001.xml
new file mode 100644
index 000000000..1f330a6a9
--- /dev/null
+++ b/toolchains/xslt-M4/compose/testing/4_pruning/pruning001.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+    module="pruning001">
+    <define-assembly name="box">
+        <formal-name>BOX</formal-name>
+        <description>Just a box, no relationship to anything else.</description>
+        <root-name>BOX</root-name>
+    </define-assembly>
+</METASCHEMA>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/pruning002.xml b/toolchains/xslt-M4/compose/testing/4_pruning/pruning002.xml
new file mode 100644
index 000000000..b12282240
--- /dev/null
+++ b/toolchains/xslt-M4/compose/testing/4_pruning/pruning002.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+    module="pruning002">
+    <define-assembly name="box">
+        <formal-name>BOX</formal-name>
+        <description>Just a box, no relationship to anything else.</description>
+        <root-name>BOX</root-name>
+        <model>
+            <assembly ref="folder"/>
+        </model>
+    </define-assembly>
+    <define-assembly name="folder">
+        <formal-name>Folder</formal-name>
+        <description>One or more folders belong in a box.</description>
+    </define-assembly>
+</METASCHEMA>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/pruning003.xml b/toolchains/xslt-M4/compose/testing/4_pruning/pruning003.xml
new file mode 100644
index 000000000..5d86d8432
--- /dev/null
+++ b/toolchains/xslt-M4/compose/testing/4_pruning/pruning003.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" 
+    module="pruning003">
+    <define-assembly name="box">
+        <formal-name>BOX</formal-name>
+        <description>Just a box, no relationship to anything else.</description>
+        <root-name>BOX</root-name>
+        <model/>
+    </define-assembly>
+    <define-assembly name="folder">
+        <formal-name>Folder</formal-name>
+        <description>One or more folders belong in a box.</description>
+    </define-assembly>
+</METASCHEMA>
\ No newline at end of file

From 28a830b5205c3f91a86b852651387dd2f8c22f0d Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Fri, 8 Apr 2022 15:27:41 -0400
Subject: [PATCH 7/7] Relocate input files to subdir per convo with
 @wendellpiez.

---
 .../compose/testing/4_pruning/{ => input}/pruning001.xml    | 0
 .../compose/testing/4_pruning/{ => input}/pruning002.xml    | 0
 .../compose/testing/4_pruning/{ => input}/pruning003.xml    | 0
 .../4_pruning/metaschema-prune-unused-definitions.xspec     | 6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename toolchains/xslt-M4/compose/testing/4_pruning/{ => input}/pruning001.xml (100%)
 rename toolchains/xslt-M4/compose/testing/4_pruning/{ => input}/pruning002.xml (100%)
 rename toolchains/xslt-M4/compose/testing/4_pruning/{ => input}/pruning003.xml (100%)

diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/pruning001.xml b/toolchains/xslt-M4/compose/testing/4_pruning/input/pruning001.xml
similarity index 100%
rename from toolchains/xslt-M4/compose/testing/4_pruning/pruning001.xml
rename to toolchains/xslt-M4/compose/testing/4_pruning/input/pruning001.xml
diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/pruning002.xml b/toolchains/xslt-M4/compose/testing/4_pruning/input/pruning002.xml
similarity index 100%
rename from toolchains/xslt-M4/compose/testing/4_pruning/pruning002.xml
rename to toolchains/xslt-M4/compose/testing/4_pruning/input/pruning002.xml
diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/pruning003.xml b/toolchains/xslt-M4/compose/testing/4_pruning/input/pruning003.xml
similarity index 100%
rename from toolchains/xslt-M4/compose/testing/4_pruning/pruning003.xml
rename to toolchains/xslt-M4/compose/testing/4_pruning/input/pruning003.xml
diff --git a/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec b/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
index 9940ee04b..662ff934b 100644
--- a/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
+++ b/toolchains/xslt-M4/compose/testing/4_pruning/metaschema-prune-unused-definitions.xspec
@@ -9,17 +9,17 @@
     <x:scenario label="During Metaschema composition">
         <x:scenario label="during the pruning phase">
             <x:scenario label="a single root assembly with no references">
-                <x:context href="./pruning001.xml"/>
+                <x:context href="./input/pruning001.xml"/>
                 <x:expect label="should not throw an exception"
                     test="$x:result//m:EXCEPTION => empty()"/>
             </x:scenario>
             <x:scenario label="top-level definitions with correct references.">
-                <x:context href="./pruning002.xml"/>
+                <x:context href="./input/pruning002.xml"/>
                 <x:expect label="should not throw an exception"
                     test="$x:result//m:EXCEPTION => empty()"/>
             </x:scenario>
             <x:scenario label="top-level definitions with unused.">
-                <x:context href="./pruning003.xml"/>                
+                <x:context href="./input/pruning003.xml"/>                
                 <x:expect label="throws only exception for an unused definition."
                     test="count($x:result//m:EXCEPTION) eq 1"/>
                 <x:expect label="and should be of type unused-definition with the proper message."