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_1172276 into lp:zorba.

Commit message:
- fix for eval:serialization-matches that made some of the "prod-OptionDecl.serialization" failing test case to pass because the serialization params defined in the prolog are the same as the default ones in Zorba
- marked the rest of the failures as DISPUTED: please see W3C bug #21868
- removed EXPECTED_FOTS_FAILURE for "K2-Serialization-11"

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
  Bug #1172276 in Zorba: ""serialization-matches" assertion bug"
  https://bugs.launchpad.net/zorba/+bug/1172276

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-30 23:54:17 +0000
+++ test/fots/CMakeLists.txt	2013-05-01 04:46:31 +0000
@@ -151,6 +151,13 @@
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-003 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-004 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-005 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-026 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-028 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-031 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
 
 # Next three possibly unique to old RQ machine, but they need to be
 # marked for the RQ to pass.
@@ -252,7 +259,6 @@
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-6 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-9 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0)
-EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
@@ -326,6 +332,7 @@
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
+<<<<<<< TREE
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)
@@ -336,6 +343,10 @@
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-030 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)
+=======
+EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
+EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
+>>>>>>> MERGE-SOURCE
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 0)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 0)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy49 0)

=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq	2013-04-17 19:10:37 +0000
+++ test/fots_driver/evaluate.xq	2013-05-01 04:46:31 +0000
@@ -548,19 +548,19 @@
 ) as xs:string?
 {
   try {
-  let $serResult    := fn:serialize($result, $util:serParamXml)
-  let $serExpResult := fn:serialize($expResult, $util:serParamXml)
-  let $matchesFlags := data($expResult/@flags)
+  let $serResult := fn:serialize($result)
+  let $regex := fn:string($expResult)
+  let $flags := data($expResult/@flags)
   return
-    if (exists($matchesFlags))
+    if (exists($flags))
     then
-      if (matches($serResult, $serExpResult, $matchesFlags))
+      if (matches($serResult, $regex, $flags))
       then ()
       else concat("'serialization-matches' returned: result does not match expected result with flags '",
-                  $matchesFlags,
+                  $flags,
                   "'.")
     else
-      if (matches($serResult, $serExpResult))
+      if (matches($serResult, $regex))
       then ()
       else "'serialization-matches' returned: result does not match expected result."
   } catch * {