From 009e981e21f418dc140a07849bbfb46aeacd1689 Mon Sep 17 00:00:00 2001
From: galtm <40716346+galtm@users.noreply.github.com>
Date: Thu, 22 Feb 2024 08:27:58 -0500
Subject: [PATCH 1/4] Updates to accommodate CI/CD

Imitate changes in xslt3-functions PR#7.

- CI/CD puts compiled XSpec file somewhere else, so define
  ov:service variable more robustly so that uuid-value.txt
  will be found regardless of where compiled XSpec file is.

- Java UUID class is not found in CI/CD, so conditionalize
  tests that use it. Running XSpec in Oxygen finds the class
  and verifies its results (same as before this change).
---
 .../2_metadata/uuid-method-choice.xspec       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/utils/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec b/src/utils/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec
index f1a5f6b8e3..0c409a7ade 100644
--- a/src/utils/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec
+++ b/src/utils/resolver-pipeline/testing/2_metadata/uuid-method-choice.xspec
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:javaUUID="java.util.UUID"
     xmlns:ov="http://csrc.nist.gov/ns/oscal/xspec/variable"
     xmlns:u="http://csrc.nist.gov/ns/uuid"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -8,7 +9,7 @@
     <x:scenario label="Tests for u:determine-uuid template">
         <x:variable name="ov:fixed" as="xs:string" select="'00000000-0000-4000-B000-000000000000'"/>
         <x:variable name="ov:specified" as="xs:string" select="'f0ad1e6c-5de5-44cd-b92e-a4c507805f0f'"/>
-        <x:variable name="ov:service" as="xs:string" select="resolve-uri('../uuid-value.txt')"/>
+        <x:variable name="ov:service" as="xs:string" select="resolve-uri('uuid-value.txt',$x:xspec-uri)"/>
         <x:scenario label="Valid user-provided UUID">
             <x:call template="u:determine-uuid">
                 <x:param name="top-uuid" select="$ov:specified"/>
@@ -37,16 +38,22 @@
             <x:expect label="UUID is neither fixed one nor specified one"
                 test="$x:result ne $ov:specified and $x:result ne $ov:fixed"/>
         </x:scenario>
-        <x:scenario label="Random UUID using Java">
+        <x:scenario label="Random UUID using Java (Note: Not available in CI/CD)">
             <x:call template="u:determine-uuid">
                 <x:param name="top-uuid" select="$ov:specified"/>
                 <x:param name="uuid-method" select="'random-java'"/>
             </x:call>
-            <x:expect label="Nonempty string"
-                test="$x:result instance of xs:string and $x:result != ''"/>
+            <x:variable name="ov:java-fcn-available" as="xs:boolean"
+                select="function-available('javaUUID:randomUUID')"/>
+            <x:expect label="Nonempty"
+                test="if ($ov:java-fcn-available)
+                then (string($x:result) != '')
+                else true()"/>
             <x:expect label="UUID is neither fixed one nor specified one"
-                test="$x:result ne $ov:specified and $x:result ne $ov:fixed"/>
-        </x:scenario>
+                test="if ($ov:java-fcn-available)
+                then (string($x:result) ne $ov:specified and string($x:result) ne $ov:fixed)
+                else true()"/>
+            </x:scenario>
         <!-- FYI: Because the transform relies on use-when, which is evaluated at
             compile time, the same test invocation cannot check both
             when the XSLT and Java random number generators are available

From a1fd469953ce49d339d567ce04dffe0405ec2761 Mon Sep 17 00:00:00 2001
From: galtm <40716346+galtm@users.noreply.github.com>
Date: Fri, 23 Feb 2024 08:45:13 -0500
Subject: [PATCH 2/4] CI/CD-friendly URIs to new location

- 2nd argument of resolve-uri makes the path relative to the original XSpec file instead of the compiled one, whose location can vary depending on how the test is run

- Remove one ../ from URI to resolve (similar to #1945) because of directory reorg
---
 .../testing/1_selected/select-mapping-controls.xspec          | 4 ++--
 .../resolver-pipeline/testing/1_selected/select-rlink.xspec   | 4 ++--
 src/utils/resolver-pipeline/testing/1_selected/select.xspec   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/utils/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec b/src/utils/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec
index 950e4a241f..b46425d0b0 100644
--- a/src/utils/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec
+++ b/src/utils/resolver-pipeline/testing/1_selected/select-mapping-controls.xspec
@@ -23,8 +23,8 @@
         https://github.com/usnistgov/OSCAL/discussions/1114
         When this is determined, tests can be added for those sections. -->
 
-    <!-- Location of sample files, relative to compiled test in xspec/ subdirectory -->
-    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../../../specifications/profile-resolution/profile-resolution-examples')"/>
+    <!-- Location of sample files, relative to this test file -->
+    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../specifications/profile-resolution/profile-resolution-examples',$x:xspec-uri)"/>
 
     <x:scenario label="Import controls using ID mapping">
         <x:scenario label="Basic case" pending="Mapping is not implemented yet">
diff --git a/src/utils/resolver-pipeline/testing/1_selected/select-rlink.xspec b/src/utils/resolver-pipeline/testing/1_selected/select-rlink.xspec
index cb70e55295..7569f39e35 100644
--- a/src/utils/resolver-pipeline/testing/1_selected/select-rlink.xspec
+++ b/src/utils/resolver-pipeline/testing/1_selected/select-rlink.xspec
@@ -6,8 +6,8 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     stylesheet="../../oscal-profile-resolve-select.xsl">
     
-    <!-- Location of sample files, relative to compiled test in xspec/ subdirectory -->
-    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../../../specifications/profile-resolution/profile-resolution-examples')"/>
+    <!-- Location of sample files, relative to this test file -->
+    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../specifications/profile-resolution/profile-resolution-examples',$x:xspec-uri)"/>
 
     <x:scenario label="Direct import by file href">
         <x:context>
diff --git a/src/utils/resolver-pipeline/testing/1_selected/select.xspec b/src/utils/resolver-pipeline/testing/1_selected/select.xspec
index f05ee727cb..46c015c689 100644
--- a/src/utils/resolver-pipeline/testing/1_selected/select.xspec
+++ b/src/utils/resolver-pipeline/testing/1_selected/select.xspec
@@ -8,8 +8,8 @@
     stylesheet="../../oscal-profile-resolve-select.xsl"
     xslt-version="3.0">
 
-    <!-- Location of sample files, relative to compiled test in xspec/ subdirectory -->
-    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../../../specifications/profile-resolution/profile-resolution-examples')"/>
+    <!-- Location of sample files, relative to this test file -->
+    <x:variable name="ov:filedir" as="xs:string" select="resolve-uri('../../../../specifications/profile-resolution/profile-resolution-examples',$x:xspec-uri)"/>
 
     <x:variable name="ov:unique" as="function(*)"
         select="function($seq as xs:string*) as xs:boolean {

From 77eae4d95ceee6ecabcaf36f1fd63f80b126302f Mon Sep 17 00:00:00 2001
From: galtm <40716346+galtm@users.noreply.github.com>
Date: Fri, 23 Feb 2024 08:49:58 -0500
Subject: [PATCH 3/4] Mark include-controls w/ parent scenario pending

Temporary change until it's clear whether this feature
is supported and what its expected result should be.
---
 .../resolver-pipeline/testing/3_merged/merge-custom.xspec      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/resolver-pipeline/testing/3_merged/merge-custom.xspec b/src/utils/resolver-pipeline/testing/3_merged/merge-custom.xspec
index 4cf7ba997a..54e1179211 100644
--- a/src/utils/resolver-pipeline/testing/3_merged/merge-custom.xspec
+++ b/src/utils/resolver-pipeline/testing/3_merged/merge-custom.xspec
@@ -574,7 +574,8 @@
                 </control>
             </x:expect>
         </x:scenario>
-        <x:scenario label="include-controls with parent controls (default choice)">
+        <x:scenario label="include-controls with parent controls (default choice)"
+          pending="Needs confirmation about latest expected result">
             <x:context mode="o:custom-merge" select="//o:include-controls">
                 <catalog uuid="xyz-tiny_catalog">
                     <selection>

From 7e7f140c84f8e75c417b0703858d70681d786d3e Mon Sep 17 00:00:00 2001
From: galtm <40716346+galtm@users.noreply.github.com>
Date: Fri, 23 Feb 2024 08:49:06 -0500
Subject: [PATCH 4/4] Rewrite id() usage

`select="id('a1-stmt')"` works in Oxygen but not xspec.bat or CI/CD. Expressing that select attribute a different way.

Also, I fixed a select attribute where the namespace prefix
was missing. The omission caused the test to pass for the wrong
reason (empty context).
---
 src/utils/resolver-pipeline/testing/4_modified/modify.xspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/resolver-pipeline/testing/4_modified/modify.xspec b/src/utils/resolver-pipeline/testing/4_modified/modify.xspec
index 40eb7e3026..5a0546a739 100644
--- a/src/utils/resolver-pipeline/testing/4_modified/modify.xspec
+++ b/src/utils/resolver-pipeline/testing/4_modified/modify.xspec
@@ -300,7 +300,7 @@
         
     <x:scenario label="Tests for match=set-parameter template">
         <x:scenario label="set-param child does not match anything">
-            <x:context select="//set-parameter">
+            <x:context select="//o:set-parameter">
                 <catalog id="abc">
                     <param id="p1">
                         <label>Parameter #1</label>
@@ -1158,7 +1158,7 @@
         </x:scenario>
         <x:scenario label="Edge case: Empty $modifications param">
             <x:call function="oscal:patches-to-id-targeting-ancestor">
-                <x:param name="here" select="id('a1-stmt')">
+                <x:param name="here" select="//*[@id='a1-stmt']">
                     <catalog id="abc">
                         <control id="a1">
                             <title>Control A</title>