Merge lp:~zorba-coders/zorba/fix_bug_1018737 into lp:zorba
- fix_bug_1018737
- Merge into trunk
Proposed by
Sorin Marian Nasoi
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sorin Marian Nasoi | ||||
Approved revision: | 10900 | ||||
Merged at revision: | 10956 | ||||
Proposed branch: | lp:~zorba-coders/zorba/fix_bug_1018737 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
570 lines (+166/-61) 8 files modified
doc/zorba/conformance.dox (+19/-15) doc/zorba/conformanceXQFTTS.dox (+7/-6) doc/zorba/conformanceXQTS.dox (+8/-8) doc/zorba/conformanceXQUTS.dox (+9/-8) scripts/sanity_checks/README.txt (+19/-5) scripts/sanity_checks/conformance_xqftts.xqi (+33/-4) scripts/sanity_checks/conformance_xqts.xqi (+36/-9) scripts/sanity_checks/conformance_xquts.xqi (+35/-6) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/fix_bug_1018737 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Candillon | Approve | ||
Sorin Marian Nasoi | Approve | ||
Review via email: mp+116609@code.launchpad.net |
Commit message
- added information about the Zorba and XQTS versions that were used in generating the reports
- updated the README.txt with info regarding conformance reports generation
Description of the change
- added information about the Zorba and XQTS versions that were used in generating the reports
- updated the README.txt with info regarding conformance reports generation
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
William Candillon (wcandillon) : | # |
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_
All tests succeeded!
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'doc/zorba/conformance.dox' | |||
2 | --- doc/zorba/conformance.dox 2012-07-24 08:48:48 +0000 | |||
3 | +++ doc/zorba/conformance.dox 2012-07-25 09:24:20 +0000 | |||
4 | @@ -59,6 +59,7 @@ | |||
5 | 59 | 59 | ||
6 | 60 | 60 | ||
7 | 61 | This is the W3C XQuery 1.0 conformance summary: | 61 | This is the W3C XQuery 1.0 conformance summary: |
8 | 62 | In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQTS version 'current' (XQTS taken from W3C CVS as of 2012-01-12). | ||
9 | 62 | <table bgcolor="lightcyan"> | 63 | <table bgcolor="lightcyan"> |
10 | 63 | <tr> | 64 | <tr> |
11 | 64 | <td>W3C XQuery 1.0 features</td> | 65 | <td>W3C XQuery 1.0 features</td> |
12 | @@ -73,18 +74,18 @@ | |||
13 | 73 | <tr bgcolor="lightcyan"> | 74 | <tr bgcolor="lightcyan"> |
14 | 74 | <td bgcolor="lightcyan">Minimal Conformance</td> | 75 | <td bgcolor="lightcyan">Minimal Conformance</td> |
15 | 75 | <td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td> | 76 | <td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td> |
17 | 76 | <td align="center" bgcolor="palegreen">17497/17499<br />99.99%</td> | 77 | <td align="center" bgcolor="palegreen">17495/17499<br />99.98%</td> |
18 | 77 | </tr> | 78 | </tr> |
19 | 78 | <tr bgcolor="lightcyan"> | 79 | <tr bgcolor="lightcyan"> |
20 | 79 | <td bgcolor="lightcyan">Optional Features</td> | 80 | <td bgcolor="lightcyan">Optional Features</td> |
23 | 80 | <td align="center" bgcolor="palegreen">538/540<br />99.63%</td> | 81 | <td align="center" bgcolor="palegreen">539/540<br />99.81%</td> |
24 | 81 | <td align="center" bgcolor="palegreen">538/540<br />99.63%</td> | 82 | <td align="center" bgcolor="palegreen">539/540<br />99.81%</td> |
25 | 82 | </tr> | 83 | </tr> |
26 | 83 | <tr bgcolor="lightcyan"> | 84 | <tr bgcolor="lightcyan"> |
27 | 84 | <td bgcolor="lightcyan"> Schema Import Feature</td> | 85 | <td bgcolor="lightcyan"> Schema Import Feature</td> |
29 | 85 | <td align="center" bgcolor="palegreen">178/179<br /> | 86 | <td align="center" bgcolor="mediumseagreen">179/179<br /> |
30 | 86 | </td> | 87 | </td> |
32 | 87 | <td align="center" bgcolor="palegreen">178/179<br /> | 88 | <td align="center" bgcolor="mediumseagreen">179/179<br /> |
33 | 88 | </td> | 89 | </td> |
34 | 89 | </tr> | 90 | </tr> |
35 | 90 | <tr bgcolor="lightcyan"> | 91 | <tr bgcolor="lightcyan"> |
36 | @@ -145,7 +146,7 @@ | |||
37 | 145 | <td align="center" bgcolor="mediumseagreen">21/21<br />100%</td> | 146 | <td align="center" bgcolor="mediumseagreen">21/21<br />100%</td> |
38 | 146 | </tr> | 147 | </tr> |
39 | 147 | <tr bgcolor="lightcyan"> | 148 | <tr bgcolor="lightcyan"> |
41 | 148 | <td bgcolor="lightcyan">FunctX -- A Collection of Functions</td> | 149 | <td bgcolor="lightcyan">FunctX -- A Collection Of Functions</td> |
42 | 149 | <td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td> | 150 | <td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td> |
43 | 150 | <td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td> | 151 | <td align="center" bgcolor="mediumseagreen">1127/1127<br />100%</td> |
44 | 151 | </tr> | 152 | </tr> |
45 | @@ -179,6 +180,7 @@ | |||
46 | 179 | </table> | 180 | </table> |
47 | 180 | 181 | ||
48 | 181 | This is the W3C XQuery Update Facility 1.0 conformance summary: | 182 | This is the W3C XQuery Update Facility 1.0 conformance summary: |
49 | 183 | In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQUTS version 'current' (XQUTS version taken from CVS as of 2012-01-12). | ||
50 | 182 | <table bgcolor="lightcyan"> | 184 | <table bgcolor="lightcyan"> |
51 | 183 | <tr> | 185 | <tr> |
52 | 184 | <td>W3C XQuery Update Facility 1.0 feature</td> | 186 | <td>W3C XQuery Update Facility 1.0 feature</td> |
53 | @@ -215,14 +217,14 @@ | |||
54 | 215 | </tr> | 217 | </tr> |
55 | 216 | <tr bgcolor="lightcyan"> | 218 | <tr bgcolor="lightcyan"> |
56 | 217 | <td bgcolor="lightcyan">Optional Features</td> | 219 | <td bgcolor="lightcyan">Optional Features</td> |
59 | 218 | <td align="center" bgcolor="palegreen">99/126<br />78.57%</td> | 220 | <td align="center" bgcolor="palegreen">97/126<br />76.98%</td> |
60 | 219 | <td align="center" bgcolor="palegreen">99/126<br />78.57%</td> | 221 | <td align="center" bgcolor="palegreen">97/126<br />76.98%</td> |
61 | 220 | </tr> | 222 | </tr> |
62 | 221 | <tr bgcolor="lightcyan"> | 223 | <tr bgcolor="lightcyan"> |
63 | 222 | <td bgcolor="lightcyan"> Revalidation</td> | 224 | <td bgcolor="lightcyan"> Revalidation</td> |
65 | 223 | <td align="center" bgcolor="mediumseagreen">77/77<br /> | 225 | <td align="center" bgcolor="palegreen">76/77<br /> |
66 | 224 | </td> | 226 | </td> |
68 | 225 | <td align="center" bgcolor="mediumseagreen">77/77<br /> | 227 | <td align="center" bgcolor="palegreen">76/77<br /> |
69 | 226 | </td> | 228 | </td> |
70 | 227 | </tr> | 229 | </tr> |
71 | 228 | <tr bgcolor="lightcyan"> | 230 | <tr bgcolor="lightcyan"> |
72 | @@ -241,9 +243,9 @@ | |||
73 | 241 | </tr> | 243 | </tr> |
74 | 242 | <tr bgcolor="lightcyan"> | 244 | <tr bgcolor="lightcyan"> |
75 | 243 | <td bgcolor="lightcyan"> fn:put applied to nodes other than document and element nodes</td> | 245 | <td bgcolor="lightcyan"> fn:put applied to nodes other than document and element nodes</td> |
77 | 244 | <td align="center" bgcolor="mediumseagreen">8/8<br /> | 246 | <td align="center" bgcolor="palegreen">7/8<br /> |
78 | 245 | </td> | 247 | </td> |
80 | 246 | <td align="center" bgcolor="mediumseagreen">8/8<br /> | 248 | <td align="center" bgcolor="palegreen">7/8<br /> |
81 | 247 | </td> | 249 | </td> |
82 | 248 | </tr> | 250 | </tr> |
83 | 249 | <tr bgcolor="lightcyan"> | 251 | <tr bgcolor="lightcyan"> |
84 | @@ -331,6 +333,8 @@ | |||
85 | 331 | </table> | 333 | </table> |
86 | 332 | 334 | ||
87 | 333 | This is the W3C XQuery and XPath Full Text 1.0 conformance summary: | 335 | This is the W3C XQuery and XPath Full Text 1.0 conformance summary: |
88 | 336 | In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQFTTS version 'current' (XQFTTS taken from W3C CVS as of 2012-01-12). | ||
89 | 337 | |||
90 | 334 | <table bgcolor="lightcyan"> | 338 | <table bgcolor="lightcyan"> |
91 | 335 | <tr> | 339 | <tr> |
92 | 336 | <td>W3C XQuery and XPath Full Text 1.0 features</td> | 340 | <td>W3C XQuery and XPath Full Text 1.0 features</td> |
93 | @@ -344,7 +348,7 @@ | |||
94 | 344 | </tr> | 348 | </tr> |
95 | 345 | <tr bgcolor="lightcyan"> | 349 | <tr bgcolor="lightcyan"> |
96 | 346 | <td bgcolor="lightcyan">Minimal Conformance</td> | 350 | <td bgcolor="lightcyan">Minimal Conformance</td> |
98 | 347 | <td align="center" bgcolor="palegreen">385/429<br />89.74%</td> | 351 | <td align="center" bgcolor="palegreen">384/429<br />89.51%</td> |
99 | 348 | <td align="center" bgcolor="palegreen">374/429<br />87.18%</td> | 352 | <td align="center" bgcolor="palegreen">374/429<br />87.18%</td> |
100 | 349 | </tr> | 353 | </tr> |
101 | 350 | <tr bgcolor="lightcyan"> | 354 | <tr bgcolor="lightcyan"> |
102 | @@ -354,8 +358,8 @@ | |||
103 | 354 | </tr> | 358 | </tr> |
104 | 355 | <tr bgcolor="lightcyan"> | 359 | <tr bgcolor="lightcyan"> |
105 | 356 | <td bgcolor="lightcyan">Use Cases</td> | 360 | <td bgcolor="lightcyan">Use Cases</td> |
108 | 357 | <td align="center" bgcolor="palegreen">121/135<br />89.63%</td> | 361 | <td align="center" bgcolor="palegreen">120/135<br />88.89%</td> |
109 | 358 | <td align="center" bgcolor="palegreen">103/135<br />76.3%</td> | 362 | <td align="center" bgcolor="palegreen">102/135<br />75.56%</td> |
110 | 359 | </tr> | 363 | </tr> |
111 | 360 | <tr bgcolor="lightcyan"> | 364 | <tr bgcolor="lightcyan"> |
112 | 361 | <td bgcolor="lightcyan">Consistency in XQFTTS Catalog</td> | 365 | <td bgcolor="lightcyan">Consistency in XQFTTS Catalog</td> |
113 | 362 | 366 | ||
114 | === modified file 'doc/zorba/conformanceXQFTTS.dox' | |||
115 | --- doc/zorba/conformanceXQFTTS.dox 2012-07-24 08:48:48 +0000 | |||
116 | +++ doc/zorba/conformanceXQFTTS.dox 2012-07-25 09:24:20 +0000 | |||
117 | @@ -1,6 +1,7 @@ | |||
119 | 1 | /** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance | 1 | /** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance. |
120 | 2 | 2 | ||
122 | 3 | Zorba achieves 89.74% on minimal conformance (84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite. | 3 | In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQFTTS version 'current' (XQFTTS taken from W3C CVS as of 2012-01-12). |
123 | 4 | Zorba achieves 89.51% on minimal conformance (and 84.8% on Optional Features) for the W3C XPath Full Text 1.0 Test Suite. | ||
124 | 4 | 5 | ||
125 | 5 | Please see the table below for more details. | 6 | Please see the table below for more details. |
126 | 6 | <table bgcolor="lightcyan"> | 7 | <table bgcolor="lightcyan"> |
127 | @@ -236,7 +237,7 @@ | |||
128 | 236 | </tr> | 237 | </tr> |
129 | 237 | <tr bgcolor="lightcyan"> | 238 | <tr bgcolor="lightcyan"> |
130 | 238 | <td bgcolor="lightcyan"> Full-Text Thesaurus Match Option</td> | 239 | <td bgcolor="lightcyan"> Full-Text Thesaurus Match Option</td> |
132 | 239 | <td align="center" bgcolor="mediumseagreen">10/10</td> | 240 | <td align="center" bgcolor="palegreen">9/10</td> |
133 | 240 | <td align="center" bgcolor="palegreen">7/10</td> | 241 | <td align="center" bgcolor="palegreen">7/10</td> |
134 | 241 | </tr> | 242 | </tr> |
135 | 242 | <tr bgcolor="lightcyan"> | 243 | <tr bgcolor="lightcyan"> |
136 | @@ -466,8 +467,8 @@ | |||
137 | 466 | </tr> | 467 | </tr> |
138 | 467 | <tr bgcolor="lightcyan"> | 468 | <tr bgcolor="lightcyan"> |
139 | 468 | <td bgcolor="lightcyan"> Use Case "FULL-TEXT-COMPOSABILITY"</td> | 469 | <td bgcolor="lightcyan"> Use Case "FULL-TEXT-COMPOSABILITY"</td> |
142 | 469 | <td align="center" bgcolor="palegreen">6/7</td> | 470 | <td align="center" bgcolor="palegreen">5/7</td> |
143 | 470 | <td align="center" bgcolor="palegreen">4/7</td> | 471 | <td align="center" bgcolor="palegreen">3/7</td> |
144 | 471 | </tr> | 472 | </tr> |
145 | 472 | <tr bgcolor="lightcyan"> | 473 | <tr bgcolor="lightcyan"> |
146 | 473 | <td bgcolor="lightcyan"> Use Case "XQUERY-XPATH-COMPOSABILITY"</td> | 474 | <td bgcolor="lightcyan"> Use Case "XQUERY-XPATH-COMPOSABILITY"</td> |
147 | @@ -485,4 +486,4 @@ | |||
148 | 485 | <td align="center" bgcolor="mediumseagreen">3/3</td> | 486 | <td align="center" bgcolor="mediumseagreen">3/3</td> |
149 | 486 | </tr> | 487 | </tr> |
150 | 487 | </table> | 488 | </table> |
152 | 488 | */ | 489 | */ |
153 | 489 | \ No newline at end of file | 490 | \ No newline at end of file |
154 | 490 | 491 | ||
155 | === modified file 'doc/zorba/conformanceXQTS.dox' | |||
156 | --- doc/zorba/conformanceXQTS.dox 2012-07-24 08:48:48 +0000 | |||
157 | +++ doc/zorba/conformanceXQTS.dox 2012-07-25 09:24:20 +0000 | |||
158 | @@ -1,8 +1,8 @@ | |||
159 | 1 | /** \page conformanceXQTS W3C XQuery 1.0 Conformance | 1 | /** \page conformanceXQTS W3C XQuery 1.0 Conformance |
160 | 2 | 2 | ||
164 | 3 | Zorba achieves 99.99% on minimal conformance (and 99.63% on Optional Features) for the W3C XML Query Test Suite. | 3 | In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQTS version 'current' (XQTS taken from W3C CVS as of 2012-01-12). |
165 | 4 | Please see the table below for more details. | 4 | Zorba achieves 99.99% on minimal conformance (and 99.81% on Optional Features) for the W3C XML Query Test Suite. |
166 | 5 | 5 | Please see the table below for more details. | |
167 | 6 | <table bgcolor="lightcyan"> | 6 | <table bgcolor="lightcyan"> |
168 | 7 | <tr> | 7 | <tr> |
169 | 8 | <td>W3C XQuery 1.0 features</td> | 8 | <td>W3C XQuery 1.0 features</td> |
170 | @@ -687,12 +687,12 @@ | |||
171 | 687 | <tr bgcolor="lightcyan"> | 687 | <tr bgcolor="lightcyan"> |
172 | 688 | <td bgcolor="lightcyan"> Content</td> | 688 | <td bgcolor="lightcyan"> Content</td> |
173 | 689 | <td align="center" bgcolor="mediumseagreen">126/126</td> | 689 | <td align="center" bgcolor="mediumseagreen">126/126</td> |
175 | 690 | <td align="center" bgcolor="mediumseagreen">126/126</td> | 690 | <td align="center" bgcolor="palegreen">125/126</td> |
176 | 691 | </tr> | 691 | </tr> |
177 | 692 | <tr bgcolor="lightcyan"> | 692 | <tr bgcolor="lightcyan"> |
178 | 693 | <td bgcolor="lightcyan"> White Space Element Content</td> | 693 | <td bgcolor="lightcyan"> White Space Element Content</td> |
179 | 694 | <td align="center" bgcolor="mediumseagreen">83/83</td> | 694 | <td align="center" bgcolor="mediumseagreen">83/83</td> |
181 | 695 | <td align="center" bgcolor="mediumseagreen">83/83</td> | 695 | <td align="center" bgcolor="palegreen">82/83</td> |
182 | 696 | </tr> | 696 | </tr> |
183 | 697 | <tr bgcolor="lightcyan"> | 697 | <tr bgcolor="lightcyan"> |
184 | 698 | <td bgcolor="lightcyan"> Other Direct Constructors</td> | 698 | <td bgcolor="lightcyan"> Other Direct Constructors</td> |
185 | @@ -1721,8 +1721,8 @@ | |||
186 | 1721 | </tr> | 1721 | </tr> |
187 | 1722 | <tr bgcolor="lightcyan"> | 1722 | <tr bgcolor="lightcyan"> |
188 | 1723 | <td bgcolor="lightcyan"> Schema Import</td> | 1723 | <td bgcolor="lightcyan"> Schema Import</td> |
191 | 1724 | <td align="center" bgcolor="palegreen">30/31</td> | 1724 | <td align="center" bgcolor="mediumseagreen">31/31</td> |
192 | 1725 | <td align="center" bgcolor="palegreen">30/31</td> | 1725 | <td align="center" bgcolor="mediumseagreen">31/31</td> |
193 | 1726 | </tr> | 1726 | </tr> |
194 | 1727 | <tr bgcolor="lightcyan"> | 1727 | <tr bgcolor="lightcyan"> |
195 | 1728 | <td bgcolor="lightcyan"> FOR Clause with TypeDeclaration</td> | 1728 | <td bgcolor="lightcyan"> FOR Clause with TypeDeclaration</td> |
196 | @@ -3165,4 +3165,4 @@ | |||
197 | 3165 | <td align="center" bgcolor="mediumseagreen">3/3</td> | 3165 | <td align="center" bgcolor="mediumseagreen">3/3</td> |
198 | 3166 | </tr> | 3166 | </tr> |
199 | 3167 | </table> | 3167 | </table> |
201 | 3168 | */ | 3168 | */ |
202 | 3169 | \ No newline at end of file | 3169 | \ No newline at end of file |
203 | 3170 | 3170 | ||
204 | === modified file 'doc/zorba/conformanceXQUTS.dox' | |||
205 | --- doc/zorba/conformanceXQUTS.dox 2012-07-24 08:48:48 +0000 | |||
206 | +++ doc/zorba/conformanceXQUTS.dox 2012-07-25 09:24:20 +0000 | |||
207 | @@ -1,8 +1,9 @@ | |||
208 | 1 | /** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance | 1 | /** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance |
209 | 2 | 2 | ||
213 | 3 | Zorba achieves 100% on minimal conformance (and 78.57% on Optional Features) for the XQuery Update Facility Test Suite. | 3 | In generating the report we used Zorba version 2.5 that can be downloaded from https://launchpad.net/zorba/trunk/2.5 and XQUTS version 'current' (XQUTS version taken from CVS as of 2012-01-12). |
214 | 4 | Please see the table below for more details. | 4 | Zorba achieves 100% on minimal conformance (and 76.98% on Optional Features) for the W3C XQuery Update Facility Test Suite. |
215 | 5 | 5 | ||
216 | 6 | Please see the table below for more details. | ||
217 | 6 | <table bgcolor="lightcyan"> | 7 | <table bgcolor="lightcyan"> |
218 | 7 | <tr> | 8 | <tr> |
219 | 8 | <td>W3C XQuery Update Facility 1.0 features</td> | 9 | <td>W3C XQuery Update Facility 1.0 features</td> |
220 | @@ -236,8 +237,8 @@ | |||
221 | 236 | </tr> | 237 | </tr> |
222 | 237 | <tr bgcolor="lightcyan"> | 238 | <tr bgcolor="lightcyan"> |
223 | 238 | <td bgcolor="lightcyan"> Revalidation Declaration = strict + skip</td> | 239 | <td bgcolor="lightcyan"> Revalidation Declaration = strict + skip</td> |
226 | 239 | <td align="center" bgcolor="mediumseagreen">1/1</td> | 240 | <td align="center" bgcolor="coral">0/1</td> |
227 | 240 | <td align="center" bgcolor="mediumseagreen">1/1</td> | 241 | <td align="center" bgcolor="coral">0/1</td> |
228 | 241 | </tr> | 242 | </tr> |
229 | 242 | <tr bgcolor="lightcyan"> | 243 | <tr bgcolor="lightcyan"> |
230 | 243 | <td bgcolor="lightcyan"> Update Facility Static Typing Feature</td> | 244 | <td bgcolor="lightcyan"> Update Facility Static Typing Feature</td> |
231 | @@ -276,8 +277,8 @@ | |||
232 | 276 | </tr> | 277 | </tr> |
233 | 277 | <tr bgcolor="lightcyan"> | 278 | <tr bgcolor="lightcyan"> |
234 | 278 | <td bgcolor="lightcyan"> fn:put() applied to attribute nodes</td> | 279 | <td bgcolor="lightcyan"> fn:put() applied to attribute nodes</td> |
237 | 279 | <td align="center" bgcolor="mediumseagreen">1/1</td> | 280 | <td align="center" bgcolor="coral">0/1</td> |
238 | 280 | <td align="center" bgcolor="mediumseagreen">1/1</td> | 281 | <td align="center" bgcolor="coral">0/1</td> |
239 | 281 | </tr> | 282 | </tr> |
240 | 282 | <tr bgcolor="lightcyan"> | 283 | <tr bgcolor="lightcyan"> |
241 | 283 | <td bgcolor="lightcyan"> fn:put() applied to attribute nodes - unsupported</td> | 284 | <td bgcolor="lightcyan"> fn:put() applied to attribute nodes - unsupported</td> |
242 | @@ -330,4 +331,4 @@ | |||
243 | 330 | <td align="center" bgcolor="mediumseagreen">1/1</td> | 331 | <td align="center" bgcolor="mediumseagreen">1/1</td> |
244 | 331 | </tr> | 332 | </tr> |
245 | 332 | </table> | 333 | </table> |
247 | 333 | */ | 334 | */ |
248 | 334 | \ No newline at end of file | 335 | \ No newline at end of file |
249 | 335 | 336 | ||
250 | === modified file 'scripts/sanity_checks/README.txt' | |||
251 | --- scripts/sanity_checks/README.txt 2012-07-24 08:48:48 +0000 | |||
252 | +++ scripts/sanity_checks/README.txt 2012-07-25 09:24:20 +0000 | |||
253 | @@ -1,17 +1,31 @@ | |||
255 | 1 | The command ./zorba -f -q /tmp/XQTS_current/run_xqts.xq generates: | 1 | 1) compile Zorba by setting the following flags: |
256 | 2 | cmake -DZORBA_TEST_XQUERYX=ON -DZORBA_XQUERYX=ON -DZORBA_WITH_BIG_INTEGER=ON -DZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON -DZORBA_MODULES_DIR="/home" .. | ||
257 | 3 | |||
258 | 4 | 2) import the 3 testsuites by running: | ||
259 | 5 | $zorbaDir/test/rbkt/Scripts/w3c/import_w3c_testsuite.sh $zorbaDir | ||
260 | 6 | $zorbaDir/test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh $zorbaDir | ||
261 | 7 | $zorbaDir/test/update/Scripts/import_w3c_update_testsuite.sh $zorbaDir | ||
262 | 8 | |||
263 | 9 | 3) Generate the conformance reports following the details provided in: | ||
264 | 10 | - test/rbtk/Scripts/w3c/Readme.txt | ||
265 | 11 | - test/update/Scripts/Readme.txt | ||
266 | 12 | The latest reports can also be downloaded from the private wiki: http://my.zorba-xquery.com/dokuwiki/doku.php | ||
267 | 13 | |||
268 | 14 | 4.1) The command ./zorba -f -q ../../scripts/sanity_checks/run_xqts.xq generates: | ||
269 | 2 | - /tmp/XQTS_current/conformanceXQTS.dox | 15 | - /tmp/XQTS_current/conformanceXQTS.dox |
270 | 3 | - /tmp/XQTS_current/conformanceXQTSSummary.dox | 16 | - /tmp/XQTS_current/conformanceXQTSSummary.dox |
273 | 4 | Note: this takes quite a long time because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX) | 17 | Note: this should take around 2 minutes because there are over 28000 tests to be processed(14000 XQuery and the same for XQueryX) |
274 | 5 | Also there are over 580 XQueryX tests for which there are no results reported in the submission XML. | 18 | Also there are over 402 XQueryX tests for which there are no results reported in the submission XML. |
275 | 6 | 19 | ||
277 | 7 | The command ./zorba -f -q /tmp/XQTS_current/run_xquts.xq generates: | 20 | 4.2) The command ./zorba -f -q ../../scripts/sanity_checks/run_xquts.xq generates: |
278 | 8 | - /tmp/XQUTS_current/conformanceXQUTS.dox | 21 | - /tmp/XQUTS_current/conformanceXQUTS.dox |
279 | 9 | - /tmp/XQUTS_current/conformanceXQUTSSummary.dox | 22 | - /tmp/XQUTS_current/conformanceXQUTSSummary.dox |
280 | 10 | 23 | ||
282 | 11 | The command ./zorba -f -q /tmp/XQTS_current/run_xqftts.xq generates: | 24 | 4.3) The command ./zorba -f -q ../../scripts/sanity_checks/run_xqftts.xq generates: |
283 | 12 | - /tmp/XQFTTS_current/conformanceXQFTTS.dox | 25 | - /tmp/XQFTTS_current/conformanceXQFTTS.dox |
284 | 13 | - /tmp/XQFTTS_current/conformanceXQFTTSSummary.dox | 26 | - /tmp/XQFTTS_current/conformanceXQFTTSSummary.dox |
285 | 14 | 27 | ||
286 | 28 | |||
287 | 15 | Here is how the query work: | 29 | Here is how the query work: |
288 | 16 | - they load the correct catalog(XQTSCatalog.xml, XQUTSCatalog.xml or XQFTTSCatalog.xml) | 30 | - they load the correct catalog(XQTSCatalog.xml, XQUTSCatalog.xml or XQFTTSCatalog.xml) |
289 | 17 | - they load the submission XML's for XQuery and XQueryX | 31 | - they load the submission XML's for XQuery and XQueryX |
290 | 18 | 32 | ||
291 | === modified file 'scripts/sanity_checks/conformance_xqftts.xqi' | |||
292 | --- scripts/sanity_checks/conformance_xqftts.xqi 2012-07-24 08:48:48 +0000 | |||
293 | +++ scripts/sanity_checks/conformance_xqftts.xqi 2012-07-25 09:24:20 +0000 | |||
294 | @@ -57,9 +57,17 @@ | |||
295 | 57 | declare %private variable $conf:XQuery as xs:string := "XQuery"; | 57 | declare %private variable $conf:XQuery as xs:string := "XQuery"; |
296 | 58 | declare %private variable $conf:XQueryX as xs:string := "XQueryX"; | 58 | declare %private variable $conf:XQueryX as xs:string := "XQueryX"; |
297 | 59 | 59 | ||
298 | 60 | declare %private variable $conf:infos := <infos/>; | ||
299 | 60 | declare %private variable $conf:features := <features/>; | 61 | declare %private variable $conf:features := <features/>; |
300 | 62 | declare %private variable $conf:numbers := <numbers/>; | ||
301 | 61 | 63 | ||
303 | 62 | declare %private variable $conf:numbers := <numbers/>; | 64 | declare %private %ann:sequential function conf:collect-info( |
304 | 65 | $name as xs:string, | ||
305 | 66 | $version as xs:string, | ||
306 | 67 | $info as xs:string) | ||
307 | 68 | { | ||
308 | 69 | insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos; | ||
309 | 70 | }; | ||
310 | 63 | 71 | ||
311 | 64 | declare %private %ann:sequential function conf:collect-feature( | 72 | declare %private %ann:sequential function conf:collect-feature( |
312 | 65 | $name as xs:string, | 73 | $name as xs:string, |
313 | @@ -327,7 +335,15 @@ | |||
314 | 327 | variable $docXQ := fn:parse-xml(file:read-text(file:resolve-path($conf:XQFTTS_submission))); | 335 | variable $docXQ := fn:parse-xml(file:read-text(file:resolve-path($conf:XQFTTS_submission))); |
315 | 328 | for $test in $docXQ/xqRes:test-suite-result//xqRes:test-case | 336 | for $test in $docXQ/xqRes:test-suite-result//xqRes:test-case |
316 | 329 | return dml:apply-insert-nodes($conf:submissionXquery, $test); | 337 | return dml:apply-insert-nodes($conf:submissionXquery, $test); |
318 | 330 | 338 | ||
319 | 339 | conf:collect-info("Zorba", | ||
320 | 340 | data($docXQ/xqRes:test-suite-result/xqRes:implementation/@version), | ||
321 | 341 | ""); | ||
322 | 342 | conf:collect-info("XQFTTS", | ||
323 | 343 | data($docXQ/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version), | ||
324 | 344 | normalize-space(data($docXQ/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments))); | ||
325 | 345 | |||
326 | 346 | |||
327 | 331 | (: collect features :) | 347 | (: collect features :) |
328 | 332 | for $feature in $docXQ/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature | 348 | for $feature in $docXQ/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature |
329 | 333 | return | 349 | return |
330 | @@ -391,7 +407,7 @@ | |||
331 | 391 | return | 407 | return |
332 | 392 | concat("Zorba achieves ", | 408 | concat("Zorba achieves ", |
333 | 393 | $minConf, | 409 | $minConf, |
335 | 394 | "% on minimal conformance (", | 410 | "% on minimal conformance (and ", |
336 | 395 | string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features" | 411 | string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features" |
337 | 396 | return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "), | 412 | return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "), |
338 | 397 | ") for the W3C XPath Full Text 1.0 Test Suite. | 413 | ") for the W3C XPath Full Text 1.0 Test Suite. |
339 | @@ -408,13 +424,24 @@ | |||
340 | 408 | conf:create-collection($conf:XQueryX, $XQTS_catalog); | 424 | conf:create-collection($conf:XQueryX, $XQTS_catalog); |
341 | 409 | 425 | ||
342 | 410 | variable $pageNameSummary := "conformanceXQFTTSSummary"; | 426 | variable $pageNameSummary := "conformanceXQFTTSSummary"; |
344 | 411 | variable $pathSummary := fn:concat($conf:XQFTTS_PATH, file:directory-separator(), $pageNameSummary, ".dox"); | 427 | variable $pathSummary := fn:concat($conf:XQFTTS_PATH, file:directory-separator(), $pageNameSummary, ".dox"); |
345 | 428 | variable $details := concat("In generating the report we used Zorba version ", | ||
346 | 429 | tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()], | ||
347 | 430 | " that can be downloaded from ", | ||
348 | 431 | data($conf:infos//info[@name="Zorba"]/@version), | ||
349 | 432 | " and XQFTTS version '", | ||
350 | 433 | data($conf:infos//info[@name="XQFTTS"]/@version), | ||
351 | 434 | "' (", | ||
352 | 435 | data($conf:infos//info[@name="XQFTTS"]/@info), | ||
353 | 436 | ")."); | ||
354 | 412 | 437 | ||
355 | 413 | file:write(trace($pathSummary,"output file path"), | 438 | file:write(trace($pathSummary,"output file path"), |
356 | 414 | ("/** \page conformanceXQFTTSSummary Summary W3C XQuery and XPath Full Text 1.0 conformance. | 439 | ("/** \page conformanceXQFTTSSummary Summary W3C XQuery and XPath Full Text 1.0 conformance. |
357 | 415 | 440 | ||
358 | 416 | The following table shows the supported features: | 441 | The following table shows the supported features: |
359 | 417 | ", | 442 | ", |
360 | 443 | {$details}," | ||
361 | 444 | ", | ||
362 | 418 | {conf:generate-features-table()}," | 445 | {conf:generate-features-table()}," |
363 | 419 | ", | 446 | ", |
364 | 420 | {conf:generate-summary-table($XQTS_catalog)} | 447 | {conf:generate-summary-table($XQTS_catalog)} |
365 | @@ -429,6 +456,8 @@ | |||
366 | 429 | ("/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance. | 456 | ("/** \page conformanceXQFTTS W3C XQuery and XPath Full Text 1.0 Conformance. |
367 | 430 | 457 | ||
368 | 431 | ", | 458 | ", |
369 | 459 | {$details}," | ||
370 | 460 | ", | ||
371 | 432 | {conf:create-summary-string()}," | 461 | {conf:create-summary-string()}," |
372 | 433 | ", | 462 | ", |
373 | 434 | {conf:generate-detailed-table($XQTS_catalog)} | 463 | {conf:generate-detailed-table($XQTS_catalog)} |
374 | 435 | 464 | ||
375 | === modified file 'scripts/sanity_checks/conformance_xqts.xqi' | |||
376 | --- scripts/sanity_checks/conformance_xqts.xqi 2012-07-24 08:48:48 +0000 | |||
377 | +++ scripts/sanity_checks/conformance_xqts.xqi 2012-07-25 09:24:20 +0000 | |||
378 | @@ -63,13 +63,21 @@ | |||
379 | 63 | declare %private variable $conf:XQuery as xs:string := "XQuery"; | 63 | declare %private variable $conf:XQuery as xs:string := "XQuery"; |
380 | 64 | declare %private variable $conf:XQueryX as xs:string := "XQueryX"; | 64 | declare %private variable $conf:XQueryX as xs:string := "XQueryX"; |
381 | 65 | 65 | ||
382 | 66 | declare %private variable $conf:infos := <infos/>; | ||
383 | 66 | declare %private variable $conf:features := <features/>; | 67 | declare %private variable $conf:features := <features/>; |
384 | 68 | declare %private variable $conf:numbers := <numbers/>; | ||
385 | 67 | 69 | ||
387 | 68 | declare %private variable $conf:numbers := <numbers/>; | 70 | declare %private %ann:sequential function conf:collect-info( |
388 | 71 | $name as xs:string, | ||
389 | 72 | $version as xs:string, | ||
390 | 73 | $info as xs:string) | ||
391 | 74 | { | ||
392 | 75 | insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos; | ||
393 | 76 | }; | ||
394 | 69 | 77 | ||
395 | 70 | declare %private %ann:sequential function conf:collect-feature( | 78 | declare %private %ann:sequential function conf:collect-feature( |
398 | 71 | $name as xs:string, | 79 | $name as xs:string, |
399 | 72 | $supported as xs:string) | 80 | $supported as xs:string) |
400 | 73 | { | 81 | { |
401 | 74 | insert node <feature name ="{$name}" supported="{$supported}" /> as last into $conf:features; | 82 | insert node <feature name ="{$name}" supported="{$supported}" /> as last into $conf:features; |
402 | 75 | }; | 83 | }; |
403 | @@ -341,10 +349,17 @@ | |||
404 | 341 | ddl:create($conf:submissionXquery); | 349 | ddl:create($conf:submissionXquery); |
405 | 342 | 350 | ||
406 | 343 | variable $doc := fn:parse-xml(file:read-text(file:resolve-path($conf:XQTS_submission))); | 351 | variable $doc := fn:parse-xml(file:read-text(file:resolve-path($conf:XQTS_submission))); |
408 | 344 | 352 | ||
409 | 345 | for $test in $doc/xqRes:test-suite-result//xqRes:test-case | 353 | for $test in $doc/xqRes:test-suite-result//xqRes:test-case |
410 | 346 | return dml:apply-insert-nodes($conf:submissionXquery, $test); | 354 | return dml:apply-insert-nodes($conf:submissionXquery, $test); |
411 | 347 | 355 | ||
412 | 356 | conf:collect-info("Zorba", | ||
413 | 357 | data($doc/xqRes:test-suite-result/xqRes:implementation/@version), | ||
414 | 358 | ""); | ||
415 | 359 | conf:collect-info("XQTS", | ||
416 | 360 | data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version), | ||
417 | 361 | normalize-space(data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments))); | ||
418 | 362 | |||
419 | 348 | (: collect features :) | 363 | (: collect features :) |
420 | 349 | for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature | 364 | for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature |
421 | 350 | return | 365 | return |
422 | @@ -413,13 +428,12 @@ | |||
423 | 413 | { | 428 | { |
424 | 414 | let $minConf := for $number in $conf:numbers/number where xs:string($number/@name) eq "Minimal Conformance" return xs:string(data($number/@value)) | 429 | let $minConf := for $number in $conf:numbers/number where xs:string($number/@name) eq "Minimal Conformance" return xs:string(data($number/@value)) |
425 | 415 | return | 430 | return |
427 | 416 | concat("Zorba achieves ", | 431 | concat( "Zorba achieves ", |
428 | 417 | $minConf, | 432 | $minConf, |
430 | 418 | "% on Minimal conformance (", | 433 | "% on minimal conformance (and ", |
431 | 419 | string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features" | 434 | string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features" |
432 | 420 | return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "), | 435 | return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "), |
435 | 421 | ") for the W3C XML Query Test Suite. | 436 | ") for the W3C XML Query Test Suite. |
434 | 422 | |||
436 | 423 | Please see the table below for more details.") | 437 | Please see the table below for more details.") |
437 | 424 | 438 | ||
438 | 425 | }; | 439 | }; |
439 | @@ -443,12 +457,23 @@ | |||
440 | 443 | conf:create-collection($conf:XQuery, $XQTS_catalog); | 457 | conf:create-collection($conf:XQuery, $XQTS_catalog); |
441 | 444 | conf:create-collection($conf:XQueryX, $XQTS_catalog); | 458 | conf:create-collection($conf:XQueryX, $XQTS_catalog); |
442 | 445 | 459 | ||
443 | 460 | variable $details := concat("In generating the report we used Zorba version ", | ||
444 | 461 | tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()], | ||
445 | 462 | " that can be downloaded from ", | ||
446 | 463 | data($conf:infos//info[@name="Zorba"]/@version), | ||
447 | 464 | " and XQTS version '", | ||
448 | 465 | data($conf:infos//info[@name="XQTS"]/@version), | ||
449 | 466 | "' (", | ||
450 | 467 | data($conf:infos//info[@name="XQTS"]/@info), | ||
451 | 468 | ")."); | ||
452 | 446 | variable $pageNameSummary := "conformanceXQTSSummary"; | 469 | variable $pageNameSummary := "conformanceXQTSSummary"; |
453 | 447 | variable $pathSummary := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameSummary, ".dox"); | 470 | variable $pathSummary := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameSummary, ".dox"); |
454 | 448 | file:write(trace($pathSummary,"output summary file path"), | 471 | file:write(trace($pathSummary,"output summary file path"), |
455 | 449 | ("/** \page conformanceXQTSSummary Summary W3C XQuery 1.0 conformance | 472 | ("/** \page conformanceXQTSSummary Summary W3C XQuery 1.0 conformance |
456 | 450 | 473 | ||
457 | 451 | ", | 474 | ", |
458 | 475 | {$details}," | ||
459 | 476 | ", | ||
460 | 452 | {conf:generate-features-table()}," | 477 | {conf:generate-features-table()}," |
461 | 453 | ", | 478 | ", |
462 | 454 | {conf:generate-summary-table($XQTS_catalog)} | 479 | {conf:generate-summary-table($XQTS_catalog)} |
463 | @@ -460,9 +485,11 @@ | |||
464 | 460 | variable $pathDetailed := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox"); | 485 | variable $pathDetailed := fn:concat($conf:XQTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox"); |
465 | 461 | 486 | ||
466 | 462 | file:write(trace($pathDetailed,"output detailed file path"), | 487 | file:write(trace($pathDetailed,"output detailed file path"), |
468 | 463 | ("/** \page conformanceXQTS W3C XQuery 1.0 Conformance. | 488 | ("/** \page conformanceXQTS W3C XQuery 1.0 Conformance |
469 | 464 | 489 | ||
470 | 465 | ", | 490 | ", |
471 | 491 | {$details}," | ||
472 | 492 | ", | ||
473 | 466 | {conf:create-summary-string()}," | 493 | {conf:create-summary-string()}," |
474 | 467 | ", | 494 | ", |
475 | 468 | {conf:generate-detailed-table($XQTS_catalog)} | 495 | {conf:generate-detailed-table($XQTS_catalog)} |
476 | 469 | 496 | ||
477 | === modified file 'scripts/sanity_checks/conformance_xquts.xqi' | |||
478 | --- scripts/sanity_checks/conformance_xquts.xqi 2012-07-24 08:48:48 +0000 | |||
479 | +++ scripts/sanity_checks/conformance_xquts.xqi 2012-07-25 09:24:20 +0000 | |||
480 | @@ -51,16 +51,24 @@ | |||
481 | 51 | declare %private variable $conf:XQUTS_PATH as xs:string := "/tmp/XQUTS_current"; | 51 | declare %private variable $conf:XQUTS_PATH as xs:string := "/tmp/XQUTS_current"; |
482 | 52 | 52 | ||
483 | 53 | declare %private variable $conf:XQUTS_submission as xs:string := | 53 | declare %private variable $conf:XQUTS_submission as xs:string := |
485 | 54 | "/tmp/XQUTS_current/ReportingResults/zorba_11674_xquts_current.xml"; | 54 | "/tmp/XQUTS_current/ReportingResults/zorba_xquts_submission.xml"; |
486 | 55 | declare variable $conf:XQUTSX_submission as xs:string := | 55 | declare variable $conf:XQUTSX_submission as xs:string := |
488 | 56 | "/tmp/XQUTS_current/ReportingResults/zorba_11674_xqutsx_current.xml"; | 56 | "/tmp/XQUTS_current/ReportingResults/zorba_xqutsx_submission.xml"; |
489 | 57 | 57 | ||
490 | 58 | declare %private variable $conf:XQuery as xs:string := "XQuery"; | 58 | declare %private variable $conf:XQuery as xs:string := "XQuery"; |
491 | 59 | declare %private variable $conf:XQueryX as xs:string := "XQueryX"; | 59 | declare %private variable $conf:XQueryX as xs:string := "XQueryX"; |
492 | 60 | 60 | ||
493 | 61 | declare %private variable $conf:infos := <infos/>; | ||
494 | 61 | declare %private variable $conf:features := <features/>; | 62 | declare %private variable $conf:features := <features/>; |
495 | 63 | declare %private variable $conf:numbers := <numbers/>; | ||
496 | 62 | 64 | ||
498 | 63 | declare %private variable $conf:numbers := <numbers/>; | 65 | declare %private %ann:sequential function conf:collect-info( |
499 | 66 | $name as xs:string, | ||
500 | 67 | $version as xs:string, | ||
501 | 68 | $info as xs:string) | ||
502 | 69 | { | ||
503 | 70 | insert node <info name ="{$name}" version="{$version}" info="{$info}"/> as last into $conf:infos; | ||
504 | 71 | }; | ||
505 | 64 | 72 | ||
506 | 65 | declare %private %ann:sequential function conf:collect-feature( | 73 | declare %private %ann:sequential function conf:collect-feature( |
507 | 66 | $name as xs:string, | 74 | $name as xs:string, |
508 | @@ -323,6 +331,13 @@ | |||
509 | 323 | for $test in $doc/xqRes:test-suite-result//xqRes:test-case | 331 | for $test in $doc/xqRes:test-suite-result//xqRes:test-case |
510 | 324 | return dml:apply-insert-nodes($conf:submissionXquery, $test); | 332 | return dml:apply-insert-nodes($conf:submissionXquery, $test); |
511 | 325 | 333 | ||
512 | 334 | conf:collect-info("Zorba", | ||
513 | 335 | data($doc/xqRes:test-suite-result/xqRes:implementation/@version), | ||
514 | 336 | ""); | ||
515 | 337 | conf:collect-info("XQUTS", | ||
516 | 338 | data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:test-suite/@version), | ||
517 | 339 | normalize-space(data($doc/xqRes:test-suite-result/xqRes:test-run/xqRes:otherComments))); | ||
518 | 340 | |||
519 | 326 | (: collect features :) | 341 | (: collect features :) |
520 | 327 | for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature | 342 | for $feature in $doc/xqRes:test-suite-result/xqRes:implementation/xqRes:features/xqRes:feature |
521 | 328 | return | 343 | return |
522 | @@ -393,7 +408,7 @@ | |||
523 | 393 | return | 408 | return |
524 | 394 | concat("Zorba achieves ", | 409 | concat("Zorba achieves ", |
525 | 395 | $minConf, | 410 | $minConf, |
527 | 396 | "% on Minimal conformance (", | 411 | "% on minimal conformance (and ", |
528 | 397 | string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features" | 412 | string-join(( for $number in $conf:numbers/number where xs:string($number/@name) eq "Optional Features" |
529 | 398 | return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "), | 413 | return concat(xs:string(data($number/@value)),"% on ",xs:string(data($number/@name)))),", "), |
530 | 399 | ") for the W3C XQuery Update Facility Test Suite. | 414 | ") for the W3C XQuery Update Facility Test Suite. |
531 | @@ -409,13 +424,25 @@ | |||
532 | 409 | conf:create-collection($conf:XQueryX, $XQTS_catalog); | 424 | conf:create-collection($conf:XQueryX, $XQTS_catalog); |
533 | 410 | 425 | ||
534 | 411 | variable $pageNameSummary := "conformanceXQUTSSummary"; | 426 | variable $pageNameSummary := "conformanceXQUTSSummary"; |
536 | 412 | variable $pathSummary := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameSummary, ".dox"); | 427 | variable $pathSummary := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameSummary, ".dox"); |
537 | 428 | |||
538 | 429 | variable $details := concat("In generating the report we used Zorba version ", | ||
539 | 430 | tokenize(data($conf:infos//info[@name="Zorba"]/@version),"/")[last()], | ||
540 | 431 | " that can be downloaded from ", | ||
541 | 432 | data($conf:infos//info[@name="Zorba"]/@version), | ||
542 | 433 | " and XQUTS version '", | ||
543 | 434 | data($conf:infos//info[@name="XQUTS"]/@version), | ||
544 | 435 | "' (", | ||
545 | 436 | data($conf:infos//info[@name="XQUTS"]/@info), | ||
546 | 437 | ")."); | ||
547 | 413 | 438 | ||
548 | 414 | file:write(trace($pathSummary,"output file path"), | 439 | file:write(trace($pathSummary,"output file path"), |
549 | 415 | ("/** \page conformanceXQUTSSummary Summary W3C XQuery Update Facility 1.0 conformance | 440 | ("/** \page conformanceXQUTSSummary Summary W3C XQuery Update Facility 1.0 conformance |
550 | 416 | 441 | ||
551 | 417 | The following table shows the supported features: | 442 | The following table shows the supported features: |
552 | 418 | ", | 443 | ", |
553 | 444 | {$details}," | ||
554 | 445 | ", | ||
555 | 419 | {conf:generate-features-table()}," | 446 | {conf:generate-features-table()}," |
556 | 420 | ", | 447 | ", |
557 | 421 | {conf:generate-summary-table($XQTS_catalog)} | 448 | {conf:generate-summary-table($XQTS_catalog)} |
558 | @@ -427,9 +454,11 @@ | |||
559 | 427 | variable $pathDetailed := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox"); | 454 | variable $pathDetailed := fn:concat($conf:XQUTS_PATH, file:directory-separator(), $pageNameDetailed, ".dox"); |
560 | 428 | 455 | ||
561 | 429 | file:write(trace($pathDetailed,"output file path"), | 456 | file:write(trace($pathDetailed,"output file path"), |
563 | 430 | ("/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance. | 457 | ("/** \page conformanceXQUTS W3C XQuery Update Facility 1.0 Conformance |
564 | 431 | 458 | ||
565 | 432 | ", | 459 | ", |
566 | 460 | {$details}," | ||
567 | 461 | ", | ||
568 | 433 | {conf:create-summary-string()}," | 462 | {conf:create-summary-string()}," |
569 | 434 | ", | 463 | ", |
570 | 435 | {conf:generate-detailed-table($XQTS_catalog)} | 464 | {conf:generate-detailed-table($XQTS_catalog)} |
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ fix_bug_ 1018737- 2012-07- 27T11-31- 02.972Z/ log.html
Log at: http://