[fix] isolate preexisting xq specs

duncdrum · duncdrum · commit 4a20e5f8db27 · 2026-02-05T19:28:23.000+01:00
so they no longer depend on state from xml testset
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/analyzers.xql b/extensions/indexes/lucene/src/test/xquery/lucene/analyzers.xql
@@ -53,6 +53,7 @@ declare variable $analyze:XCONF2 :=
 declare
     %test:setUp
 function analyze:setup() {
+    let $_ := (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db"))
     let $testCol := xmldb:create-collection("/db", "lucenetest")
     let $testCol1 := xmldb:create-collection("/db/lucenetest", "test1")
     let $testCol2 := xmldb:create-collection("/db/lucenetest", "test2")
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/facets.xql b/extensions/indexes/lucene/src/test/xquery/lucene/facets.xql
@@ -285,6 +285,7 @@ declare variable $facet:XCONF1 :=
 declare
     %test:setUp
 function facet:setup() {
+    let $_ := (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db"))
     let $testCol := xmldb:create-collection("/db", "lucenetest")
     let $personsCol := xmldb:create-collection("/db/lucenetest", "persons")
     let $confCol := xmldb:create-collection("/db/system/config/db", "lucenetest")
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/ft-match.xql b/extensions/indexes/lucene/src/test/xquery/lucene/ft-match.xql
@@ -54,6 +54,7 @@ declare variable $ftt:COLLECTION := "/db/" || $ftt:COLLECTION_NAME;
 declare
     %test:setUp
 function ftt:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $ftt:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $ftt:COLLECTION_NAME, "collection.xconf", $ftt:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $ftt:COLLECTION_NAME),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/inline-ignore.xql b/extensions/indexes/lucene/src/test/xquery/lucene/inline-ignore.xql
@@ -87,7 +87,9 @@ declare variable $inlg:EXPECTED_IGNORED_MATCH as element(p) :=
 declare
     %test:setUp
 function inlg:setUp() {
-    ( xmldb:create-collection("/db", $inlg:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $inlg:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $inlg:COLLECTION_NAME),
       xmldb:store("/db/system/config/db/" || $inlg:COLLECTION_NAME, "collection.xconf", $inlg:XCONF),
       xmldb:store($inlg:COLLECTION, "text.xml", $inlg:XML),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/inline_elements.xql b/extensions/indexes/lucene/src/test/xquery/lucene/inline_elements.xql
@@ -50,6 +50,7 @@ declare variable $fti:COLLECTION := "/db/" || $fti:COLLECTION_NAME;
 declare
 %test:setUp
 function fti:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $fti:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $fti:COLLECTION_NAME, "collection.xconf", $fti:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $fti:COLLECTION_NAME),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/match-highlighting.xql b/extensions/indexes/lucene/src/test/xquery/lucene/match-highlighting.xql
@@ -76,7 +76,9 @@ declare variable $mhlt:EXPECTED_NONE as element(el) :=
 declare
     %test:setUp
 function mhlt:setUp() {
-    ( xmldb:create-collection("/db", $mhlt:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $mhlt:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $mhlt:COLLECTION_NAME),
       xmldb:store("/db/system/config/db/" || $mhlt:COLLECTION_NAME, "collection.xconf", $mhlt:XCONF),
       xmldb:store($mhlt:COLLECTION, "test.xml", $mhlt:XML),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/optimizer-ft.xql b/extensions/indexes/lucene/src/test/xquery/lucene/optimizer-ft.xql
@@ -76,6 +76,7 @@ declare variable $fto:COLLECTION := "/db/" || $fto:COLLECTION_NAME;
 declare
     %test:setUp
 function fto:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $fto:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $fto:COLLECTION_NAME, "collection.xconf", $fto:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $fto:COLLECTION_NAME),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/parenthesized-context.xql b/extensions/indexes/lucene/src/test/xquery/lucene/parenthesized-context.xql
@@ -109,7 +109,9 @@ function pctx:term-callback($term as xs:string, $data as xs:int+) as element(ter
 declare
     %test:setUp
 function pctx:setUp() {
-    ( xmldb:create-collection("/db", $pctx:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $pctx:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $pctx:COLLECTION_NAME),
       xmldb:store("/db/system/config/db/" || $pctx:COLLECTION_NAME, "collection.xconf", $pctx:XCONF),
       xmldb:store($pctx:COLLECTION, "test.xml", $pctx:XML),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/parenthesized-location-step.xql b/extensions/indexes/lucene/src/test/xquery/lucene/parenthesized-location-step.xql
@@ -101,7 +101,9 @@ declare variable $plst:EXPECTED_ATTR_RESULT as element(result)+ := (
 declare
     %test:setUp
 function plst:setUp() {
-    ( xmldb:create-collection("/db", $plst:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $plst:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $plst:COLLECTION_NAME),
       xmldb:store("/db/system/config/db/" || $plst:COLLECTION_NAME, "collection.xconf", $plst:XCONF),
       xmldb:store($plst:COLLECTION, "test.xml", $plst:XML),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/plain-ft-functions.xql b/extensions/indexes/lucene/src/test/xquery/lucene/plain-ft-functions.xql
@@ -48,7 +48,8 @@ declare variable $pftf:COLLECTION_BINARY := "/db/binary";
 declare
     %test:setUp
 function pftf:setUp() {
-    ( xmldb:create-collection("/db/system/config", "db"),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
       xmldb:store("/db/system/config/db", "collection.xconf", $pftf:XCONF),
       xmldb:create-collection("/db", "binary"),
       xmldb:store($pftf:COLLECTION_BINARY, "data1.txt", "AAAAAA", "text/plain"),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/query-field.xql b/extensions/indexes/lucene/src/test/xquery/lucene/query-field.xql
@@ -44,6 +44,7 @@ declare variable $qf:XML  as document-node() :=
         </test>
      };
 
+declare variable $qf:_ := (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db"));
 declare variable $qf:testCol := xmldb:create-collection("/db", "queryfieldtest");
 declare variable $qf:confCol := xmldb:create-collection("/db/system/config/db", "queryfieldtest");
 
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/start-offset.xql b/extensions/indexes/lucene/src/test/xquery/lucene/start-offset.xql
@@ -57,7 +57,9 @@ declare variable $stof:COLLECTION := "/db/" || $stof:COLLECTION_NAME;
 declare
     %test:setUp
 function stof:setUp() {
-    ( xmldb:create-collection("/db", $stof:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $stof:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $stof:COLLECTION_NAME),
       xmldb:store("/db/system/config/db/" || $stof:COLLECTION_NAME, "collection.xconf", $stof:XCONF),
       xmldb:store($stof:COLLECTION, "test1.xml", document { <test><a><b>word</b></a><el>strong string</el></test> }),
diff --git a/extensions/indexes/lucene/src/test/xquery/lucene/unicode-supplementary-lucene.xql b/extensions/indexes/lucene/src/test/xquery/lucene/unicode-supplementary-lucene.xql
@@ -102,7 +102,9 @@ declare variable $unic-smp-l:COLLECTION := "/db/" || $unic-smp-l:COLLECTION_NAME
 declare
     %test:setUp
 function unic-smp-l:setup() {
-    ( xmldb:create-collection("/db", $unic-smp-l:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $unic-smp-l:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $unic-smp-l:COLLECTION_NAME),
       xmldb:store("/db/system/config/db/" || $unic-smp-l:COLLECTION_NAME, "collection.xconf", $unic-smp-l:xconf),
       xmldb:store($unic-smp-l:COLLECTION, "test.xml", $unic-smp-l:XML),
diff --git a/extensions/indexes/ngram/src/test/xquery/ngram/unicode-supplementary-ngram.xql b/extensions/indexes/ngram/src/test/xquery/ngram/unicode-supplementary-ngram.xql
@@ -103,7 +103,9 @@ declare variable $unic-smp-n:COLLECTION := "/db/" || $unic-smp-n:COLLECTION_NAME
 declare
     %test:setUp
 function unic-smp-n:setup() {
-    ( xmldb:create-collection("/db", $unic-smp-n:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $unic-smp-n:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $unic-smp-n:COLLECTION_NAME),
       xmldb:store($unic-smp-n:COLLECTION, "test.xml", $unic-smp-n:XML),
       xmldb:store("/db/system/config/db/" || $unic-smp-n:COLLECTION_NAME, "collection.xconf", $unic-smp-n:xconf),
diff --git a/extensions/indexes/range/src/test/xquery/range/conditions.xql b/extensions/indexes/range/src/test/xquery/range/conditions.xql
@@ -200,6 +200,7 @@ declare variable $ct:COLLECTION := "/db/" || $ct:COLLECTION_NAME;
 declare
 %test:setUp
 function ct:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $ct:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $ct:COLLECTION_NAME, "collection.xconf", $ct:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $ct:COLLECTION_NAME),
diff --git a/extensions/indexes/range/src/test/xquery/range/field-type.xql b/extensions/indexes/range/src/test/xquery/range/field-type.xql
@@ -60,6 +60,7 @@ declare variable $rt:NON_INDEXED_COLLECTION := "/db/" || $rt:NON_INDEXED_COLLECT
 declare
     %test:setUp
 function rt:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $rt:INDEXED_COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $rt:INDEXED_COLLECTION_NAME, "collection.xconf", $rt:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $rt:INDEXED_COLLECTION_NAME),
diff --git a/extensions/indexes/range/src/test/xquery/range/fields.xql b/extensions/indexes/range/src/test/xquery/range/fields.xql
@@ -84,6 +84,7 @@ declare variable $rt:COLLECTION := "/db/" || $rt:COLLECTION_NAME;
 declare
     %test:setUp
 function rt:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $rt:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $rt:COLLECTION_NAME, "collection.xconf", $rt:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $rt:COLLECTION_NAME),
diff --git a/extensions/indexes/range/src/test/xquery/range/index-keys.xql b/extensions/indexes/range/src/test/xquery/range/index-keys.xql
@@ -77,6 +77,7 @@ declare variable $rtik:COLLECTION := "/db/" || $rtik:COLLECTION_NAME;
 declare
 %test:setUp
 function rtik:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $rtik:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $rtik:COLLECTION_NAME, "collection.xconf", $rtik:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $rtik:COLLECTION_NAME),
diff --git a/extensions/indexes/range/src/test/xquery/range/optimizer.xql b/extensions/indexes/range/src/test/xquery/range/optimizer.xql
@@ -162,6 +162,7 @@ declare variable $ot:COLLECTION := "/db/" || $ot:COLLECTION_NAME;
 declare
     %test:setUp
 function ot:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $ot:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $ot:COLLECTION_NAME, "collection.xconf", $ot:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $ot:COLLECTION_NAME),
diff --git a/extensions/indexes/range/src/test/xquery/range/range.xql b/extensions/indexes/range/src/test/xquery/range/range.xql
@@ -107,6 +107,7 @@ declare variable $rt:DATA2 :=
 declare
     %test:setUp
 function rt:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", "rangetest"),
     xmldb:store("/db/system/config/db/rangetest", "collection.xconf", $rt:COLLECTION_CONFIG),
     xmldb:create-collection("/db", "rangetest"),
diff --git a/extensions/indexes/range/src/test/xquery/range/types.xql b/extensions/indexes/range/src/test/xquery/range/types.xql
@@ -109,6 +109,7 @@ declare variable $tt:COLLECTION := "/db/" || $tt:COLLECTION_NAME;
 declare
     %test:setUp
 function tt:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", $tt:COLLECTION_NAME),
     xmldb:store("/db/system/config/db/" || $tt:COLLECTION_NAME, "collection.xconf", $tt:COLLECTION_CONFIG),
     xmldb:create-collection("/db", $tt:COLLECTION_NAME),
diff --git a/extensions/indexes/range/src/test/xquery/range/unicode-supplementary-range.xql b/extensions/indexes/range/src/test/xquery/range/unicode-supplementary-range.xql
@@ -103,7 +103,9 @@ declare variable $unic-smp-r:COLLECTION := "/db/" || $unic-smp-r:COLLECTION_NAME
 declare
     %test:setUp
 function unic-smp-r:setup() {
-    ( xmldb:create-collection("/db", $unic-smp-r:COLLECTION_NAME),
+    ( xmldb:create-collection("/db/system", "config"),
+      xmldb:create-collection("/db/system/config", "db"),
+      xmldb:create-collection("/db", $unic-smp-r:COLLECTION_NAME),
       xmldb:create-collection("/db/system/config/db", $unic-smp-r:COLLECTION_NAME),
       xmldb:store($unic-smp-r:COLLECTION, "test.xml", $unic-smp-r:XML),
       xmldb:store("/db/system/config/db/" || $unic-smp-r:COLLECTION_NAME, "collection.xconf", $unic-smp-r:xconf),
diff --git a/extensions/indexes/range/src/test/xquery/range/updates.xql b/extensions/indexes/range/src/test/xquery/range/updates.xql
@@ -87,6 +87,7 @@ declare variable $rt:DATA :=
 declare
     %test:setUp
 function rt:setup() {
+    (xmldb:create-collection("/db/system", "config"), xmldb:create-collection("/db/system/config", "db")),
     xmldb:create-collection("/db/system/config/db", "rangetest"),
     xmldb:store("/db/system/config/db/rangetest", "collection.xconf", $rt:COLLECTION_CONFIG),
     xmldb:create-collection("/db", "rangetest"),
