Zorba

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

  1. fix_assert_xml
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Chris Hillery
Approved revision: 11257
Merged at revision: 11257
Proposed branch: lp:~zorba-coders/zorba/fix_assert_xml
Merge into: lp:zorba
Diff against target: 431 lines (+107/-75)
6 files modified
test/fots/CMakeLists.txt (+0/-38)
test/fots_driver/evaluate.xq (+48/-23)
test/fots_driver/fots-driver.xq (+5/-6)
test/fots_driver/tools/list_node_names_with_file_attribute.xq (+45/-0)
test/fots_driver/tools/process.xq (+2/-1)
test/fots_driver/util.xq (+7/-7)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_assert_xml
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Sorin Marian Nasoi Approve
Review via email: mp+150353@code.launchpad.net

Commit message

Fix FOTS driver bug that caused <assert-xml file="SOME_URI"/> to be interpreted as <assert-xml/>.
This fixes 37 test cases.

Description of the change

Fix FOTS driver bug that caused <assert-xml file="SOME_URI"/> to be interpreted as <assert-xml/>.
This fixes 37 test cases.

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_assert_xml-2013-02-25T15-49-41.664Z/log.html

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

The attempt to merge lp:~zorba-coders/zorba/fix_assert_xml 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_assert_xml-2013-02-25T15-49-41.664Z is finished.
  The final status was:

  8 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_assert_xml-2013-02-25T16-22-43.29Z/log.html

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

The attempt to merge lp:~zorba-coders/zorba/fix_assert_xml 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_assert_xml-2013-02-25T16-22-43.29Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

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

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_assert_xml-2013-02-26T01-02-48.091Z/log.html

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

Validation queue job fix_assert_xml-2013-02-26T01-02-48.091Z 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-02-22 07:31:48 +0000
+++ test/fots/CMakeLists.txt 2013-02-25 16:22:31 +0000
@@ -121,7 +121,6 @@
121EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 0)121EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 0)
122EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 0)122EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 0)
123EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)123EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
124EXPECTED_FOTS_FAILURE (app-Demos sudoku 0)
125EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)124EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)
126EXPECTED_FOTS_FAILURE (app-Demos itunes 0)125EXPECTED_FOTS_FAILURE (app-Demos itunes 0)
127EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-number-all 0)126EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-number-all 0)
@@ -133,25 +132,7 @@
133EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-all 0)132EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-all 0)
134EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q5 0)133EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q5 0)
135EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q8 0)134EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q8 0)
136EXPECTED_FOTS_FAILURE (app-UseCaseSTRING string-queries-results-q1 0)
137EXPECTED_FOTS_FAILURE (app-UseCaseSTRING string-queries-results-q2 0)
138EXPECTED_FOTS_FAILURE (app-UseCaseSTRING string-queries-results-q4 0)
139EXPECTED_FOTS_FAILURE (app-UseCaseSTRING string-queries-results-q5 0)
140EXPECTED_FOTS_FAILURE (app-XMark XMark-Q2 0)
141EXPECTED_FOTS_FAILURE (app-XMark XMark-Q3 0)135EXPECTED_FOTS_FAILURE (app-XMark XMark-Q3 0)
142EXPECTED_FOTS_FAILURE (app-XMark XMark-Q8 0)
143EXPECTED_FOTS_FAILURE (app-XMark XMark-Q9 0)
144EXPECTED_FOTS_FAILURE (app-XMark XMark-Q10 0)
145EXPECTED_FOTS_FAILURE (app-XMark XMark-Q11 0)
146EXPECTED_FOTS_FAILURE (app-XMark XMark-Q12 0)
147EXPECTED_FOTS_FAILURE (app-XMark XMark-Q13 0)
148EXPECTED_FOTS_FAILURE (app-XMark XMark-Q14 0)
149EXPECTED_FOTS_FAILURE (app-XMark XMark-Q15 0)
150EXPECTED_FOTS_FAILURE (app-XMark XMark-Q16 0)
151EXPECTED_FOTS_FAILURE (app-XMark XMark-Q17 0)
152EXPECTED_FOTS_FAILURE (app-XMark XMark-Q18 0)
153EXPECTED_FOTS_FAILURE (app-XMark XMark-Q19 0)
154EXPECTED_FOTS_FAILURE (app-XMark XMark-Q20 0)
155EXPECTED_FOTS_FAILURE (app-XMark XMark-All 0)136EXPECTED_FOTS_FAILURE (app-XMark XMark-All 0)
156EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)137EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)
157EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0)138EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0)
@@ -793,14 +774,7 @@
793EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)774EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
794EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-3 0)775EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-3 0)
795EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-4 0)776EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-4 0)
796EXPECTED_FOTS_FAILURE (prod-DirAttributeList K2-DirectConElemAttr-75 0)
797EXPECTED_FOTS_FAILURE (prod-DirAttributeList DirectConElemAttr-1 0)777EXPECTED_FOTS_FAILURE (prod-DirAttributeList DirectConElemAttr-1 0)
798EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-49 0)
799EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-50 0)
800EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-51 0)
801EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-52 0)
802EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-53 0)
803EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-54 0)
804EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-66 0)778EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-66 0)
805EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-38 0)779EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-38 0)
806EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-48 0)780EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-48 0)
@@ -819,21 +793,10 @@
819EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-12 0)793EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-12 0)
820EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-21 0)794EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-21 0)
821EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-22 0)795EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-22 0)
822EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-15 0)
823EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-16 0)
824EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-17 0)
825EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-18 0)
826EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-19 0)
827EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-20 0)
828EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-21 0)
829EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-22 0)
830EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-23 0)
831EXPECTED_FOTS_FAILURE (prod-DirElemContent.whitespace Constr-ws-enclexpr-24 0)
832EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0)796EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0)
833EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-2 0)797EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-2 0)
834EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-3 0)798EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-3 0)
835EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr004 0)799EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr004 0)
836EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr013 0)
837EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0)800EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0)
838EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0)801EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0)
839EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0)802EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0)
@@ -993,7 +956,6 @@
993EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-105 0)956EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-105 0)
994EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-106 0)957EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-106 0)
995EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWithout-18 0)958EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWithout-18 0)
996EXPECTED_FOTS_FAILURE (prod-VarDecl.external extvardeclwithtype-23 0)
997EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)959EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)
998EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-003a 0)960EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-003a 0)
999EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-006b 0)961EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-006b 0)
1000962
=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq 2013-02-22 07:31:48 +0000
+++ test/fots_driver/evaluate.xq 2013-02-25 16:22:31 +0000
@@ -51,17 +51,21 @@
51 : Checks if the result matches the assertions.51 : Checks if the result matches the assertions.
52 : @param $result actual result.52 : @param $result actual result.
53 : @param $expResult expected result.53 : @param $expResult expected result.
54 : @param $testSetBaseURI the URI of the directory that contains the file of the
55 associated test set.
54 : @return the results of assertion evaluations.56 : @return the results of assertion evaluations.
55 :)57 :)
56declare %ann:sequential function eval:result(58declare %ann:sequential function eval:result(
57 $result as item()*,59 $result as item()*,
58 $expResult as element()60 $expResult as element(),
61 $testSetBaseURI as xs:anyURI
59) as element()*62) as element()*
60{63{
61 let $err := eval:check-assertion($result,64 let $err := eval:check-assertion($result,
62 $expResult,65 $expResult,
63 (),66 (),
64 "")67 "",
68 $testSetBaseURI)
65 return if (empty($err))69 return if (empty($err))
66 then ()70 then ()
67 else71 else
@@ -78,20 +82,24 @@
78 : @param $expResult expected result.82 : @param $expResult expected result.
79 : @param $code err:code.83 : @param $code err:code.
80 : @param $errorDescription err:description.84 : @param $errorDescription err:description.
85 : @param $testSetBaseURI the URI of the directory that contains the file of the
86 associated test set.
81 : @return the results of error evaluation.87 : @return the results of error evaluation.
82 :)88 :)
83declare %ann:sequential function eval:error(89declare %ann:sequential function eval:error(
84 $result as item()*,90 $result as item()*,
85 $expResult as element(),91 $expResult as element(),
86 $code as xs:QName?,92 $code as xs:QName?,
87 $errorDescription as xs:string?93 $errorDescription as xs:string?,
94 $testSetBaseURI as xs:anyURI
88) as element()*95) as element()*
89{96{
90 if (empty($result))97 if (empty($result))
91 then98 then
92 let $err := eval:error-code($code,99 let $err := eval:error-code($code,
93 $errorDescription,100 $errorDescription,
94 $expResult)101 $expResult,
102 $testSetBaseURI)
95 return103 return
96 if (empty($err))104 if (empty($err))
97 then ()105 then ()
@@ -114,7 +122,8 @@
114declare %private %ann:sequential function eval:error-code(122declare %private %ann:sequential function eval:error-code(
115 $code as xs:QName?,123 $code as xs:QName?,
116 $errorDescription as xs:string?,124 $errorDescription as xs:string?,
117 $expResult as element()125 $expResult as element(),
126 $testSetBaseURI as xs:anyURI
118) as xs:string*127) as xs:string*
119{128{
120 let $assertName := local-name($expResult)129 let $assertName := local-name($expResult)
@@ -136,7 +145,8 @@
136 then eval:check-assertion((),145 then eval:check-assertion((),
137 $expResult,146 $expResult,
138 $code,147 $code,
139 $errorDescription)148 $errorDescription,
149 $testSetBaseURI)
140 else concat("Expected result, found error ",150 else concat("Expected result, found error ",
141 local-name-from-QName($code),151 local-name-from-QName($code),
142 " - ",152 " - ",
@@ -147,7 +157,8 @@
147 $result as item()*,157 $result as item()*,
148 $expResult as element(),158 $expResult as element(),
149 $code as xs:QName?,159 $code as xs:QName?,
150 $errorDescription as xs:string?160 $errorDescription as xs:string?,
161 $testSetBaseURI as xs:anyURI
151) as xs:string*162) as xs:string*
152{163{
153 let $test := local-name($expResult)164 let $test := local-name($expResult)
@@ -156,12 +167,14 @@
156 return eval:assert-all-of($result,167 return eval:assert-all-of($result,
157 $expResult,168 $expResult,
158 $code,169 $code,
159 $errorDescription)170 $errorDescription,
171 $testSetBaseURI)
160 case 'any-of'172 case 'any-of'
161 return eval:assert-any-of($result,173 return eval:assert-any-of($result,
162 $expResult,174 $expResult,
163 $code,175 $code,
164 $errorDescription)176 $errorDescription,
177 $testSetBaseURI)
165 case 'assert'178 case 'assert'
166 return eval:assert($result,179 return eval:assert($result,
167 $expResult)180 $expResult)
@@ -183,10 +196,12 @@
183 $expResult)196 $expResult)
184 case 'assert-xml'197 case 'assert-xml'
185 return eval:assert-xml($result,198 return eval:assert-xml($result,
186 $expResult)199 $expResult,
200 $testSetBaseURI)
187 case 'assert-serialization-error'201 case 'assert-serialization-error'
188 return eval:assert-serialization-error($result,202 return eval:assert-serialization-error($result,
189 $expResult)203 $expResult,
204 $testSetBaseURI)
190 case 'assert-string-value'205 case 'assert-string-value'
191 return eval:assert-string-value($result,206 return eval:assert-string-value($result,
192 $expResult)207 $expResult)
@@ -202,7 +217,8 @@
202 return eval:error($result,217 return eval:error($result,
203 $expResult,218 $expResult,
204 $code,219 $code,
205 $errorDescription)220 $errorDescription,
221 $testSetBaseURI)
206 default222 default
207 return error($fots-err:errNA,223 return error($fots-err:errNA,
208 "&#xA;The requested assertion type is not implemented.")224 "&#xA;The requested assertion type is not implemented.")
@@ -213,7 +229,8 @@
213 $result as item()*,229 $result as item()*,
214 $expResult as element(),230 $expResult as element(),
215 $code as xs:QName?,231 $code as xs:QName?,
216 $errorDescription as xs:string?232 $errorDescription as xs:string?,
233 $baseURI as xs:anyURI
217) as xs:string?234) as xs:string?
218{235{
219 let $results :=236 let $results :=
@@ -222,7 +239,8 @@
222 for $r in eval:check-assertion($result,239 for $r in eval:check-assertion($result,
223 $tmp,240 $tmp,
224 $code,241 $code,
225 $errorDescription)242 $errorDescription,
243 $baseURI)
226 return <item>{$r}</item>244 return <item>{$r}</item>
227 } </result>245 } </result>
228 where every $result in $results satisfies $result/item246 where every $result in $results satisfies $result/item
@@ -235,14 +253,16 @@
235 $result as item()*,253 $result as item()*,
236 $expResult as element(),254 $expResult as element(),
237 $code as xs:QName?,255 $code as xs:QName?,
238 $errorDescription as xs:string?256 $errorDescription as xs:string?,
257 $baseURI as xs:anyURI
239) as xs:string*258) as xs:string*
240{259{
241 for $tmp in $expResult/*260 for $tmp in $expResult/*
242 return eval:check-assertion($result,261 return eval:check-assertion($result,
243 $tmp,262 $tmp,
244 $code,263 $code,
245 $errorDescription)264 $errorDescription,
265 $baseURI)
246};266};
247267
248(: http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert :)268(: http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert :)
@@ -417,17 +437,19 @@
417(: http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert-xml :)437(: http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert-xml :)
418declare %private function eval:assert-xml(438declare %private function eval:assert-xml(
419 $result as item()*,439 $result as item()*,
420 $expResult as element()440 $expResult as element(),
441 $baseURI as xs:anyURI
421)442)
422{443{
423(:TODO call xml-canonicalization after bug #1076919 is implemented.:)444(:TODO call xml-canonicalization after bug #1076919 is implemented.:)
424 try {445 try {
425 let $serRes := util:serialize-result($result),446 let $serRes := util:serialize-result($result),
426 $result1 as xs:string := string-join($serRes,''),447 $result1 as xs:string := string-join($serRes,''),
427 $result2 as xs:string := string-join($serRes,' ')448 $result2 as xs:string := string-join($serRes,' '),
449 $expectedResult as xs:string := util:get-value($expResult, $baseURI, "assert-xml")
428 return450 return
429 if ((normalize-space($result1) eq normalize-space(string($expResult))) or451 if ((normalize-space($result1) eq normalize-space(string($expectedResult))) or
430 (normalize-space($result2) eq normalize-space(string($expResult))))452 (normalize-space($result2) eq normalize-space(string($expectedResult))))
431 then ()453 then ()
432 else "'assert-xml' returned: result is different from the expected result."454 else "'assert-xml' returned: result is different from the expected result."
433 } catch * {455 } catch * {
@@ -439,7 +461,9 @@
439(: http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert-serialization-error :)461(: http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert-serialization-error :)
440declare %private %ann:sequential function eval:assert-serialization-error(462declare %private %ann:sequential function eval:assert-serialization-error(
441 $result as item()*,463 $result as item()*,
442 $expResult as element()464 $expResult as element(),
465 $baseURI as xs:anyURI
466
443) as xs:string?467) as xs:string?
444{468{
445 try {469 try {
@@ -451,7 +475,8 @@
451 eval:error((),475 eval:error((),
452 $expResult,476 $expResult,
453 $err:code,477 $err:code,
454 $err:description)478 $err:description,
479 $baseURI)
455 }480 }
456};481};
457482
458483
=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq 2013-02-22 10:41:13 +0000
+++ test/fots_driver/fots-driver.xq 2013-02-25 16:22:31 +0000
@@ -872,7 +872,8 @@
872 eval:error((),872 eval:error((),
873 $case/fots:result/*,873 $case/fots:result/*,
874 $err:code,874 $err:code,
875 $err:description),875 $err:description,
876 $testSetBaseURI),
876 "fots-driver.xq:driver:test catch",877 "fots-driver.xq:driver:test catch",
877 $testSetName,878 $testSetName,
878 $env,879 $env,
@@ -1005,12 +1006,9 @@
10051006
1006 variable $queryResult := xqxq:evaluate-sequential($queryKey);1007 variable $queryResult := xqxq:evaluate-sequential($queryKey);
10071008
1008 (:TODO check if this works:)
1009 (:variable $expResult := util:get-value($case, $testSetBaseURI, "result");:)
1010
1011 xqxq:delete-query($queryKey);1009 xqxq:delete-query($queryKey);
10121010
1013 eval:result($queryResult, $case/fots:result/*)1011 eval:result($queryResult, $case/fots:result/*, $testSetBaseURI)
1014 }1012 }
1015 }1013 }
1016 catch *1014 catch *
@@ -1018,6 +1016,7 @@
1018 eval:error((),1016 eval:error((),
1019 $case/fots:result/*,1017 $case/fots:result/*,
1020 $err:code,1018 $err:code,
1021 $err:description)1019 $err:description,
1020 $testSetBaseURI)
1022 }1021 }
1023};1022};
10241023
=== added file 'test/fots_driver/tools/list_node_names_with_file_attribute.xq'
--- test/fots_driver/tools/list_node_names_with_file_attribute.xq 1970-01-01 00:00:00 +0000
+++ test/fots_driver/tools/list_node_names_with_file_attribute.xq 2013-02-25 16:22:31 +0000
@@ -0,0 +1,45 @@
1(:
2 : Copyright 2006-2011 The FLWOR Foundation.
3 :
4 : Licensed under the Apache License, Version 2.0 (the "License");
5 : you may not use this file except in compliance with the License.
6 : You may obtain a copy of the License at
7 :
8 : http://www.apache.org/licenses/LICENSE-2.0
9 :
10 : Unless required by applicable law or agreed to in writing, software
11 : distributed under the License is distributed on an "AS IS" BASIS,
12 : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 : See the License for the specific language governing permissions and
14 : limitations under the License.
15 :)
16
17(:~
18 : list all node-names of the nodes that contain a child with a 'file' attribute.
19 : At the moment this is the list: "source", "schema", "assert-xml", "module", "test"
20 :
21 : @author Sorin Nasoi
22 :)
23
24import module namespace util =
25 "http://www.zorba-xquery.com/fots-driver/util" at "../util.xq";
26
27declare namespace fots =
28 "http://www.w3.org/2010/09/qt-fots-catalog";
29
30let $fotsPath := "../../../build/test/fots/2011/QT3-test-suite/catalog.xml"
31let $doc := doc(resolve-uri($fotsPath))
32let $baseUri:= resolve-uri(util:parent-folder($fotsPath))
33return
34distinct-values(
35 for $testSet in $doc/fots:catalog/fots:test-set
36 let $testSetDoc := doc(resolve-uri($testSet/@file, $baseUri))
37 let $testSetName := xs:string($testSet/@name)
38 return
39 distinct-values(for $case in $testSetDoc//fots:test-case
40 return distinct-values(for $node in $case/descendant-or-self::*
41 where exists($node/@file)
42 return local-name-from-QName(node-name($node))
43 )
44 )
45)
046
=== modified file 'test/fots_driver/tools/process.xq'
--- test/fots_driver/tools/process.xq 2012-12-18 14:13:20 +0000
+++ test/fots_driver/tools/process.xq 2013-02-25 16:22:31 +0000
@@ -36,7 +36,8 @@
36declare namespace fots =36declare namespace fots =
37 "http://www.w3.org/2010/09/qt-fots-catalog";37 "http://www.w3.org/2010/09/qt-fots-catalog";
3838
39declare variable $fotsPath as xs:string external := "";39declare variable $fotsPath as xs:string external :=
40 "../../../build/test/fots/2011/QT3-test-suite/catalog.xml";
40declare variable $dependency as xs:string external := "";41declare variable $dependency as xs:string external := "";
41declare variable $testSetPrefixes as xs:string external := "";42declare variable $testSetPrefixes as xs:string external := "";
4243
4344
=== modified file 'test/fots_driver/util.xq'
--- test/fots_driver/util.xq 2013-02-19 14:06:08 +0000
+++ test/fots_driver/util.xq 2013-02-25 16:22:31 +0000
@@ -71,24 +71,24 @@
71 : or71 : or
72 : (b) the typed value of the node (assuming it is promotable to string).72 : (b) the typed value of the node (assuming it is promotable to string).
73 :73 :
74 : @param $case test-case element.74 : @param $parentNode
75 : @param $baseURI
75 : @param $node-name76 : @param $node-name
76 : @param $envBaseURI77 : @return the content of the node with name 'node-name'.
77 : @return the query text.
78 :)78 :)
79declare %ann:nondeterministic function util:get-value(79declare %ann:nondeterministic function util:get-value(
80 $case as element(fots:test-case),80 $parentNode as element(),
81 $envBaseURI as xs:anyURI,81 $baseURI as xs:anyURI,
82 $node-name as xs:string82 $node-name as xs:string
83) as xs:string83) as xs:string
84{84{
85 try85 try
86 {86 {
87 for $node in $case/descendant-or-self::*87 for $node in $parentNode/descendant-or-self::*
88 where (fn:local-name-from-QName(fn:node-name($node)) eq $node-name)88 where (fn:local-name-from-QName(fn:node-name($node)) eq $node-name)
89 return89 return
90 if ($node/@file)90 if ($node/@file)
91 then fn:unparsed-text(resolve-uri($node/@file, $envBaseURI))91 then fn:unparsed-text(resolve-uri($node/@file, $baseURI))
92 else fn:string($node)92 else fn:string($node)
93 }93 }
94 catch *94 catch *

Subscribers

People subscribed via source and target branches