From e9de10b5fb0b5cc228743074119145d1bf266bc4 Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@nist.gov>
Date: Fri, 9 Sep 2022 09:30:02 -0400
Subject: [PATCH] Fixed errors in profile resolution top-level tests based on
 content errors.

---
 .gitignore                                               | 9 +++------
 .../catalogs/abc-full_catalog.xml                        | 4 ++--
 .../catalogs/abc-simple_catalog.xml                      | 4 ++--
 .../output-expected/base-test_profile_RESOLVED.xml       | 9 +++------
 .../exclude-call-test_profile_RESOLVED.xml               | 4 ++--
 .../include-all-no-children-test_profile_RESOLVED.xml    | 4 ++--
 .../include-all-test_profile_RESOLVED.xml                | 4 ++--
 .../include-call-with-children-test_profile_RESOLVED.xml | 4 ++--
 8 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b81a34a6f..d12a8f4df0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,12 +29,6 @@ target/
 /archive
 /roundtrip
 /svrl
-# Produced by bundler
-/docs/.bundle
-/docs/vendor
-# Produced in CircleCI build
-/.skipbuild
-/.runbuild
 # Generated by scripts
 .metaschema-cache
 # generated by Hugo
@@ -46,6 +40,7 @@ target/
 # generated by Hugo
 /docs/resources
 /docs/public
+/docs/.hugo_build.lock
 # generated by NodeJS
 /docs/node_modules
 # generated by /build/ci-cd/generate-specification-documentation.sh
@@ -58,3 +53,5 @@ node_modules/
 # Files build by CI/CD
 /docs/content/documentation/specification/processing/profile-resolution.html
 /docs/scratch-dir
+/.skipbuild
+/.runbuild
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
index c0ffe9ce3d..955838df22 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
@@ -107,13 +107,13 @@
          <control id="c3.a">
             <title>Control C3-A</title>
             <prop name="label" value="10th"/>
-            <part name="statement" id="c3-stmt">
+            <part name="statement" id="c3.a-stmt">
                <p>C3 A ccccc cccccccccccccc.</p>
             </part>
             <control id="c3.a-1">
                <title>Control C3-A-1</title>
                <prop name="label" value="11th"/>
-               <part name="statement" id="c3-stmt">
+               <part name="statement" id="c3.a-1-stmt">
                   <p>C3 A-1 ccccc cccccccccccccc.</p>
                </part>
             </control>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
index f27dc2cd95..f41d41f062 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
@@ -90,13 +90,13 @@
          <control id="c3.a">
             <title>Control C3-A</title>
             <prop name="label" value="tenth"/>
-            <part name="statement" id="c3-stmt">
+            <part name="statement" id="c3.a-stmt">
                <p>C3 A ccccc cccccccccccccc.</p>
             </part>
             <control id="c3.a-1">
                <title>Control C3-A-1</title>
                <prop name="label" value="eleventh"/>
-               <part name="statement" id="c3-stmt">
+               <part name="statement" id="c3.a-1-stmt">
                   <p>C3 A-1 ccccc cccccccccccccc.</p>
                </part>
             </control>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
index 3f2f9c65de..adbad28268 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
@@ -46,17 +46,14 @@
       <title>Control C3-A</title>
       <prop name="label"
          value="tenth" />
-      <part name="statement"
-         id="c3-stmt">
+      <part name="statement" id="c3.a-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">
+      <prop name="label" value="eleventh" />
+      <part name="statement" id="c3.a-1-stmt">
          <p>C3 A-1 ccccc cccccccccccccc.</p>
       </part>
    </control>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
index 5187371f20..6b00a7c98e 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
@@ -71,14 +71,14 @@
    <control id="c3.a">
       <title>Control C3-A</title>
       <prop name="label" value="tenth"/>
-      <part name="statement" id="c3-stmt">
+      <part name="statement" id="c3.a-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">
+      <part name="statement" id="c3.a-1-stmt">
          <p>C3 A-1 ccccc cccccccccccccc.</p>
       </part>
    </control>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml
index ed4ab1ea9d..a92c76e5a1 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml
@@ -98,14 +98,14 @@
    <control id="c3.a">
       <title>Control C3-A</title>
       <prop name="label" value="10th"/>
-      <part name="statement" id="c3-stmt">
+      <part name="statement" id="c3.a-stmt">
          <p>C3 A ccccc cccccccccccccc.</p>
       </part>
    </control>
    <control id="c3.a-1">
       <title>Control C3-A-1</title>
       <prop name="label" value="11th"/>
-      <part name="statement" id="c3-stmt">
+      <part name="statement" id="c3.a-1-stmt">
          <p>C3 A-1 ccccc cccccccccccccc.</p>
       </part>
    </control>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml
index 1467b2616e..ade04767d2 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml
@@ -105,13 +105,13 @@
 		   <control id="c3.a">
 		      <title>Control C3-A</title>
 		      <prop name="label" value="10th"/>
-		      <part name="statement" id="c3-stmt">
+		      <part name="statement" id="c3.a-stmt">
 		         <p>C3 A ccccc cccccccccccccc.</p>
 		      </part>
 			   <control id="c3.a-1">
 			      <title>Control C3-A-1</title>
 			      <prop name="label" value="11th"/>
-			      <part name="statement" id="c3-stmt">
+			      <part name="statement" id="c3.a-1-stmt">
 			         <p>C3 A-1 ccccc cccccccccccccc.</p>
 			      </part>
 			   </control>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
index a423fc51b1..1930894e2d 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
@@ -47,7 +47,7 @@
       <prop name="label"
          value="tenth" />
       <part name="statement"
-         id="c3-stmt">
+         id="c3.a-stmt">
          <p>C3 A ccccc cccccccccccccc.</p>
       </part>
    </control>
@@ -56,7 +56,7 @@
       <prop name="label"
          value="eleventh" />
       <part name="statement"
-         id="c3-stmt">
+         id="c3.a-1-stmt">
          <p>C3 A-1 ccccc cccccccccccccc.</p>
       </part>
    </control>