Merge lp:~zorba-coders/zorba/fix_bug_1086398 into lp:zorba

Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Chris Hillery
Approved revision: 11285
Merged at revision: 11284
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1086398
Merge into: lp:zorba
Diff against target: 507 lines (+40/-192)
5 files modified
test/fots/CMakeLists.txt (+22/-150)
test/fots_driver/environment.xq (+1/-1)
test/fots_driver/evaluate.xq (+16/-21)
test/fots_driver/reporting.xq (+1/-0)
test/fots_driver/util.xq (+0/-20)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1086398
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+152913@code.launchpad.net

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/fix_bug_1086398 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job fix_bug_1086398-2013-03-12T14-03-44.003Z is finished.
  The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1086398-2013-03-12T15-37-39.266Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1086398-2013-03-12T19-56-38.931Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-03-07 12:35:29 +0000
+++ test/fots/CMakeLists.txt 2013-03-12 15:40:32 +0000
@@ -123,24 +123,11 @@
123EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)123EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
124EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)124EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)
125EXPECTED_FOTS_FAILURE (app-Demos itunes 0)125EXPECTED_FOTS_FAILURE (app-Demos itunes 0)
126EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-number-all 0)
127EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-1 0)
128EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-all 0)
129EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0)126EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0)
130EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-as-numeric-all 0)
131EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-case-insensitive-all 0)
132EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-all 0)
133EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q5 0)
134EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q8 0)
135EXPECTED_FOTS_FAILURE (app-XMark XMark-Q3 0)
136EXPECTED_FOTS_FAILURE (app-XMark XMark-All 0)
137EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)127EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)
138EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0)128EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0)
139EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-002 0)129EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-002 0)
140EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-003 0)130EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-003 0)
141EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-008 0)
142EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017 0)
143EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017a 0)
144EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)131EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
145EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-002 0)132EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-002 0)
146EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-003 0)133EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-003 0)
@@ -168,8 +155,6 @@
168EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)155EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)
169EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)156EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)
170EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-003 0)157EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-003 0)
171EXPECTED_FOTS_FAILURE (fn-doc fn-doc-25 0)
172EXPECTED_FOTS_FAILURE (fn-doc fn-doc-33 0)
173EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)158EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)
174EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0)159EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0)
175EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0)160EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0)
@@ -317,8 +302,6 @@
317EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-20 0)302EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-20 0)
318EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-21 0)303EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-21 0)
319EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-23 0)304EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-23 0)
320EXPECTED_FOTS_FAILURE (fn-id K2-SeqIDFunc-11 0)
321EXPECTED_FOTS_FAILURE (fn-id K2-SeqIDFunc-12 0)
322EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-5 0)305EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-5 0)
323EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-7 0)306EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-7 0)
324EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-8 0)307EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-8 0)
@@ -336,13 +319,7 @@
336EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-23 0)319EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-23 0)
337EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-24 0)320EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-24 0)
338EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-25 0)321EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-25 0)
339EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-11 0)
340EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-12 0)
341EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-18 0)
342EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-26 0)
343EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-28 0)
344EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0)322EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0)
345EXPECTED_FOTS_FAILURE (fn-last last-11 0)
346EXPECTED_FOTS_FAILURE (fn-last last-24 0)323EXPECTED_FOTS_FAILURE (fn-last last-24 0)
347EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)324EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
348EXPECTED_FOTS_FAILURE (fn-matches.re re00056 1131984)325EXPECTED_FOTS_FAILURE (fn-matches.re re00056 1131984)
@@ -376,9 +353,6 @@
376EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 0)353EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 0)
377EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 0)354EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 0)
378EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-001 0)355EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-001 0)
379EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-010 0)
380EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-011 0)
381EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-012 0)
382EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 0)356EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 0)
383EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)357EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)
384EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)358EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)
@@ -386,7 +360,6 @@
386EXPECTED_FOTS_FAILURE (fn-replace fn-replace-34 0)360EXPECTED_FOTS_FAILURE (fn-replace fn-replace-34 0)
387EXPECTED_FOTS_FAILURE (fn-replace fn-replace-35 0)361EXPECTED_FOTS_FAILURE (fn-replace fn-replace-35 0)
388EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)362EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)
389EXPECTED_FOTS_FAILURE (fn-replace K2-ReplaceFunc-8 0)
390EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)363EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)
391EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)364EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)
392EXPECTED_FOTS_FAILURE (fn-round-half-to-even fn-round-half-to-even-9 0)365EXPECTED_FOTS_FAILURE (fn-round-half-to-even fn-round-half-to-even-9 0)
@@ -425,7 +398,6 @@
425EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-037 0)398EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-037 0)
426EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-038 0)399EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-038 0)
427EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-039 0)400EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-039 0)
428EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-040 0)
429EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-042 0)401EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-042 0)
430EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-049 0)402EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-049 0)
431EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-050 0)403EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-050 0)
@@ -463,34 +435,6 @@
463EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)435EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
464EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)436EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)
465EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)437EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)
466EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-5 0)
467EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-7 0)
468EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-8 0)
469EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-9 0)
470EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-12 0)
471EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-13 0)
472EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-15 0)
473EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-16 0)
474EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-17 0)
475EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-18 0)
476EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-19 0)
477EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-20 0)
478EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-21 0)
479EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-23 0)
480EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-5 0)
481EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-7 0)
482EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-8 0)
483EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-9 0)
484EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-15 0)
485EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-16 0)
486EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-17 0)
487EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-18 0)
488EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-19 0)
489EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-20 0)
490EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-21 0)
491EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-23 0)
492EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-30 0)
493EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-31 0)
494EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 0)438EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 0)
495EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-2 0)439EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-2 0)
496EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-3 0)440EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-3 0)
@@ -501,14 +445,13 @@
501EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0)445EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0)
502EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)446EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
503EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)447EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
504EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-5ed-Included-char-1 0)
505EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)448EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
449EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0)
450EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0)
506EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0)451EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0)
507EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0)452EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0)
508EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0)453EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0)
509EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-008 0)454EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-008 0)
510EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0)
511EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0)
512EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-date cbcl-add-yearMonthDuration-to-date-003 0)455EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-date cbcl-add-yearMonthDuration-to-date-003 0)
513EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-dateTime cbcl-add-yearMonthDuration-to-dateTime-003 0)456EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-dateTime cbcl-add-yearMonthDuration-to-dateTime-003 0)
514EXPECTED_FOTS_FAILURE (op-date-greater-than cbcl-date-gt-001 0)457EXPECTED_FOTS_FAILURE (op-date-greater-than cbcl-date-gt-001 0)
@@ -521,17 +464,14 @@
521EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-003 0)464EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-003 0)
522EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration cbcl-divide-yearMonthDuration-003 0)465EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration cbcl-divide-yearMonthDuration-003 0)
523EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0)466EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0)
524EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-002 0)467EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
525EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-015 0)468EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)
526EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-016 0)469EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0)
470EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0)
527EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-001 0)471EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-001 0)
528EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-002 0)472EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-002 0)
529EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-003 0)473EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-003 0)
530EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-004 0)474EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-004 0)
531EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
532EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)
533EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0)
534EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0)
535EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-date cbcl-subtract-dayTimeDuration-from-date-002 0)475EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-date cbcl-subtract-dayTimeDuration-from-date-002 0)
536EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-dateTime cbcl-subtract-dayTimeDuration-from-dateTime-002 0)476EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-dateTime cbcl-subtract-dayTimeDuration-from-dateTime-002 0)
537EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-subtract-dayTimeDurations-003 0)477EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-subtract-dayTimeDurations-003 0)
@@ -546,9 +486,6 @@
546EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)486EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
547EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)487EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
548EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)488EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
549EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-015 0)
550EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-016 0)
551EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-017 0)
552EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)489EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
553EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)490EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
554EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)491EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
@@ -567,39 +504,11 @@
567EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-8 0)504EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-8 0)
568EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 0)505EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 0)
569EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 0)506EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 0)
570EXPECTED_FOTS_FAILURE (prod-AxisStep Axes085 0)
571EXPECTED_FOTS_FAILURE (prod-AxisStep Axes086 0)
572EXPECTED_FOTS_FAILURE (prod-AxisStep Axes089 0)
573EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0)507EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0)
574EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0)508EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0)
575EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0)509EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0)
576EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-wild-002 0)510EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-wild-002 0)
577EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-3 0)
578EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-5 0)
579EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-6 0)
580EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-8 0)
581EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-14 0)
582EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-16 0)
583EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-17 0)
584EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-18 0)
585EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-19 0)
586EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-20 0)
587EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-21 0)
588EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-25 0)
589EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor ancestor-15 0)
590EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-13 0)
591EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-15 0)
592EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self unabbreviatedSyntax-11 0)
593EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)511EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
594EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
595EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0)
596EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0)
597EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0)
598EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0)
599EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0)
600EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0)
601EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0)
602EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
603EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)512EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
604EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)513EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
605EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)514EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
@@ -626,29 +535,25 @@
626EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-23 0)535EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-23 0)
627EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-25 0)536EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-25 0)
628EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 0)537EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 0)
629EXPECTED_FOTS_FAILURE (prod-Comment XQueryComment012 0)538EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
539EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0)
540EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0)
541EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0)
542EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0)
543EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0)
544EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0)
545EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0)
546EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
630EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-51 0)547EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-51 0)
631EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-53 0)548EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-53 0)
632EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-58 0)549EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-58 0)
633EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)550EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)
634EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-012 0)
635EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-015 0)
636EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-022 0)
637EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-027 0)
638EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-031 0)
639EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-032 0)
640EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-033 0)
641EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-035 0)
642EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-036 0)
643EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-037 0)
644EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-039 0)551EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-039 0)
645EXPECTED_FOTS_FAILURE (prod-CompTextConstructor K2-ConText-4 0)
646EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-016 0)552EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-016 0)
647EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-017 0)553EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-017 0)
648EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-031 0)554EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-031 0)
649EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)555EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
650EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-049 0)556EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-049 0)
651EXPECTED_FOTS_FAILURE (prod-CopyNamespacesDecl K2-CopyNamespacesProlog-5 0)
652EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)557EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)
653EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)558EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)
654EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-14 0)559EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-14 0)
@@ -658,28 +563,11 @@
658EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-911err 0)563EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-911err 0)
659EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)564EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)
660EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)565EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
661EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-3 0)
662EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-4 0)
663EXPECTED_FOTS_FAILURE (prod-DirAttributeList DirectConElemAttr-1 0)
664EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-66 0)
665EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-38 0)
666EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-48 0)
667EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-49 0)
668EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-52 0)
669EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-53a 0)
670EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)566EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)
671EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-5 0)567EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-76 0)
672EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-6 0)568EXPECTED_FOTS_FAILURE (prod-EQName eqname-010 0)
673EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-40 0)569EXPECTED_FOTS_FAILURE (prod-EQName eqname-011 0)
674EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-56 0)
675EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-10 0)
676EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-12 0)
677EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-21 0)
678EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-22 0)
679EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0)570EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0)
680EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-2 0)
681EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-3 0)
682EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr004 0)
683EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0)571EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0)
684EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0)572EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0)
685EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0)573EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0)
@@ -704,9 +592,6 @@
704EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0)592EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0)
705EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)593EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
706EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)594EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
707EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0)
708EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0)
709EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr017 0)
710EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)595EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)
711EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)596EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)
712EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)597EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)
@@ -730,22 +615,22 @@
730EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-19 0)615EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-19 0)
731EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)616EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
732EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)617EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
733EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-circular 0)
734EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)618EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
735EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)619EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
736EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)620EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
737EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)621EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)
738EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)622EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)
739EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)623EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
740EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-30 0)624EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)
741EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-31 0)
742EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)625EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
743EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)626EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
744EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)627EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)
745EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)628EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)
746EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-025 0)
747EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026 0)629EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026 0)
630EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-027 0)
748EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-028 0)631EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-028 0)
632EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-029 0)
633EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-030 0)
749EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)634EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)
750EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)635EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)
751EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy20 0)636EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy20 0)
@@ -762,8 +647,6 @@
762EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-7p 0)647EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-7p 0)
763EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)648EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
764EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)649EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
765EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-5 0)
766EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-7 0)
767EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)650EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
768EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)651EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)
769EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)652EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)
@@ -797,15 +680,11 @@
797EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0)680EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0)
798EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)681EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
799EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)682EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
800EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr010 0)
801EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr016 0)
802EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema005 0)
803EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)683EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
804EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)684EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
805EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)685EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)
806EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040 0)686EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040 0)
807EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040a 0)687EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040a 0)
808EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema070 0)
809EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0)688EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0)
810EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0)689EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0)
811EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-003 0)690EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-003 0)
@@ -827,7 +706,6 @@
827EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)706EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)
828EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)707EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)
829EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)708EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)
830EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-35 0)
831EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-36 0)709EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-36 0)
832EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)710EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)
833EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)711EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)
@@ -844,12 +722,6 @@
844EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)722EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
845EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)723EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
846EXPECTED_FOTS_FAILURE (prod-VersionDecl version_declaration-023-v3 0)724EXPECTED_FOTS_FAILURE (prod-VersionDecl version_declaration-023-v3 0)
847EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr001 0)
848EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr003 0)
849EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr022 0)
850EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr024 0)
851EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr025 0)
852EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr026 0)
853EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase01S 0)725EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase01S 0)
854EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase02S 0)726EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase02S 0)
855EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase03S 0)727EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase03S 0)
856728
=== 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 15:40:32 +0000
@@ -451,7 +451,7 @@
451) as xs:string451) as xs:string
452{452{
453 if (empty($env))453 if (empty($env))
454 then 454 then
455 ""455 ""
456 else456 else
457 let $namespace := $env/fots:namespace[@uri eq $env/fots:schema/@uri]457 let $namespace := $env/fots:namespace[@uri eq $env/fots:schema/@uri]
458458
=== 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 15:40:32 +0000
@@ -37,6 +37,9 @@
37import module namespace util =37import module namespace util =
38 "http://www.zorba-xquery.com/fots-driver/util" at "util.xq";38 "http://www.zorba-xquery.com/fots-driver/util" at "util.xq";
3939
40import module namespace zorba-xml =
41 "http://www.zorba-xquery.com/modules/xml#2.1";
42
40declare namespace err =43declare namespace err =
41 "http://www.w3.org/2005/xqt-errors";44 "http://www.w3.org/2005/xqt-errors";
4245
@@ -256,7 +259,7 @@
256 } </result>259 } </result>
257 where every $result in $results satisfies $result/item260 where every $result in $results satisfies $result/item
258 return concat("'Assert-any-of' returned: ",261 return concat("'Assert-any-of' returned: ",
259 string-join(util:serialize-result($results/data(item)), ' '))262 fn:serialize($results/data(item), $util:serParamXml))
260};263};
261264
262265
@@ -482,17 +485,14 @@
482 $baseURI as xs:anyURI485 $baseURI as xs:anyURI
483)486)
484{487{
485(:TODO call xml-canonicalization after bug #1076919 is implemented.:)
486 try {488 try {
487 let $serRes := util:serialize-result($result),489 let $actualResult := zorba-xml:canonicalize(concat('<root>', fn:serialize($result, $util:serParamXml), '</root>'))
488 $result1 as xs:string := string-join($serRes,''),490 let $expectedResult := zorba-xml:canonicalize(concat('<root>', util:get-value($expResult, $baseURI, "assert-xml"), '</root>'))
489 $result2 as xs:string := string-join($serRes,' '),491
490 $expectedResult as xs:string := util:get-value($expResult, $baseURI, "assert-xml")
491 return492 return
492 if ((normalize-space($result1) eq normalize-space(string($expectedResult))) or493 if ($actualResult eq $expectedResult)
493 (normalize-space($result2) eq normalize-space(string($expectedResult))))
494 then ()494 then ()
495 else "'assert-xml' returned: result is different from the expected result."495 else concat("'assert-xml' returned: result &#xA;'", $actualResult, "'&#xA; is different from the expected result &#xA;'", $expectedResult,"'&#xA;")
496 } catch * {496 } catch * {
497 concat("'assert-xml' returned: fail with error ",497 concat("'assert-xml' returned: fail with error ",
498 $err:code, " : ", $err:description)498 $err:code, " : ", $err:description)
@@ -511,8 +511,7 @@
511) as xs:string?511) as xs:string?
512{512{
513 try {513 try {
514 let $serializedResult as xs:string := string-join(514 let $serializedResult as xs:string := fn:serialize($result, $util:serParamXml)
515 util:serialize-result($result), '')
516 return515 return
517 "'assert-serialization-error' returned: expected serialization error but got result."516 "'assert-serialization-error' returned: expected serialization error but got result."
518 } catch * {517 } catch * {
@@ -534,12 +533,8 @@
534) as xs:string?533) as xs:string?
535{534{
536 try {535 try {
537 let $serResult := string-join(util:serialize-result($result,536 let $serResult := fn:serialize($result, $util:serParamXml)
538 $util:serParamXml),537 let $serExpResult := fn:serialize($expResult, $util:serParamXml)
539 ''),
540 $serExpResult := string-join(util:serialize-result(data($expResult),
541 $util:serParamXml),
542 '')
543 let $matchesFlags := data($expResult/@flags)538 let $matchesFlags := data($expResult/@flags)
544 return539 return
545 if (exists($matchesFlags))540 if (exists($matchesFlags))
@@ -569,11 +564,11 @@
569) as xs:string?564) as xs:string?
570{565{
571 try {566 try {
572 let $serRes := string-join(util:serialize-result($result), ' '),567 let $serRes := string-join(for $r in $result return string($r), " ")
573 $res := if (empty($expResult[@normalize-space="true"]))568 let $res := if (empty($expResult[@normalize-space="true"]))
574 then $serRes569 then $serRes
575 else normalize-space($serRes),570 else normalize-space($serRes)
576 $expRes := if (empty($expResult[@normalize-space="true"]))571 let $expRes := if (empty($expResult[@normalize-space="true"]))
577 then xs:string($expResult)572 then xs:string($expResult)
578 else normalize-space(xs:string($expResult))573 else normalize-space(xs:string($expResult))
579 return574 return
580575
=== 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 15:40:32 +0000
@@ -318,6 +318,7 @@
318 for $testSet in $results//fots:test-set318 for $testSet in $results//fots:test-set
319 let $countFailures := count($testSet//fots:test-case[@result ="fail"])319 let $countFailures := count($testSet//fots:test-case[@result ="fail"])
320 let $testSetName := xs:string($testSet/@name)320 let $testSetName := xs:string($testSet/@name)
321 order by $testSetName
321 where $countFailures gt xs:integer(0)322 where $countFailures gt xs:integer(0)
322 return323 return
323 for $testCase in $testSet//fots:test-case[@result ="fail"]324 for $testCase in $testSet//fots:test-case[@result ="fail"]
324325
=== 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 15:40:32 +0000
@@ -121,26 +121,6 @@
121};121};
122122
123123
124declare function util:serialize-result(
125 $result as item()*
126) as xs:string*
127{
128 util:serialize-result($result, $util:serParamXml)
129};
130
131
132declare function util:serialize-result(
133 $result as item()*,
134 $SerParams
135) as xs:string*
136{
137 for $res in $result
138 return
139 if ($res instance of node())
140 then fn:serialize($res, $SerParams)
141 else fn:string($res)
142};
143
144declare %ann:sequential function util:write-query-to-file(124declare %ann:sequential function util:write-query-to-file(
145 $query as xs:string,125 $query as xs:string,
146 $queryName as xs:string126 $queryName as xs:string

Subscribers

People subscribed via source and target branches