Refreshing test outputs

GoldenEagle16 · Apr 8, 2021 · ad15a43 · ad15a43
1 parent 3037672
commit ad15a43
Show file tree

Hide file tree

Showing 18 changed files with 148 additions and 292 deletions.
diff --git a/...ile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml b/...ile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="c608fba2-dcb2-4ae3-9c4b-d7427250315a">
+         uuid="3e7beef7-c529-4810-b01b-a2235b66462b">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:35.84-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:24.13-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:42.177-04:00</prop>
       <link rel="resolution-source" href="base-test_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
       <param id="a1_prm1">
          <label>A1 Parameter 1</label>
       </param>
-      <prop name="place">first</prop>
+      <prop name="place" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
       <control id="c3.a">
          <title>Control C3-A</title>
-         <prop name="place">first</prop>
+         <prop name="place" value="tenth"/>
          <part name="statement" id="c3-stmt">
             <p>C3 A ccccc cccccccccccccc.</p>
          </part>

diff --git a/...le-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml b/...le-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="cc6f920f-5bd8-47eb-8627-972c2cbbbe79">
+         uuid="f3feda13-41d2-4808-a71e-91bae266294e">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:37.3-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:25.353-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:42.683-04:00</prop>
       <link rel="resolution-source" href="base2-test_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
       <param id="a1_prm1">
          <label>A1 Parameter 1</label>
       </param>
-      <prop name="place">first</prop>
+      <prop name="place" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>

diff --git a/...rofile-resolution/profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml b/...rofile-resolution/profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="4335b307-8d42-4998-9919-4b2fab4423fe">
+         uuid="be6371a7-860b-47d4-8461-ca9774c81e73">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:38.564-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:25.736-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:43.07-04:00</prop>
       <link rel="resolution-source" href="broken_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/...file-resolution/profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml b/...file-resolution/profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="0b28da85-3fc8-408a-be72-776e6daef07e">
+         uuid="e68f7c55-b933-4d60-b686-78b509651cd1">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:39.562-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:26.073-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:43.402-04:00</prop>
       <link rel="resolution-source" href="circular_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/...lution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml b/...lution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="d00264fa-ad4c-4189-8586-f9a14f504c4d">
+         uuid="a28036c1-810b-49af-b949-5b98eb821ff9">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:40.346-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:26.442-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:43.969-04:00</prop>
       <link rel="resolution-source" href="exclude-call-test_profile.xml"/>
    </metadata>
    <control id="a2">
       <title>Control A2</title>
-      <prop name="place">second</prop>
+      <prop name="place" value="second"/>
       <part name="statement" id="a2-stmt">
          <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
       </part>
@@ -21,61 +21,61 @@
       <param id="a3_prm1">
          <label>A3 Parameter 1</label>
       </param>
-      <prop name="place">third</prop>
+      <prop name="place" value="third"/>
       <part name="statement" id="a3-stmt">
          <p>A3 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="b2">
       <title>Control B2</title>
-      <prop name="place">second</prop>
+      <prop name="place" value="fifth"/>
       <part name="statement" id="b2-stmt">
          <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
       </part>
    </control>
    <control id="b3">
       <title>Control B3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="sixth"/>
       <part name="statement" id="b3-stmt">
          <p>B3 bbbb bbbbbbb bbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c2">
       <title>Control C2</title>
-      <prop name="place">second</prop>
+      <prop name="place" value="eighth"/>
       <part name="statement" id="c2-stmt">
          <p>C2 cccccccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
       <control id="c3.a">
          <title>Control C3-A</title>
-         <prop name="place">first</prop>
+         <prop name="place" value="tenth"/>
          <part name="statement" id="c3-stmt">
             <p>C3 A ccccc cccccccccccccc.</p>
          </part>
          <control id="c3.a-1">
             <title>Control C3-A-1</title>
-            <prop name="place">first</prop>
+            <prop name="place" value="eleventh"/>
             <part name="statement" id="c3-stmt">
                <p>C3 A-1 ccccc cccccccccccccc.</p>
             </part>

diff --git a/...ile-resolution/profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml b/...ile-resolution/profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml
@@ -1,52 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="dac1f2ff-33eb-42b8-a52b-e9cf2fe69c9a">
+         uuid="a8c658b5-f2ba-4cdb-a0ea-7534ea743306">
    <metadata>
       <title>Full test Profile</title>
       <last-modified>2020-05-30T14:39:41.149-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:26.739-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:44.234-04:00</prop>
       <link rel="resolution-source" href="full-test_profile.xml"/>
    </metadata>
-   <param id="param-A.a">
-      <label>A.a parameter</label>
-      <value>A.a value</value>
-   </param>
    <control id="a1">
       <title>Control A1</title>
       <param id="param-a1.a">
          <label>a1.a parameter</label>
          <value>a1.a value</value>
       </param>
-      <prop name="place">first</prop>
+      <prop name="place" value="1st"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
-         <p>Parameter A.a is set: <insert param-id="param-A.a"/>
+         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
          </p>
-         <p>Parameter a1.a is set: <insert param-id="param-a1.a"/>
+         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>
          </p>
          <p>Also, we <a href="#citation">refer to a citation</a>.</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="4th"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="7th"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
          <p>We cite a document with an anchor: <a href="#citation">... citation ...</a>.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="9th"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>

diff --git a/.../profile-resolution/profile-resolution-examples/output-expected/home_profile_RESOLVED.xml b/.../profile-resolution/profile-resolution-examples/output-expected/home_profile_RESOLVED.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="b50a02c5-93bd-4a04-ad94-bdefb6d25b7b">
+         uuid="51e884aa-2a76-4d5c-9d63-325a9456228a">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:41.965-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:27.01-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:44.53-04:00</prop>
       <link rel="resolution-source" href="home_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/...-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml b/...-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="d58e1752-077f-494e-9932-2686f11b5c24">
+         uuid="f472da18-dd63-49c2-a9c4-c759c489ccd1">
    <metadata>
       <title>Test Profile</title>
       <last-modified>2020-05-30T14:39:42.758-04:00</last-modified>
       <version>1.0</version>
-      <oscal-version>1.0.0-rc1</oscal-version>
-      <prop name="resolution-timestamp">2020-12-15T14:31:27.36-05:00</prop>
+      <oscal-version>1.0.0-rc2</oscal-version>
+      <prop name="resolution-timestamp">2021-04-06T13:56:44.883-04:00</prop>
       <link rel="resolution-source" href="import-twice_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
       <param id="a1_prm1">
          <label>A1 Parameter 1</label>
       </param>
-      <prop name="place">first</prop>
+      <prop name="place" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place">first</prop>
+      <prop name="place" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place">third</prop>
+      <prop name="place" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>