From c1770d39ff26bd0f7e808ebc94ae222ec3181aa0 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Fri, 13 Oct 2023 11:31:41 -0400
Subject: [PATCH] expand-sequence: Update tests for recent changes

This should have been part of a previous commit.  So few parts of the system
utilize tests that I didn't notice that this was failing until after the
commit, since I'm not used to running them...even though I wrote them.

This system is being replaced with TAMER, so these changes largely just get
the tests working properly again.

DEV-15095
---
 test/preproc/expand/expand-sequence-test.xsl |  5 +++--
 test/preproc/expand/expand-sequence.xspec    | 22 ++++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/test/preproc/expand/expand-sequence-test.xsl b/test/preproc/expand/expand-sequence-test.xsl
index e5617515..49079c71 100644
--- a/test/preproc/expand/expand-sequence-test.xsl
+++ b/test/preproc/expand/expand-sequence-test.xsl
@@ -46,8 +46,8 @@
 
   <variable name="foo:expanded" as="element( foo:seq )">
     <foo:seq foo="baz">
-      <sequence select="eseq:expand-node( $foo:a/foo:node[1] ),
-                        eseq:expand-node( $foo:a/foo:node[2] )" />
+      <sequence select="eseq:expand-node( (), $foo:a/foo:node[1] ),
+                        eseq:expand-node( (), $foo:a/foo:node[2] )" />
     </foo:seq>
   </variable>
 
@@ -71,6 +71,7 @@
 
   <function name="eseq:expand-node" as="node()*"
             override="yes">
+    <param name="context" />
     <param name="node" as="node()" />
 
     <choose>
diff --git a/test/preproc/expand/expand-sequence.xspec b/test/preproc/expand/expand-sequence.xspec
index b462ec39..0fb7e818 100644
--- a/test/preproc/expand/expand-sequence.xspec
+++ b/test/preproc/expand/expand-sequence.xspec
@@ -32,6 +32,8 @@
   <scenario label="Pass on an expansion sequence">
     <scenario label="with an empty sequence">
       <call function="eseq:expand-step">
+        <param name="context"
+               select="()" />
         <param name="eseq"
                select="$foo:empty-eseq" />
       </call>
@@ -43,6 +45,8 @@
 
     <scenario label="with no sequence">
       <call function="eseq:expand-step">
+        <param name="context"
+               select="()" />
         <param name="eseq"
                select="()" />
       </call>
@@ -54,6 +58,8 @@
 
     <scenario label="with an expansion element">
       <call function="eseq:expand-step">
+        <param name="context"
+               select="()" />
         <param name="eseq"
                select="$foo:a" />
       </call>
@@ -73,9 +79,12 @@
     <scenario label="with an expanded node">
       <!-- notice the additional expand-step calls -->
       <call function="eseq:expand-step">
+        <param name="context"
+               select="()" />
         <param name="eseq"
                select="eseq:expand-step(
-                         eseq:expand-step( $foo:a ) )" />
+                         (),
+                         eseq:expand-step( (), $foo:a ) )" />
       </call>
 
       <expect label="hoists expanded element out of sequence"
@@ -92,9 +101,12 @@
     <scenario label="with nodes still pending expansion">
       <!-- notice the additional expand-step calls -->
       <call function="eseq:expand-step">
+        <param name="context"
+               select="()" />
         <param name="eseq"
                select="eseq:expand-step(
-                         eseq:expand-step( $foo:unexpandable ) )" />
+                         (),
+                         eseq:expand-step( (), $foo:unexpandable ) )" />
       </call>
 
       <!-- if this fails, then our is-expanded predicate is not being
@@ -107,9 +119,11 @@
 
   <scenario label="Pass on expansion sequence with hoisted node">
     <variable name="foo:hoisted"
-      select="eseq:expand-step( $foo:expanded )" />
+      select="eseq:expand-step( (), $foo:expanded )" />
 
     <call function="eseq:expand-step">
+      <param name="context"
+             select="()" />
       <param name="eseq"
              select="$foo:hoisted" />
     </call>
@@ -128,6 +142,6 @@
                   and not( $x:result[3]/node() )" />
 
     <expect label="final pass eliminates empty expansion sequence"
-            test="not( eseq:expand-step( $x:result )/foo:seq )" />
+            test="not( eseq:expand-step( (), $x:result )/foo:seq )" />
   </scenario>
 </description>