zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1123843 into lp:zorba.

Commit message:
Fix lp:1123843.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
  Bug #1123843 in Zorba: "FOTS: 'assert-permutation' bug (at least 46 failures)"
  https://bugs.launchpad.net/zorba/+bug/1123843

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1123843/+merge/149344

Fix lp:1123843.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1123843/+merge/149344
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq	2013-01-31 18:06:16 +0000
+++ test/fots_driver/evaluate.xq	2013-02-19 17:12:37 +0000
@@ -391,13 +391,11 @@
   try {
   {
     variable $queryText := concat(
-      "xquery version '3.0';",
-      "declare namespace o = 'http://www.zorba-xquery.com/options/features';",
-      "declare option o:enable 'hof';",
       "declare variable $x external;",
+      "declare function local:order-string-values($items){ for $item in $items order by xs:string($item) return $item};",
       "let $y := (",string(data($expResult)),") return ",
-      (: if count(intersection(M1,M2)) = count(union(M1,M2)) = count(M1) then the sequences are identical :)
-      "(count(distinct-values($x[ . = $y])) = count(distinct-values(($x, $y)))) = count(distinct-values($x))");
+      "deep-equal(local:order-string-values($x), local:order-string-values($y)) or
+       deep-equal(reverse($x), $y)");
     variable $queryKey := xqxq:prepare-main-module($queryText),
              $queryKeyResult := xqxq:bind-variable($queryKey,
                                                   xs:QName('x'),