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

Commit message:
- fix in 'assert-xml' implementation: added XML canonicalization support (102 PROGRESSIONS and 2 FALSE positives)
- fix in 'assert-string-value' implementation: 30 PROGRESSIONS

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
  Bug #1086398 in Zorba: "FOTS: add canonicalization in eval:assert-xml function"
  https://bugs.launchpad.net/zorba/+bug/1086398

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

- fix in 'assert-xml' implementation: added XML canonicalization support (102 PROGRESSIONS and 2 FALSE positives)
- fix in 'assert-string-value' implementation: 30 PROGRESSIONS
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1086398/+merge/152913
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-03-07 12:35:29 +0000
+++ test/fots/CMakeLists.txt	2013-03-12 14:01:21 +0000
@@ -123,24 +123,11 @@
 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
 EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)
 EXPECTED_FOTS_FAILURE (app-Demos itunes 0)
-EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-number-all 0)
-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-1 0)
-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-all 0)
 EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0)
-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-as-numeric-all 0)
-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-case-insensitive-all 0)
-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-all 0)
-EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q5 0)
-EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q8 0)
-EXPECTED_FOTS_FAILURE (app-XMark XMark-Q3 0)
-EXPECTED_FOTS_FAILURE (app-XMark XMark-All 0)
 EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)
 EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0)
 EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-002 0)
 EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-003 0)
-EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-008 0)
-EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017 0)
-EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017a 0)
 EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
 EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-002 0)
 EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-003 0)
@@ -168,8 +155,6 @@
 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)
 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)
 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-003 0)
-EXPECTED_FOTS_FAILURE (fn-doc fn-doc-25 0)
-EXPECTED_FOTS_FAILURE (fn-doc fn-doc-33 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0)
 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0)
@@ -317,8 +302,6 @@
 EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-20 0)
 EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-21 0)
 EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-23 0)
-EXPECTED_FOTS_FAILURE (fn-id K2-SeqIDFunc-11 0)
-EXPECTED_FOTS_FAILURE (fn-id K2-SeqIDFunc-12 0)
 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-5 0)
 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-7 0)
 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-8 0)
@@ -336,13 +319,7 @@
 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-23 0)
 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-24 0)
 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-25 0)
-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-11 0)
-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-12 0)
-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-18 0)
-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-26 0)
-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-28 0)
 EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0)
-EXPECTED_FOTS_FAILURE (fn-last last-11 0)
 EXPECTED_FOTS_FAILURE (fn-last last-24 0)
 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
 EXPECTED_FOTS_FAILURE (fn-matches.re re00056 1131984)
@@ -376,9 +353,6 @@
 EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-001 0)
-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-010 0)
-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-011 0)
-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-012 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)
@@ -386,7 +360,6 @@
 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-34 0)
 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-35 0)
 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)
-EXPECTED_FOTS_FAILURE (fn-replace K2-ReplaceFunc-8 0)
 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)
 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)
 EXPECTED_FOTS_FAILURE (fn-round-half-to-even fn-round-half-to-even-9 0)
@@ -425,12 +398,10 @@
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-037 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-038 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-039 0)
-EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-040 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-042 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-049 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-050 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-051 0)
-EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-052 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-053 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-054 0)
 EXPECTED_FOTS_FAILURE (math-acos math-acos-003 0)
@@ -463,34 +434,6 @@
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-5 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-7 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-8 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-9 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-12 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-13 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-15 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-16 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-17 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-18 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-19 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-20 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-21 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-23 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-5 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-7 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-8 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-9 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-15 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-16 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-17 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-18 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-19 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-20 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-21 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-23 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-30 0)
-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-31 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-2 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-3 0)
@@ -501,14 +444,13 @@
 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 XML10-5ed-Included-char-1 0)
 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
+EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0)
+EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0)
 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0)
 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0)
 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0)
 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-008 0)
-EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0)
-EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0)
 EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-date cbcl-add-yearMonthDuration-to-date-003 0)
 EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-dateTime cbcl-add-yearMonthDuration-to-dateTime-003 0)
 EXPECTED_FOTS_FAILURE (op-date-greater-than cbcl-date-gt-001 0)
@@ -521,17 +463,14 @@
 EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-003 0)
 EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration cbcl-divide-yearMonthDuration-003 0)
 EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0)
-EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-002 0)
-EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-015 0)
-EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-016 0)
+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)
+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0)
+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-001 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-003 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-004 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0)
-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-date cbcl-subtract-dayTimeDuration-from-date-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-dateTime cbcl-subtract-dayTimeDuration-from-dateTime-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-subtract-dayTimeDurations-003 0)
@@ -546,9 +485,6 @@
 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
-EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-015 0)
-EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-016 0)
-EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-017 0)
 EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
@@ -567,39 +503,11 @@
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-8 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep Axes085 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep Axes086 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep Axes089 0)
 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0)
 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0)
 EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0)
 EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-wild-002 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-3 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-5 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-6 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-8 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-14 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-16 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-17 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-18 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-19 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-20 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-21 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-25 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor ancestor-15 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-13 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-15 0)
-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self unabbreviatedSyntax-11 0)
 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
@@ -626,29 +534,25 @@
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-23 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-25 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 0)
-EXPECTED_FOTS_FAILURE (prod-Comment XQueryComment012 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0)
+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
 EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-51 0)
 EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-53 0)
 EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-58 0)
 EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-012 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-015 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-022 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-027 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-031 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-032 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-033 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-035 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-036 0)
-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-037 0)
 EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-039 0)
-EXPECTED_FOTS_FAILURE (prod-CompTextConstructor K2-ConText-4 0)
 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-016 0)
 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-017 0)
 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-031 0)
 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-049 0)
-EXPECTED_FOTS_FAILURE (prod-CopyNamespacesDecl K2-CopyNamespacesProlog-5 0)
 EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)
 EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)
 EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-14 0)
@@ -658,28 +562,9 @@
 EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-911err 0)
 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)
 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
-EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-3 0)
-EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-4 0)
-EXPECTED_FOTS_FAILURE (prod-DirAttributeList DirectConElemAttr-1 0)
-EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-66 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-38 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-48 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-49 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-52 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-53a 0)
 EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-5 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-6 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-40 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-56 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-10 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-12 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-21 0)
-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-22 0)
+EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-76 0)
 EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0)
-EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-2 0)
-EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-3 0)
-EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr004 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0)
@@ -704,9 +589,6 @@
 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0)
-EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0)
-EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr017 0)
 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)
 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)
 EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)
@@ -730,22 +612,22 @@
 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-19 0)
 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 modules-circular 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)
 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
-EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-30 0)
-EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-31 0)
+EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
 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)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-025 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026 0)
+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-027 0)
 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-028 0)
+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-029 0)
+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-OrderByClause orderBy20 0)
@@ -762,8 +644,6 @@
 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-7p 0)
 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
-EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-5 0)
-EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-7 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)
@@ -797,15 +677,11 @@
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
-EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr010 0)
-EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr016 0)
-EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema005 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040a 0)
-EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema070 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-003 0)
@@ -827,7 +703,6 @@
 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)
 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)
 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)
-EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-35 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-36 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)
@@ -844,12 +719,6 @@
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl version_declaration-023-v3 0)
-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr001 0)
-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr003 0)
-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr022 0)
-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr024 0)
-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr025 0)
-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr026 0)
 EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase01S 0)
 EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase02S 0)
 EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase03S 0)

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-02-26 05:21:15 +0000
+++ test/fots_driver/environment.xq	2013-03-12 14:01:21 +0000
@@ -451,7 +451,7 @@
 ) as xs:string
 {
   if (empty($env))
-  then 
+  then
     ""
   else
     let $namespace := $env/fots:namespace[@uri eq $env/fots:schema/@uri]

=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq	2013-02-26 06:30:28 +0000
+++ test/fots_driver/evaluate.xq	2013-03-12 14:01:21 +0000
@@ -37,6 +37,9 @@
 import module namespace util =
   "http://www.zorba-xquery.com/fots-driver/util"; at "util.xq";
 
+import module namespace zorba-xml =
+  "http://www.zorba-xquery.com/modules/xml#2.1";;
+
 declare namespace err =
   "http://www.w3.org/2005/xqt-errors";;
 
@@ -256,7 +259,7 @@
     } </result>
   where every $result in $results satisfies $result/item
   return concat("'Assert-any-of' returned: ",
-                string-join(util:serialize-result($results/data(item)), ' '))
+                fn:serialize($results/data(item), $util:serParamXml))
 };
 
 
@@ -482,17 +485,14 @@
   $baseURI   as xs:anyURI
 )
 {
-(:TODO call xml-canonicalization after bug #1076919 is implemented.:)
   try {
-    let $serRes := util:serialize-result($result),
-        $result1 as xs:string := string-join($serRes,''),
-        $result2 as xs:string := string-join($serRes,' '),
-        $expectedResult as xs:string := util:get-value($expResult, $baseURI, "assert-xml")
+    let $actualResult   := zorba-xml:canonicalize(concat('<root>', fn:serialize($result, $util:serParamXml), '</root>'))
+    let $expectedResult := zorba-xml:canonicalize(concat('<root>', util:get-value($expResult, $baseURI, "assert-xml"), '</root>'))
+    
     return
-      if ((normalize-space($result1) eq normalize-space(string($expectedResult))) or
-         (normalize-space($result2) eq normalize-space(string($expectedResult))))
+      if ($actualResult eq $expectedResult)
       then ()
-      else "'assert-xml' returned: result is different from the expected result."
+      else concat("'assert-xml' returned: result &#xA;'", $actualResult, "'&#xA; is different from the expected result &#xA;'", $expectedResult,"'&#xA;")
   } catch * {
     concat("'assert-xml' returned: fail with error ",
             $err:code, " : ", $err:description)
@@ -511,8 +511,7 @@
 ) as xs:string?
 {
   try {
-  let $serializedResult as xs:string := string-join(
-                                            util:serialize-result($result), '')
+  let $serializedResult as xs:string := fn:serialize($result, $util:serParamXml)
   return
    "'assert-serialization-error' returned: expected serialization error but got result."
   } catch * {
@@ -534,12 +533,8 @@
 ) as xs:string?
 {
   try {
-  let $serResult := string-join(util:serialize-result($result,
-                                                      $util:serParamXml),
-                                ''),
-      $serExpResult := string-join(util:serialize-result(data($expResult),
-                                                        $util:serParamXml),
-                                  '')
+  let $serResult    := fn:serialize($result, $util:serParamXml)
+  let $serExpResult := fn:serialize($expResult, $util:serParamXml)
   let $matchesFlags := data($expResult/@flags)
   return
     if (exists($matchesFlags))
@@ -569,11 +564,11 @@
 ) as xs:string?
 {
   try {
-    let $serRes := string-join(util:serialize-result($result), ' '),
-        $res := if (empty($expResult[@normalize-space="true"]))
+    let $serRes := string-join(for $r in $result return string($r), " ")
+    let $res := if (empty($expResult[@normalize-space="true"]))
                 then $serRes
-                else normalize-space($serRes),
-        $expRes :=  if (empty($expResult[@normalize-space="true"]))
+                else normalize-space($serRes)
+    let $expRes :=  if (empty($expResult[@normalize-space="true"]))
                     then xs:string($expResult)
                     else normalize-space(xs:string($expResult))
     return

=== modified file 'test/fots_driver/reporting.xq'
--- test/fots_driver/reporting.xq	2013-02-27 12:14:01 +0000
+++ test/fots_driver/reporting.xq	2013-03-12 14:01:21 +0000
@@ -318,6 +318,7 @@
         for $testSet in $results//fots:test-set
         let $countFailures := count($testSet//fots:test-case[@result ="fail"])
         let $testSetName := xs:string($testSet/@name)
+        order by $testSetName
         where $countFailures gt xs:integer(0)
         return
         for $testCase in $testSet//fots:test-case[@result ="fail"]

=== modified file 'test/fots_driver/util.xq'
--- test/fots_driver/util.xq	2013-02-27 11:47:33 +0000
+++ test/fots_driver/util.xq	2013-03-12 14:01:21 +0000
@@ -121,26 +121,6 @@
 };
 
 
-declare function util:serialize-result(
-  $result as item()*
-) as xs:string*
-{
-  util:serialize-result($result, $util:serParamXml)
-};
-
-
-declare function util:serialize-result(
-  $result as item()*,
-  $SerParams
-) as xs:string*
-{
-  for $res in $result
-  return
-   if ($res instance of node())
-   then fn:serialize($res, $SerParams)
-   else fn:string($res)
-};
-
 declare %ann:sequential function util:write-query-to-file(
   $query        as xs:string,
   $queryName    as xs:string