More refinements to end-to-end XSpec for profile resolution

src/specifications/profile-resolution/profile-resolution-examples/full-set.xspec

@@ -4,8 +4,20 @@
                xmlns:opr="http://csrc.nist.gov/ns/oscal/profile-resolution"
                xmlns:o="http://csrc.nist.gov/ns/oscal/1.0"
                stylesheet="../../../utils/util/resolver-pipeline/oscal-profile-RESOLVE.xsl"
-               run-as="external">
+               run-as="external"
+               xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
    <x:helper stylesheet="../../../utils/util/resolver-pipeline/oscal-profile-test-helper.xsl"/>
+
+   <x:scenario label="Base test">
+      <!-- Alternative model for test scrubbing both the result and the expected
+           result for comparison -->
+      <x:context href="base-test_profile.xml"/>
+      <x:variable name="ov:expected-output"
+         href="output-expected/base-test_profile_RESOLVED.xml"/>
+      <x:expect label="Base test - fully resolved"
+         test="opr:scrub($x:result)" select="opr:scrub($ov:expected-output)"/>
+   </x:scenario>
+
    <x:scenario label="Testing base-test_profile.xml">
 
       <x:context href="base-test_profile.xml"/>

src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="...">
+   uuid="4e44c016-f69e-4ef0-9041-7c3afc2c6ae7">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2021-04-06T15:00:48.692-04:00</last-modified>