[test] Fix the tests

eXist-db · May 16, 2023 · eebf365 · eebf365
1 parent cf543a0
commit eebf365
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 148 deletions.
diff --git a/exist-core/src/test/xquery/indexing/range.xml b/exist-core/src/test/xquery/indexing/range.xml
@@ -78,35 +78,35 @@
         <task>Test empty element content</task>
         <code>doc("/db/test/text1.xml")//a[. = 'A1']</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test output="xml" trace="yes">
         <task>Test empty element content</task>
         <code>doc("/db/test/text1.xml")//a[. = '']</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test output="xml" trace="yes">
         <task>Simple query on xs:integer</task>
         <code>doc("/db/test/text1.xml")//b[. = 1]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test output="xml" trace="yes">
         <task>Greater than on xs:integer</task>
         <code>doc("/db/test/text1.xml")//b[. > 1]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test output="xml" trace="yes">
         <task>Greater than on xs:string</task>
         <code>doc("/db/test/text1.xml")//b[. > "1"]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <!-- Will fail: -->
@@ -119,42 +119,42 @@
         <task>Greater than on xs:double</task>
         <code>doc("/db/test/text1.xml")//c[. > xs:integer(1)]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test output="xml" trace="yes">
         <task>Greater than on xs:double</task>
         <code>doc("/db/test/text1.xml")//c[. > 1.0]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test id="emptyInt" output="xml" trace="yes">
         <task>Lookup xs:integer</task>
         <code>doc("/db/test/text1.xml")//d[. = 20]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test id="inconsistent" output="xml" trace="yes">
         <task>Lookup xs:double on element containing numbers and strings</task>
         <code>doc("/db/test/text1.xml")//e[. = 50.0]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test id="inconsistent2" output="xml" trace="yes">
         <task>Compare xs:double on element containing numbers and strings</task>
         <code>doc("/db/test/text1.xml")//e[. > 50.0]</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
     <test output="xml" trace="yes">
         <task>Query inside document constructor</task>
         <code>document { doc("/db/test/text1.xml")//b[. = 1] }</code>
         <xpath xmlns:prof="http://exist-db.org/xquery/profiling">
-            //prof:index[@type = 'range'][@optimization = 2]
+            //prof:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']
         </xpath>
     </test>
 </TestSet>
diff --git a/exist-core/src/test/xquery/optimizer/expressions.xqm b/exist-core/src/test/xquery/optimizer/expressions.xqm
@@ -89,39 +89,39 @@ function ot:cleanup() {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-simple-comparison($name as xs:string) {
     collection($ot:COLLECTION)//address[name = $name]/city/text()
 };
 
 declare
     %test:stats
     %test:args("Rüsselsheim")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'NONE']")
 function ot:no-optimize-simple-comparison($name as xs:string) {
     collection($ot:COLLECTION)//address[city = $name]/city/text()
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-filter-context-step($name as xs:string) {
     collection($ot:COLLECTION)//(address)[name = $name]/city/text()
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-sequence($name as xs:string) {
     (collection($ot:COLLECTION)//address[name = $name]/city/text(), "xxx")
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-let($name as xs:string) {
     let $city := collection($ot:COLLECTION)//address[name = $name]/city/text()
     return
@@ -131,7 +131,7 @@ function ot:optimize-let($name as xs:string) {
 declare
     %test:stats
     %test:args("Rüsselsheim")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'NONE']")
 function ot:no-optimize-let($name as xs:string) {
     let $city := collection($ot:COLLECTION)//address[city = $name]/city/text()
     return
@@ -141,7 +141,7 @@ function ot:no-optimize-let($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-for($name as xs:string) {
     for $city in collection($ot:COLLECTION)//address[name = $name]/city/text()
     return
@@ -151,7 +151,7 @@ function ot:optimize-for($name as xs:string) {
 declare
     %test:stats
     %test:args("Rüsselsheim")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'NONE']")
 function ot:no-optimize-for($name as xs:string) {
     for $city in collection($ot:COLLECTION)//address[city = $name]/city/text()
     return
@@ -161,7 +161,7 @@ function ot:no-optimize-for($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-if-then($name as xs:string) {
     if (1 = 1) then
         collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -172,7 +172,7 @@ function ot:optimize-if-then($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-if-else($name as xs:string) {
     if (1 = 2) then
         ()
@@ -191,23 +191,23 @@ declare %private function ot:find-by-city($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-function-call($name as xs:string) {
     ot:find-by-name($name)
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:no-optimize-function-call($name as xs:string) {
     ot:find-by-name($name)
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-try($name as xs:string) {
     try {
         collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -219,7 +219,7 @@ function ot:optimize-try($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-catch($name as xs:string) {
     try {
         xs:int("abc")
@@ -231,31 +231,31 @@ function ot:optimize-catch($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-attribute-enclosed($name as xs:string) {
     <a title="{collection($ot:COLLECTION)//address[name = $name]/city/text()}"></a>
 };
 
 declare
     %test:stats
     %test:args("Rüsselsheim")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'NONE']")
 function ot:no-optimize-attribute-enclosed($name as xs:string) {
     <a title="{collection($ot:COLLECTION)//address[city = $name]/city/text()}"></a>
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-element-enclosed($name as xs:string) {
     <a>{collection($ot:COLLECTION)//address[name = $name]/city/text()}</a>
 };
 
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-element-dynamic-enclosed($name as xs:string) {
     element a {
         collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -265,7 +265,7 @@ function ot:optimize-element-dynamic-enclosed($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-attribute-dynamic-enclosed($name as xs:string) {
     <a>
     {
@@ -279,7 +279,7 @@ function ot:optimize-attribute-dynamic-enclosed($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-inline-function($name as xs:string) {
     let $f := function() {
         collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -291,7 +291,7 @@ function ot:optimize-inline-function($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-inline-function-enclosed-attribute($name as xs:string) {
     let $f := function() {
         collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -303,7 +303,7 @@ function ot:optimize-inline-function-enclosed-attribute($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-inline-function-enclosed($name as xs:string) {
     let $f := function() {
         collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -315,7 +315,7 @@ function ot:optimize-inline-function-enclosed($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-function-reference($name as xs:string) {
     let $f := ot:find-by-name#1
     return
@@ -325,7 +325,7 @@ function ot:optimize-function-reference($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-function-map($name as xs:string) {
     let $f := ot:find-by-name#1
     return
@@ -335,7 +335,7 @@ function ot:optimize-function-map($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-function-partial($name as xs:string) {
     let $f1 := function($foo, $name) {
         ot:find-by-name($name)
@@ -348,11 +348,11 @@ function ot:optimize-function-partial($name as xs:string) {
 declare
     %test:stats
     %test:args(1, "Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
     %test:args(2, "Rüsselsheim")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'NONE']")
     %test:args(3, "Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-switch($case as xs:integer, $name as xs:string) {
     switch($case)
         case 1 return
@@ -366,11 +366,11 @@ function ot:optimize-switch($case as xs:integer, $name as xs:string) {
 declare
     %test:stats
     %test:args("<a/>", "Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
     %test:args("<b/>", "Rüsselsheim")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'NONE']")
     %test:args("<c/>", "Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-typeswitch($case as element(), $name as xs:string) {
     typeswitch($case)
         case element(a) return
@@ -384,7 +384,7 @@ function ot:optimize-typeswitch($case as element(), $name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-map($name as xs:string) {
     let $map := map {
         "key": collection($ot:COLLECTION)//address[name = $name]/city/text()
@@ -396,7 +396,7 @@ function ot:optimize-map($name as xs:string) {
 declare
     %test:stats
     %test:args("Rudi Rüssel")
-    %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
+    %test:assertXPath("$result//stats:index[@type eq 'range'][@optimization-level eq 'OPTIMIZED']")
 function ot:optimize-map-entry($name as xs:string) {
     let $map := map:entry(
         "key", collection($ot:COLLECTION)//address[name = $name]/city/text()