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

Proposed by Sorin Marian Nasoi on 2013-08-12
Status: Merged
Merged at revision: 11596
Proposed branch: lp:~zorba-coders/zorba/partial_fix_bug_1167641
Merge into: lp:zorba
Diff against target: 68 lines (+14/-6)
3 files modified
test/fots/CMakeLists.txt (+1/-0)
test/fots_driver/environment.xq (+10/-5)
test/fots_driver/fots-driver.xq (+3/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/partial_fix_bug_1167641
Reviewer Review Type Date Requested Status
Chris Hillery 2013-08-12 Approve on 2013-08-12
Sorin Marian Nasoi Approve on 2013-08-12
Review via email: mp+179741@code.launchpad.net

Commit message

Re-added changes that were wrongfully reverted in r11402.1.5.

To post a comment you must log in.
11596. By sorin.marian.nasoi <email address hidden> on 2013-08-12

Re-added changes that were wrongfully reverted in r11402.1.5.

Zorba Build Bot (zorba-buildbot) wrote :
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741

Stage "TestZorbaUbuntu" failed.
1 tests failed (8402 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/209/testReport/ to view the results.

Zorba Build Bot (zorba-buildbot) wrote :
Zorba Build Bot (zorba-buildbot) wrote :

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 :
Votes: {'Pending': 1}

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/120/console to view the results.

review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/%7Ezorba-coders/zorba/partial_fix_bug_1167641/+merge/179741

Stage "ZorbaVQ" failed.

Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/276/console to view the results.

Zorba Build Bot (zorba-buildbot) wrote :
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

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-08-05 20:13:56 +0000
3+++ test/fots/CMakeLists.txt 2013-08-12 16:49:39 +0000
4@@ -141,6 +141,7 @@
5
6 EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 1187685)
7 EXPECTED_FOTS_FAILURE (fn-for-each-pair fn-for-each-pair-026 1187685)
8+EXPECTED_FOTS_FAILURE (fn-format-number numberformat20 1167641)
9 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)
10 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60m 1167609)
11 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60o 1167609)
12
13=== modified file 'test/fots_driver/environment.xq'
14--- test/fots_driver/environment.xq 2013-08-09 08:27:30 +0000
15+++ test/fots_driver/environment.xq 2013-08-12 16:49:39 +0000
16@@ -181,10 +181,12 @@
17 : to a test-case query.
18 :
19 : @param $decimal-formats decimal formats.
20+ : @param $namespaces the declared environment namespaces.
21 : @return the decimal formats declarations.
22 :)
23 declare function env:decl-decimal-formats(
24- $decimal-formats as element(fots:decimal-format)*
25+ $decimal-formats as element(fots:decimal-format)*,
26+ $namespaces as element(fots:namespace)*
27 ) as xs:string*
28 {
29 if (empty($decimal-formats))
30@@ -194,9 +196,10 @@
31 let $default := if ($tmp/@name)
32 then ()
33 else "default"
34- let $name := if ($tmp/@name)
35- then data($tmp/@name)
36- else ()
37+ let $name := xs:string($tmp/@name)
38+ let $eqName := fn:resolve-QName(xs:string($tmp/@name), $tmp)
39+ let $prefix := fn:prefix-from-QName($eqName)
40+ let $namespace := $namespaces/following-sibling::*[@uri=fn:namespace-uri-from-QName($eqName)]
41 return
42 string-join
43 (
44@@ -204,7 +207,9 @@
45 "declare",
46 $default,
47 "decimal-format",
48- $name,
49+ if(exists($prefix) and empty($namespace))
50+ then concat("%Q{", namespace-uri-from-QName($eqName), "}", local-name-from-QName($eqName))
51+ else $name,
52 env:set-properties($tmp),
53 ";"
54 ),
55
56=== modified file 'test/fots_driver/fots-driver.xq'
57--- test/fots_driver/fots-driver.xq 2013-08-09 08:27:30 +0000
58+++ test/fots_driver/fots-driver.xq 2013-08-12 16:49:39 +0000
59@@ -875,7 +875,9 @@
60 env:decl-namespaces($env, $envCase, $test),
61
62 env:decl-decimal-formats(($env/fots:decimal-format,
63- $envCase/fots:decimal-format)),
64+ $envCase/fots:decimal-format),
65+ ($env/fots:namespace,
66+ $envCase/fots:namespace)),
67
68 env:add-var-decl($env, $envCase, $envBaseURI, $testSetURI),
69

Subscribers

People subscribed via source and target branches