From e277f1964bbd7a4ed4d55e7f806d8c1e2bdf541e Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@nist.gov>
Date: Wed, 26 Jan 2022 11:03:45 -0500
Subject: [PATCH] Updated the profile resolution test helper to allow for
 directly calling it and to normalize a few additional fields that are mutable
 between the expected and actual examples.

---
 .../oscal-profile-test-helper.xsl             | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl b/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl
index 27fa5d48b2..a423068823 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-test-helper.xsl
@@ -15,8 +15,8 @@
     
     -->
 
-    <xsl:output method="xml" indent="yes"/>
-
+    <xsl:output method="xml"/>
+    
     <xsl:strip-space
         elements="catalog metadata param control group back-matter prop link part usage constraint guideline select remarks description test revisions revision role location party responsible-party address external-id resource citation rlink base64"/>
 
@@ -32,7 +32,13 @@
         
         
     -->
-    
+    <xsl:template match="/">
+        <xsl:param name="source" select="." as="document-node()"/>
+        <xsl:document>
+          <xsl:apply-templates select="$source" mode="scrubbing"/>
+        </xsl:document>
+    </xsl:template>
+
     <xsl:function name="opr:scrub" as="document-node()">
         <xsl:param name="n" as="node()"/>
         <xsl:document>
@@ -54,7 +60,15 @@
             <xsl:next-match/>
         </xsl:if>
     </xsl:template>
-    
+
+    <xsl:template mode="scrubbing" match="catalog/metadata/prop[@name='resolution-tool']/@value">
+        <xsl:attribute name="value">...</xsl:attribute>
+    </xsl:template>
+
+    <xsl:template mode="scrubbing" match="catalog/metadata/link[@rel='source-profile']/@href">
+        <xsl:attribute name="href">...</xsl:attribute>
+    </xsl:template>
+
     <xsl:template mode="scrubbing" match="last-modified">
         <xsl:copy>...</xsl:copy>
     </xsl:template>