Updating profile resolution example tests to align with the current p…

…rofile resolution specification.
galtm · Jan 26, 2022 · 4a3cadf · 4a3cadf
1 parent 8503163
commit 4a3cadf
Show file tree

Hide file tree

Showing 21 changed files with 406 additions and 285 deletions.
diff --git a/...ecifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml b/...ecifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
@@ -30,19 +30,16 @@
             <label>a1.a parameter</label>
             <value>a1.a value</value>
          </param>
-         <prop name="place" value="1st"/>
+         <prop name="label" value="1st"/>
          <part name="statement" id="a1-stmt">
             <p>A1 aaaaa aaaaaaaaaa</p>
-            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
-            </p>
-            <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>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
          </part>
       </control>
       <control id="a2">
          <title>Control A2</title>
-         <prop name="place" value="2nd"/>
+         <prop name="label" value="2nd"/>
          <part name="statement" id="a2-stmt">
             <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
             <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
@@ -51,7 +48,7 @@
       </control>
       <control id="a3">
          <title>Control A3</title>
-         <prop name="place" value="3rd"/>
+         <prop name="label" value="3rd"/>
          <part name="statement" id="a3-stmt">
             <p>A3 aaaaa aaaaaaaaaa</p>
          </part>
@@ -61,21 +58,23 @@
       <title>Group B of C</title>
       <control id="b1">
          <title>Control B1</title>
-         <prop name="place" value="4th"/>
+         <prop name="label" value="4th"/>
          <part name="statement" id="b1-stmt">
             <p>B1 bbbb bbbbbbb.</p>
          </part>
       </control>
       <control id="b2">
          <title>Control B2</title>
-         <prop name="place" value="5th"/>
+         <prop name="label" value="5th"/>
+         <link rel="citation" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
          <part name="statement" id="b2-stmt">
             <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+            <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
          </part>
       </control>
       <control id="b3">
          <title>Control B3</title>
-         <prop name="place" value="6th"/>
+         <prop name="label" value="6th"/>
          <part name="statement" id="b3-stmt">
             <p>B3 bbbb bbbbbbb bbbb.</p>
          </part>
@@ -85,35 +84,35 @@
       <title>Group C of C</title>
       <control id="c1">
          <title>Control C1</title>
-         <prop name="place" value="7th"/>
+         <prop name="label" 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>
+            <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
          </part>
       </control>
       <control id="c2">
          <title>Control C2</title>
-         <prop name="place" value="8th"/>
+         <prop name="label" value="8th"/>
          <link rel="citation" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
          <part name="statement" id="c2-stmt">
             <p>C2 cccccccc ccccccccccccccccc.</p>
          </part>
       </control>
       <control id="c3">
          <title>Control C3</title>
-         <prop name="place" value="9th"/>
+         <prop name="label" value="9th"/>
          <part name="statement" id="c3-stmt">
             <p>C3 ccccc cccccccccccccc.</p>
          </part>
          <control id="c3.a">
             <title>Control C3-A</title>
-            <prop name="place" value="10th"/>
+            <prop name="label" value="10th"/>
             <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" value="11th"/>
+               <prop name="label" value="11th"/>
                <part name="statement" id="c3-stmt">
                   <p>C3 A-1 ccccc cccccccccccccc.</p>
                </part>
@@ -122,10 +121,21 @@
       </control>
    </group>
    <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
       <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
          <citation>
             <text>A citation to an out of line document.</text>
          </citation>
       </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
    </back-matter>
 </catalog>
diff --git a/...ifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml b/...ifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
@@ -18,14 +18,14 @@
          <param id="a1_prm1">
             <label>A1 Parameter 1</label>
          </param>
-         <prop name="place" value="first"/>
+         <prop name="label" value="first"/>
          <part name="statement" id="a1-stmt">
             <p>A1 aaaaa aaaaaaaaaa</p>
          </part>
       </control>
       <control id="a2">
          <title>Control A2</title>
-         <prop name="place" value="second"/>
+         <prop name="label" value="second"/>
          <part name="statement" id="a2-stmt">
             <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
          </part>
@@ -35,7 +35,7 @@
          <param id="a3_prm1">
             <label>A3 Parameter 1</label>
          </param>
-         <prop name="place" value="third"/>
+         <prop name="label" value="third"/>
          <part name="statement" id="a3-stmt">
             <p>A3 aaaaa aaaaaaaaaa</p>
          </part>
@@ -45,21 +45,21 @@
       <title>Group B of C</title>
       <control id="b1">
          <title>Control B1</title>
-         <prop name="place" value="fourth"/>
+         <prop name="label" 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" value="fifth"/>
+         <prop name="label" 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" value="sixth"/>
+         <prop name="label" value="sixth"/>
          <part name="statement" id="b3-stmt">
             <p>B3 bbbb bbbbbbb bbbb.</p>
          </part>
@@ -69,33 +69,33 @@
       <title>Group C of C</title>
       <control id="c1">
          <title>Control C1</title>
-         <prop name="place" value="seventh"/>
+         <prop name="label" 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" value="eighth"/>
+         <prop name="label" 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" value="ninth"/>
+         <prop name="label" 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" value="tenth"/>
+            <prop name="label" 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" value="eleventh"/>
+               <prop name="label" value="eleventh"/>
                <part name="statement" id="c3-stmt">
                   <p>C3 A-1 ccccc cccccccccccccc.</p>
                </part>

diff --git a/...pecifications/profile-resolution/profile-resolution-examples/include-all-test_profile.xml b/...pecifications/profile-resolution/profile-resolution-examples/include-all-test_profile.xml
@@ -12,4 +12,7 @@
    <import href="catalogs/abc-full_catalog.xml">
       <include-all/>
    </import>
+   <merge>
+      <as-is>true</as-is>
+   </merge>
 </profile>
diff --git a/...fications/profile-resolution/profile-resolution-examples/merge-keep-resources_profile.xml b/...fications/profile-resolution/profile-resolution-examples/merge-keep-resources_profile.xml
@@ -12,12 +12,12 @@
    <import href="#01ecd6cc-e281-472c-bb7a-0394bdf938f2">
       <include-controls>
          <with-id>a1</with-id>
-         <with-id>b1</with-id>
+         <with-id>b2</with-id>
       </include-controls>
    </import>
    <back-matter>
       <resource uuid="01ecd6cc-e281-472c-bb7a-0394bdf938f2">
-         <rlink href="catalogs/abc-simple_catalog.xml"/>
+         <rlink href="catalogs/abc-full_catalog.xml"/>
       </resource>
       <resource uuid="761205f0-fd61-42d3-9c66-2fb89e844a19">
          <title>Risk Management Framework for Information Systems and Organizations: A System Life Cycle Approach for Security and Privacy</title>

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
@@ -6,57 +6,55 @@
       <last-modified>2021-04-06T15:00:48.692-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="base-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" 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" value="first"/>
+      <prop name="label" 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" value="fourth"/>
+      <prop name="label" 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" value="seventh"/>
+      <prop name="label" 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"
+      <prop name="label"
          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"
-            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"
-               value="eleventh" />
-            <part name="statement"
-               id="c3-stmt">
-               <p>C3 A-1 ccccc cccccccccccccc.</p>
-            </part>
-         </control>
-      </control>
+   </control>
+   <control id="c3.a">
+      <title>Control C3-A</title>
+      <prop name="label"
+         value="tenth" />
+      <part name="statement"
+         id="c3-stmt">
+         <p>C3 A ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3.a-1">
+      <title>Control C3-A-1</title>
+      <prop name="label"
+         value="eleventh" />
+      <part name="statement"
+         id="c3-stmt">
+         <p>C3 A-1 ccccc cccccccccccccc.</p>
+      </part>
    </control>
 </catalog>
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
@@ -6,35 +6,33 @@
       <last-modified>2021-04-06T15:00:49.259-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="base2-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" 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" value="first"/>
+      <prop name="label" 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" value="fourth"/>
+      <prop name="label" 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" value="seventh"/>
+      <prop name="label" 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" value="ninth"/>
+      <prop name="label" 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
@@ -6,6 +6,7 @@
       <last-modified>2021-04-06T15:00:49.676-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="broken_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" 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
@@ -6,6 +6,7 @@
       <last-modified>2021-04-06T15:00:49.96-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="circular_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../circular_profile.xml"/>
    </metadata>
 </catalog>