[test] fix XQsuite tests that use an absolute XPath

Since all XQuery tests are functions, absolute XPaths cannot
be used.

Author: line-o

exist-core/src/test/xquery/xquery3/bang.xql

@@ -164,9 +164,9 @@ function bang:constructor() {
 };
 
 declare
-    %test:assertTrue
+    %test:assertEquals("a", "b", "c")
 function bang:implicit-context() {
-    count(//* ! local-name(.))
+    document { <a><b/><c/></a> } ! //* ! local-name(.)
 };
 
 declare

extensions/indexes/range/src/test/xquery/range/optimizer.xql

@@ -690,7 +690,7 @@ declare
     %test:args("Млатишума")
     %test:assertEquals(2)
 function ot:eq-string-collation-with-diacritics($name) {
-    count(//tei:form[tei:orth = $name])
+    count(collection($ot:COLLECTION)//tei:form[tei:orth = $name])
 };
 
 declare
@@ -699,7 +699,7 @@ declare
     %test:args("Млатишума")
     %test:assertError("range:EXXQDYFT0001")
 function ot:contains-string-collation-with-diacritics($name) {
-    count(//tei:form[contains(tei:orth, $name)])
+    count(collection($ot:COLLECTION)//tei:form[contains(tei:orth, $name)])
 };
 
 declare
@@ -708,7 +708,7 @@ declare
     %test:args("Млатишума")
     %test:assertEquals(0)
 function ot:ne-string-collation-with-diacritics($name) {
-    count(//tei:form[tei:orth != $name])
+    count(collection($ot:COLLECTION)//tei:form[tei:orth != $name])
 };
 
 (:~ See XPath general comparison optimisation bug #2786 :)

extensions/indexes/range/src/test/xquery/range/range.xql

@@ -127,7 +127,7 @@ declare
     %test:args("Berta Muh")
     %test:assertEquals("Almweide")
 function rt:equality-string($name as xs:string) {
-    //address[range:eq(name, $name)]/city/text()
+    collection("/db/rangetest")//address[range:eq(name, $name)]/city/text()
 };
 
 declare
@@ -136,22 +136,22 @@ declare
     %test:args("Berta Muh")
     %test:assertEquals("Berta Muh")
 function rt:equality-string-self($name as xs:string) {
-    normalize-space(//address/name[range:eq(., $name)]/text())
+    normalize-space(collection("/db/rangetest")//address/name[range:eq(., $name)]/text())
 };
 
 declare
     %test:args(65428)
     %test:assertEquals("Rüsselsheim", "Rüsselsheim")
 function rt:equality-int-attribute($code as xs:integer) {
-    //address/city[range:eq(@code, $code)]/text(),
-    //address[range:eq(city/@code, $code)]/city/text()
+    collection("/db/rangetest")//address/city[range:eq(@code, $code)]/text(),
+    collection("/db/rangetest")//address[range:eq(city/@code, $code)]/city/text()
 };
 
 declare
     %test:args("muh")
     %test:assertEquals("Berta Muh")
 function rt:equality-qname-string-attribute($id as xs:string) {
-    normalize-space(//address[range:eq(@id, $id)]/name/text())
+    normalize-space(collection("/db/rangetest")//address[range:eq(@id, $id)]/name/text())
 };
 
 declare
@@ -160,7 +160,7 @@ declare
     %test:args("almweide")
     %test:assertEquals("Almweide")
 function rt:equality-string-collation($name as xs:string) {
-    //address[range:eq(city, $name)]/city/text()
+    collection("/db/rangetest")//address[range:eq(city, $name)]/city/text()
 };
 
 declare 
@@ -169,14 +169,14 @@ declare
     %test:args("Pü Reh")
     %test:assertEquals("Wiesental")
 function rt:equality-fields($name as xs:string) {
-    //range:field-eq("address-name", $name)/city/text()
+    collection("/db/rangetest")//range:field-eq("address-name", $name)/city/text()
 };
 
 declare 
     %test:args(65428)
     %test:assertEquals("Rudi Rüssel")
 function rt:equality-field-integer($code as xs:integer) {
-    //range:field-eq("address-code", $code)/name/text()
+    collection("/db/rangetest")//range:field-eq("address-code", $code)/name/text()
 };
 
 declare 
@@ -194,7 +194,7 @@ declare
     %test:args("Pü Reh", "Wiesental")
     %test:assertEquals("Wiesental")
 function rt:equality-fields-multi($name as xs:string, $city as xs:string) {
-    //range:field-eq(("address-name", "address-city"), $name, $city)/city/text()
+    collection("/db/rangetest")//range:field-eq(("address-name", "address-city"), $name, $city)/city/text()
 };
 
 (:declare :)
@@ -212,7 +212,7 @@ declare
     %test:args("Pü Reh")
     %test:assertEquals(1)
 function rt:gt-string($name as xs:string) {
-    count(//address[range:gt(name, $name)])
+    count(collection("/db/rangetest")//address[range:gt(name, $name)])
 };
 
 declare
@@ -223,7 +223,7 @@ declare
     %test:args("Pü Reh")
     %test:assertEquals(2)
 function rt:ge-string($name as xs:string) {
-    count(//address[range:ge(name, $name)])
+    count(collection("/db/rangetest")//address[range:ge(name, $name)])
 };
 
 declare
@@ -234,7 +234,7 @@ declare
     %test:args("Pü Reh")
     %test:assertEquals(2)
 function rt:lt-string($name as xs:string) {
-    count(//address[range:lt(name, $name)])
+    count(collection("/db/rangetest")//address[range:lt(name, $name)])
 };
 
 declare
@@ -245,7 +245,7 @@ declare
     %test:args("Pü Reh")
     %test:assertEquals(3)
 function rt:le-string($name as xs:string) {
-    count(//address[range:le(name, $name)])
+    count(collection("/db/rangetest")//address[range:le(name, $name)])
 };
 
 declare
@@ -256,7 +256,7 @@ declare
     %test:args(65463)
     %test:assertEquals(2)
 function rt:gt-integer($code as xs:integer) {
-    count(//address[range:gt(city/@code, $code)])
+    count(collection("/db/rangetest")//address[range:gt(city/@code, $code)])
 };
 
 declare
@@ -267,7 +267,7 @@ declare
     %test:args(65463)
     %test:assertEquals(3)
 function rt:ge-integer($code as xs:integer) {
-    count(//address[range:ge(city/@code, $code)])
+    count(collection("/db/rangetest")//address[range:ge(city/@code, $code)])
 };
 
 declare
@@ -276,7 +276,7 @@ declare
     %test:args(65463)
     %test:assertEquals(1)
 function rt:lt-integer($code as xs:integer) {
-    count(//address[range:lt(city/@code, $code)])
+    count(collection("/db/rangetest")//address[range:lt(city/@code, $code)])
 };
 
 declare
@@ -285,7 +285,7 @@ declare
     %test:args(65463)
     %test:assertEquals(2)
 function rt:le-integer($code as xs:integer) {
-    count(//address[range:le(city/@code, $code)])
+    count(collection("/db/rangetest")//address[range:le(city/@code, $code)])
 };
 
 declare
@@ -294,7 +294,7 @@ declare
     %test:args("Berta")
     %test:assertEquals("Almweide")
 function rt:starts-with-string($name as xs:string) {
-    //address[range:starts-with(name, $name)]/city/text()
+    collection("/db/rangetest")//address[range:starts-with(name, $name)]/city/text()
 };
 
 declare
@@ -303,7 +303,7 @@ declare
     %test:args("Muh")
     %test:assertEquals("Almweide")
 function rt:ends-with-string($name as xs:string) {
-    //address[range:ends-with(name, $name)]/city/text()
+    collection("/db/rangetest")//address[range:ends-with(name, $name)]/city/text()
 };
 
 declare
@@ -312,14 +312,14 @@ declare
     %test:args("ta M")
     %test:assertEquals("Almweide")
 function rt:contains-string($name as xs:string) {
-    //address[range:contains(name, $name)]/city/text()
+    collection("/db/rangetest")//address[range:contains(name, $name)]/city/text()
 };
 
 declare
     %test:args(".*Rüssel")
     %test:assertEquals("Rüsselsheim")
 function rt:matches-string($name as xs:string) {
-    //address[range:matches(name, $name)]/city/text()
+    collection("/db/rangetest")//address[range:matches(name, $name)]/city/text()
 };
 
 declare
@@ -328,7 +328,7 @@ declare
     %test:args("Berta")
     %test:assertEquals("Almweide")
 function rt:field-starts-with-string($name as xs:string) {
-    //range:field-starts-with("address-name", $name)/city/text()
+    collection("/db/rangetest")//range:field-starts-with("address-name", $name)/city/text()
 };
 
 declare
@@ -337,7 +337,7 @@ declare
     %test:args("Muh")
     %test:assertEquals("Almweide")
 function rt:field-ends-with-string($name as xs:string) {
-    //range:field-ends-with("address-name", $name)/city/text()
+    collection("/db/rangetest")//range:field-ends-with("address-name", $name)/city/text()
 };
 
 declare
@@ -346,7 +346,7 @@ declare
     %test:args("ta M")
     %test:assertEquals("Almweide")
 function rt:field-contains-string($name as xs:string) {
-    //range:field-contains("address-name", $name)/city/text()
+    collection("/db/rangetest")//range:field-contains("address-name", $name)/city/text()
 };
 
 declare
@@ -355,7 +355,7 @@ declare
     %test:args(".*ta M.*")
     %test:assertEquals("Almweide")
 function rt:field-matches-string($name as xs:string) {
-    //range:field-matches("address-name", $name)/city/text()
+    collection("/db/rangetest")//range:field-matches("address-name", $name)/city/text()
 };
 
 declare 
@@ -366,7 +366,7 @@ declare
     %test:args("main", "official", "Dorfprozelten")
     %test:assertEquals("Dorfprozelten")
 function rt:equality-field-nested($type as xs:string, $subtype as xs:string, $name as xs:string) {
-    //range:field-eq(("type", "subtype", "name"), $type, $subtype, $name)/text()
+    collection("/db/rangetest")//range:field-eq(("type", "subtype", "name"), $type, $subtype, $name)/text()
 };
 
 declare 
@@ -391,39 +391,39 @@ function rt:update-insert() {
         </address>
     into doc("/db/rangetest/test.xml")/test,
     range:field-eq("address-name", "Willi Wiesel")/street/text(),
-    //address[range:eq(name, "Willi Wiesel")]/city/text()
+    collection("/db/rangetest")//address[range:eq(name, "Willi Wiesel")]/city/text()
 };
 
 declare 
     %test:assertEmpty
 function rt:update-delete() {
-    update delete /test/address[range:eq(name, "Berta Muh")],
-    //address[range:eq(name, "Berta Muh")],
+    update delete collection("/db/rangetest")/test/address[range:eq(name, "Berta Muh")],
+    collection("/db/rangetest")//address[range:eq(name, "Berta Muh")],
     range:field-eq("address-name", "Berta Muh")
 };
 
 declare
     %test:assertEquals("Am Staudamm 3", "Bach")
 function rt:update-replace() {
-    update replace /test/address[range:eq(name, "Albert Amsel")]
+    update replace collection("/db/rangetest")/test/address[range:eq(name, "Albert Amsel")]
     with
         <address>
             <name>Berta Bieber</name>
             <street>Am Staudamm 3</street>
             <city code="77777">Bach</city>
         </address>,
-    //address[range:eq(name, "Albert Amsel")],
+    collection("/db/rangetest")//address[range:eq(name, "Albert Amsel")],
     range:field-eq("address-name", "Albert Amsel"),
-    //address[range:eq(name, "Berta Bieber")]/street/text(),
+    collection("/db/rangetest")//address[range:eq(name, "Berta Bieber")]/street/text(),
     range:field-eq("address-name", "Berta Bieber")/city/text()
 };
 
 declare
     %test:assertEquals("Am Waldrand 4", "Wiesental")
 function rt:update-value() {
-    update value /test/address/name[range:eq(., "Pü Reh")] with "Rita Rebhuhn",
-    //address[range:eq(name, "Pü Reh")],
+    update value collection("/db/rangetest")/test/address/name[range:eq(., "Pü Reh")] with "Rita Rebhuhn",
+    collection("/db/rangetest")//address[range:eq(name, "Pü Reh")],
     range:field-eq("address-name", "Pü Reh"),
-    //address[range:eq(name, "Rita Rebhuhn")]/street/text(),
+    collection("/db/rangetest")//address[range:eq(name, "Rita Rebhuhn")]/street/text(),
     range:field-eq("address-name", "Rita Rebhuhn")/city/text()
 };