From e8b1b755d65b96cc12f6861fbf8999fa0c4b133a Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Fri, 27 Aug 2021 16:23:04 -0400
Subject: [PATCH] Repairing bug report on missed control; adding test files
 (#1013)

---
 src/utils/schematron/catalog.xml       | 20 ++++++++++++++++++
 src/utils/schematron/oscal-profile.sch |  2 +-
 src/utils/schematron/test-profile.xml  | 29 ++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/schematron/catalog.xml
 create mode 100644 src/utils/schematron/test-profile.xml

diff --git a/src/utils/schematron/catalog.xml b/src/utils/schematron/catalog.xml
new file mode 100644
index 0000000000..98294994fd
--- /dev/null
+++ b/src/utils/schematron/catalog.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         uuid="6c303ebb-4a36-4534-8d7f-dd91644b1d53">
+   <metadata>
+      <title>Catalog</title>
+      <last-modified>2021-06-21T15:48:23.851-04:00</last-modified>
+      <version>0/1</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <param id="p2"/>
+   <control id="a1">
+      <title>Control A1</title>
+   </control>
+   <control id="a2">
+      <title>Control A1</title>
+   </control>
+   <control id="a3">
+      <title>Control A1</title>
+   </control>
+</catalog>
diff --git a/src/utils/schematron/oscal-profile.sch b/src/utils/schematron/oscal-profile.sch
index 719d923e5f..b0d227b7ab 100644
--- a/src/utils/schematron/oscal-profile.sch
+++ b/src/utils/schematron/oscal-profile.sch
@@ -40,7 +40,7 @@
       <sch:let name="importing" value="oscal:get-import(../parent::oscal:import)"/>
       <sch:let name="not-a-catalog" value="empty($importing/oscal:catalog)"/>
       
-      <sch:assert test="$not-a-catalog or (string(.) = $importing//oscal:control/@id)">No control found with @id='<sch:value-of select="@control-id"/>'</sch:assert>
+      <sch:assert test="$not-a-catalog or (string(.) = $importing//oscal:control/@id)">No control found with @id='<sch:value-of select="string(.)"/>'</sch:assert>
       
       <sch:assert test="count(key('control-call-by-id', string())) = 1">Control (<sch:value-of select="string(.)"/>) should not be referenced (either imported or excluded) more than once.</sch:assert>
       <!--<sch:assert test="empty(key('call-by-id', string(), ..) except key('call-by-id', string(), ..) )">Control (<sch:value-of select="."/>) should not be both included and excluded, or invoked more than once.</sch:assert>-->
diff --git a/src/utils/schematron/test-profile.xml b/src/utils/schematron/test-profile.xml
new file mode 100644
index 0000000000..a65e672c26
--- /dev/null
+++ b/src/utils/schematron/test-profile.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="oscal-profile.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<profile xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/1.0 https://raw.githubusercontent.com/usnistgov/OSCAL/v1.0.0/xml/schema/oscal_profile_schema.xsd"
+         uuid="7bb79729-781a-4034-85ef-a5c5c17d9daa">
+   <metadata>
+      <title/>
+      <last-modified>2021-08-23T17:19:41.79-04:00</last-modified>
+      <version>0.1</version>
+      <oscal-version>1.0.0</oscal-version>
+   </metadata>
+   <import href="#a1c12452-39a8-49ec-a4dc-549955270ba6">
+      <include-all/>
+      <exclude-controls>
+         <with-id>a1</with-id>
+         <with-id>a2</with-id>
+      </exclude-controls>
+   </import>
+   <modify>
+      <set-parameter param-id="p2"/>
+      <alter control-id="p2"/>
+   </modify>
+   <back-matter>
+      <resource uuid="a1c12452-39a8-49ec-a4dc-549955270ba6">
+         <rlink href="catalog.xml"/>
+      </resource>
+   </back-matter>
+</profile>