Zorba

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

  1. fix_bug_1086398
  2. Merge into trunk
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 :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1086398-2013-03-12T14-03-44.003Z/log.html

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 :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1086398-2013-03-12T15-37-39.266Z/log.html

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 :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1086398-2013-03-12T19-56-38.931Z/log.html

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
1=== modified file 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-03-07 12:35:29 +0000
3+++ test/fots/CMakeLists.txt 2013-03-12 15:40:32 +0000
4@@ -123,24 +123,11 @@
5 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
6 EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)
7 EXPECTED_FOTS_FAILURE (app-Demos itunes 0)
8-EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-number-all 0)
9-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-1 0)
10-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-all 0)
11 EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0)
12-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-as-numeric-all 0)
13-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-case-insensitive-all 0)
14-EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-all 0)
15-EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q5 0)
16-EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q8 0)
17-EXPECTED_FOTS_FAILURE (app-XMark XMark-Q3 0)
18-EXPECTED_FOTS_FAILURE (app-XMark XMark-All 0)
19 EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)
20 EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0)
21 EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-002 0)
22 EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-003 0)
23-EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-008 0)
24-EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017 0)
25-EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017a 0)
26 EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
27 EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-002 0)
28 EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-003 0)
29@@ -168,8 +155,6 @@
30 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)
31 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)
32 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-003 0)
33-EXPECTED_FOTS_FAILURE (fn-doc fn-doc-25 0)
34-EXPECTED_FOTS_FAILURE (fn-doc fn-doc-33 0)
35 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0)
36 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0)
37 EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0)
38@@ -317,8 +302,6 @@
39 EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-20 0)
40 EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-21 0)
41 EXPECTED_FOTS_FAILURE (fn-id fn-id-dtd-23 0)
42-EXPECTED_FOTS_FAILURE (fn-id K2-SeqIDFunc-11 0)
43-EXPECTED_FOTS_FAILURE (fn-id K2-SeqIDFunc-12 0)
44 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-5 0)
45 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-7 0)
46 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-8 0)
47@@ -336,13 +319,7 @@
48 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-23 0)
49 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-24 0)
50 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-25 0)
51-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-11 0)
52-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-12 0)
53-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-18 0)
54-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-26 0)
55-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-28 0)
56 EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0)
57-EXPECTED_FOTS_FAILURE (fn-last last-11 0)
58 EXPECTED_FOTS_FAILURE (fn-last last-24 0)
59 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
60 EXPECTED_FOTS_FAILURE (fn-matches.re re00056 1131984)
61@@ -376,9 +353,6 @@
62 EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 0)
63 EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 0)
64 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-001 0)
65-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-010 0)
66-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-011 0)
67-EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-012 0)
68 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 0)
69 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-017 0)
70 EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-020 0)
71@@ -386,7 +360,6 @@
72 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-34 0)
73 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-35 0)
74 EXPECTED_FOTS_FAILURE (fn-replace fn-replace-42 0)
75-EXPECTED_FOTS_FAILURE (fn-replace K2-ReplaceFunc-8 0)
76 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-26 0)
77 EXPECTED_FOTS_FAILURE (fn-resolve-uri fn-resolve-uri-28 0)
78 EXPECTED_FOTS_FAILURE (fn-round-half-to-even fn-round-half-to-even-9 0)
79@@ -425,7 +398,6 @@
80 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-037 0)
81 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-038 0)
82 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-039 0)
83-EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-040 0)
84 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-042 0)
85 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-049 0)
86 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-050 0)
87@@ -463,34 +435,6 @@
88 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
89 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)
90 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)
91-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-5 0)
92-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-7 0)
93-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-8 0)
94-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-9 0)
95-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-12 0)
96-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-13 0)
97-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-15 0)
98-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-16 0)
99-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-17 0)
100-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-18 0)
101-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-19 0)
102-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-20 0)
103-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-21 0)
104-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-23 0)
105-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-5 0)
106-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-7 0)
107-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-8 0)
108-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-9 0)
109-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-15 0)
110-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-16 0)
111-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-17 0)
112-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-18 0)
113-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-19 0)
114-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-20 0)
115-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-21 0)
116-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-23 0)
117-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-30 0)
118-EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-31 0)
119 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 0)
120 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-2 0)
121 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-3 0)
122@@ -501,14 +445,13 @@
123 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0)
124 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
125 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
126-EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-5ed-Included-char-1 0)
127 EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
128+EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0)
129+EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0)
130 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0)
131 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0)
132 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0)
133 EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-008 0)
134-EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0)
135-EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0)
136 EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-date cbcl-add-yearMonthDuration-to-date-003 0)
137 EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-dateTime cbcl-add-yearMonthDuration-to-dateTime-003 0)
138 EXPECTED_FOTS_FAILURE (op-date-greater-than cbcl-date-gt-001 0)
139@@ -521,17 +464,14 @@
140 EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-003 0)
141 EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration cbcl-divide-yearMonthDuration-003 0)
142 EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0)
143-EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-002 0)
144-EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-015 0)
145-EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-016 0)
146+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
147+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)
148+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0)
149+EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0)
150 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-001 0)
151 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-002 0)
152 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-003 0)
153 EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-004 0)
154-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0)
155-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0)
156-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0)
157-EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0)
158 EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-date cbcl-subtract-dayTimeDuration-from-date-002 0)
159 EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-dateTime cbcl-subtract-dayTimeDuration-from-dateTime-002 0)
160 EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-subtract-dayTimeDurations-003 0)
161@@ -546,9 +486,6 @@
162 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
163 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
164 EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
165-EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-015 0)
166-EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-016 0)
167-EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-017 0)
168 EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
169 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
170 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
171@@ -567,39 +504,11 @@
172 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-8 0)
173 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 0)
174 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 0)
175-EXPECTED_FOTS_FAILURE (prod-AxisStep Axes085 0)
176-EXPECTED_FOTS_FAILURE (prod-AxisStep Axes086 0)
177-EXPECTED_FOTS_FAILURE (prod-AxisStep Axes089 0)
178 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0)
179 EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0)
180 EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0)
181 EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-wild-002 0)
182-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-3 0)
183-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-5 0)
184-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-6 0)
185-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-8 0)
186-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-14 0)
187-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-16 0)
188-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-17 0)
189-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-18 0)
190-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-19 0)
191-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-20 0)
192-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-21 0)
193-EXPECTED_FOTS_FAILURE (prod-AxisStep.abbr abbreviatedSyntax-25 0)
194-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor ancestor-15 0)
195-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-13 0)
196-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-15 0)
197-EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self unabbreviatedSyntax-11 0)
198 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0)
199-EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
200-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0)
201-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0)
202-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0)
203-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0)
204-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0)
205-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0)
206-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0)
207-EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
208 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
209 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
210 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
211@@ -626,29 +535,25 @@
212 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-23 0)
213 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-25 0)
214 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 0)
215-EXPECTED_FOTS_FAILURE (prod-Comment XQueryComment012 0)
216+EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
217+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0)
218+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0)
219+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0)
220+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0)
221+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0)
222+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0)
223+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0)
224+EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
225 EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-51 0)
226 EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-53 0)
227 EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-58 0)
228 EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)
229-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-012 0)
230-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-015 0)
231-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-022 0)
232-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-027 0)
233-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-031 0)
234-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-032 0)
235-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-033 0)
236-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-035 0)
237-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-036 0)
238-EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-037 0)
239 EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-039 0)
240-EXPECTED_FOTS_FAILURE (prod-CompTextConstructor K2-ConText-4 0)
241 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-016 0)
242 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-017 0)
243 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-031 0)
244 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
245 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-049 0)
246-EXPECTED_FOTS_FAILURE (prod-CopyNamespacesDecl K2-CopyNamespacesProlog-5 0)
247 EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)
248 EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)
249 EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-14 0)
250@@ -658,28 +563,11 @@
251 EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-911err 0)
252 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)
253 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
254-EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-3 0)
255-EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-4 0)
256-EXPECTED_FOTS_FAILURE (prod-DirAttributeList DirectConElemAttr-1 0)
257-EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-66 0)
258-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-38 0)
259-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-48 0)
260-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-49 0)
261-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-52 0)
262-EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-53a 0)
263 EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)
264-EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-5 0)
265-EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-6 0)
266-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-40 0)
267-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-56 0)
268-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-10 0)
269-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-12 0)
270-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-21 0)
271-EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-22 0)
272+EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-76 0)
273+EXPECTED_FOTS_FAILURE (prod-EQName eqname-010 0)
274+EXPECTED_FOTS_FAILURE (prod-EQName eqname-011 0)
275 EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0)
276-EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-2 0)
277-EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-3 0)
278-EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr004 0)
279 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0)
280 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0)
281 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0)
282@@ -704,9 +592,6 @@
283 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0)
284 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
285 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
286-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0)
287-EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0)
288-EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr017 0)
289 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0)
290 EXPECTED_FOTS_FAILURE (prod-InstanceofExpr cbcl-instance-of-001 0)
291 EXPECTED_FOTS_FAILURE (prod-LetClause LetExpr020a 0)
292@@ -730,22 +615,22 @@
293 EXPECTED_FOTS_FAILURE (prod-ModuleImport module-URIs-19 0)
294 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
295 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
296-EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-circular 0)
297 EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
298 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
299 EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
300 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0)
301 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0)
302 EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
303-EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-30 0)
304-EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-31 0)
305+EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0)
306 EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
307 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
308 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)
309 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)
310-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-025 0)
311 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026 0)
312+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-027 0)
313 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-028 0)
314+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-029 0)
315+EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-030 0)
316 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)
317 EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)
318 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy20 0)
319@@ -762,8 +647,6 @@
320 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-7p 0)
321 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0)
322 EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0)
323-EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-5 0)
324-EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-7 0)
325 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
326 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0)
327 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0)
328@@ -797,15 +680,11 @@
329 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0)
330 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
331 EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0)
332-EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr010 0)
333-EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr016 0)
334-EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema005 0)
335 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0)
336 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
337 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0)
338 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040 0)
339 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040a 0)
340-EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema070 0)
341 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0)
342 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0)
343 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-003 0)
344@@ -827,7 +706,6 @@
345 EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0)
346 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0)
347 EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0)
348-EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-35 0)
349 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-36 0)
350 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0)
351 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0)
352@@ -844,12 +722,6 @@
353 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
354 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
355 EXPECTED_FOTS_FAILURE (prod-VersionDecl version_declaration-023-v3 0)
356-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr001 0)
357-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr003 0)
358-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr022 0)
359-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr024 0)
360-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr025 0)
361-EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr026 0)
362 EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase01S 0)
363 EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase02S 0)
364 EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase03S 0)
365
366=== modified file 'test/fots_driver/environment.xq'
367--- test/fots_driver/environment.xq 2013-02-26 05:21:15 +0000
368+++ test/fots_driver/environment.xq 2013-03-12 15:40:32 +0000
369@@ -451,7 +451,7 @@
370 ) as xs:string
371 {
372 if (empty($env))
373- then
374+ then
375 ""
376 else
377 let $namespace := $env/fots:namespace[@uri eq $env/fots:schema/@uri]
378
379=== modified file 'test/fots_driver/evaluate.xq'
380--- test/fots_driver/evaluate.xq 2013-02-26 06:30:28 +0000
381+++ test/fots_driver/evaluate.xq 2013-03-12 15:40:32 +0000
382@@ -37,6 +37,9 @@
383 import module namespace util =
384 "http://www.zorba-xquery.com/fots-driver/util" at "util.xq";
385
386+import module namespace zorba-xml =
387+ "http://www.zorba-xquery.com/modules/xml#2.1";
388+
389 declare namespace err =
390 "http://www.w3.org/2005/xqt-errors";
391
392@@ -256,7 +259,7 @@
393 } </result>
394 where every $result in $results satisfies $result/item
395 return concat("'Assert-any-of' returned: ",
396- string-join(util:serialize-result($results/data(item)), ' '))
397+ fn:serialize($results/data(item), $util:serParamXml))
398 };
399
400
401@@ -482,17 +485,14 @@
402 $baseURI as xs:anyURI
403 )
404 {
405-(:TODO call xml-canonicalization after bug #1076919 is implemented.:)
406 try {
407- let $serRes := util:serialize-result($result),
408- $result1 as xs:string := string-join($serRes,''),
409- $result2 as xs:string := string-join($serRes,' '),
410- $expectedResult as xs:string := util:get-value($expResult, $baseURI, "assert-xml")
411+ let $actualResult := zorba-xml:canonicalize(concat('<root>', fn:serialize($result, $util:serParamXml), '</root>'))
412+ let $expectedResult := zorba-xml:canonicalize(concat('<root>', util:get-value($expResult, $baseURI, "assert-xml"), '</root>'))
413+
414 return
415- if ((normalize-space($result1) eq normalize-space(string($expectedResult))) or
416- (normalize-space($result2) eq normalize-space(string($expectedResult))))
417+ if ($actualResult eq $expectedResult)
418 then ()
419- else "'assert-xml' returned: result is different from the expected result."
420+ else concat("'assert-xml' returned: result &#xA;'", $actualResult, "'&#xA; is different from the expected result &#xA;'", $expectedResult,"'&#xA;")
421 } catch * {
422 concat("'assert-xml' returned: fail with error ",
423 $err:code, " : ", $err:description)
424@@ -511,8 +511,7 @@
425 ) as xs:string?
426 {
427 try {
428- let $serializedResult as xs:string := string-join(
429- util:serialize-result($result), '')
430+ let $serializedResult as xs:string := fn:serialize($result, $util:serParamXml)
431 return
432 "'assert-serialization-error' returned: expected serialization error but got result."
433 } catch * {
434@@ -534,12 +533,8 @@
435 ) as xs:string?
436 {
437 try {
438- let $serResult := string-join(util:serialize-result($result,
439- $util:serParamXml),
440- ''),
441- $serExpResult := string-join(util:serialize-result(data($expResult),
442- $util:serParamXml),
443- '')
444+ let $serResult := fn:serialize($result, $util:serParamXml)
445+ let $serExpResult := fn:serialize($expResult, $util:serParamXml)
446 let $matchesFlags := data($expResult/@flags)
447 return
448 if (exists($matchesFlags))
449@@ -569,11 +564,11 @@
450 ) as xs:string?
451 {
452 try {
453- let $serRes := string-join(util:serialize-result($result), ' '),
454- $res := if (empty($expResult[@normalize-space="true"]))
455+ let $serRes := string-join(for $r in $result return string($r), " ")
456+ let $res := if (empty($expResult[@normalize-space="true"]))
457 then $serRes
458- else normalize-space($serRes),
459- $expRes := if (empty($expResult[@normalize-space="true"]))
460+ else normalize-space($serRes)
461+ let $expRes := if (empty($expResult[@normalize-space="true"]))
462 then xs:string($expResult)
463 else normalize-space(xs:string($expResult))
464 return
465
466=== modified file 'test/fots_driver/reporting.xq'
467--- test/fots_driver/reporting.xq 2013-02-27 12:14:01 +0000
468+++ test/fots_driver/reporting.xq 2013-03-12 15:40:32 +0000
469@@ -318,6 +318,7 @@
470 for $testSet in $results//fots:test-set
471 let $countFailures := count($testSet//fots:test-case[@result ="fail"])
472 let $testSetName := xs:string($testSet/@name)
473+ order by $testSetName
474 where $countFailures gt xs:integer(0)
475 return
476 for $testCase in $testSet//fots:test-case[@result ="fail"]
477
478=== modified file 'test/fots_driver/util.xq'
479--- test/fots_driver/util.xq 2013-02-27 11:47:33 +0000
480+++ test/fots_driver/util.xq 2013-03-12 15:40:32 +0000
481@@ -121,26 +121,6 @@
482 };
483
484
485-declare function util:serialize-result(
486- $result as item()*
487-) as xs:string*
488-{
489- util:serialize-result($result, $util:serParamXml)
490-};
491-
492-
493-declare function util:serialize-result(
494- $result as item()*,
495- $SerParams
496-) as xs:string*
497-{
498- for $res in $result
499- return
500- if ($res instance of node())
501- then fn:serialize($res, $SerParams)
502- else fn:string($res)
503-};
504-
505 declare %ann:sequential function util:write-query-to-file(
506 $query as xs:string,
507 $queryName as xs:string

Subscribers

People subscribed via source and target branches