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

[Sorin Marian Nasoi]

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

[lp:~zorba-coders/zorba/partial_fix_bug_1167641]

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)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

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)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

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)]

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.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-08-05 20:13:56 +0000
+++ test/fots/CMakeLists.txt	2013-08-12 16:49:39 +0000
@@ -141,6 +141,7 @@
 
 EXPECTED_FOTS_FAILURE (fn-fold-left fold-left-009 1187685)
 EXPECTED_FOTS_FAILURE (fn-for-each-pair fn-for-each-pair-026 1187685)
+EXPECTED_FOTS_FAILURE (fn-format-number numberformat20 1167641)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60a 1167609)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60m 1167609)
 EXPECTED_FOTS_FAILURE (fn-format-number numberformat60o 1167609)
 
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-08-09 08:27:30 +0000
+++ test/fots_driver/environment.xq	2013-08-12 16:49:39 +0000
@@ -181,10 +181,12 @@
  : to a test-case query.
  :
  : @param $decimal-formats decimal formats.
+ : @param $namespaces the declared environment namespaces.
  : @return the decimal formats declarations.
  :)
 declare function env:decl-decimal-formats(
-  $decimal-formats as element(fots:decimal-format)*
+  $decimal-formats as element(fots:decimal-format)*,
+  $namespaces      as element(fots:namespace)*
 ) as xs:string*
 {
   if (empty($decimal-formats))
@@ -194,9 +196,10 @@
     let $default := if ($tmp/@name)
                     then ()
                     else "default"
-    let $name := if ($tmp/@name)
-                 then data($tmp/@name)
-                 else ()
+    let $name := xs:string($tmp/@name)
+    let $eqName := fn:resolve-QName(xs:string($tmp/@name), $tmp)
+    let $prefix := fn:prefix-from-QName($eqName)
+    let $namespace := $namespaces/following-sibling::*[@uri=fn:namespace-uri-from-QName($eqName)]
     return
       string-join
       (
@@ -204,7 +207,9 @@
         "declare",
         $default,
         "decimal-format",
-        $name,
+        if(exists($prefix) and empty($namespace))
+        then concat("%Q{", namespace-uri-from-QName($eqName), "}", local-name-from-QName($eqName))
+        else $name,
         env:set-properties($tmp),
         ";"
       ),
 
=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-08-09 08:27:30 +0000
+++ test/fots_driver/fots-driver.xq	2013-08-12 16:49:39 +0000
@@ -875,7 +875,9 @@
         env:decl-namespaces($env, $envCase, $test),
 
         env:decl-decimal-formats(($env/fots:decimal-format,
-                                  $envCase/fots:decimal-format)),
+                                  $envCase/fots:decimal-format),
+                                 ($env/fots:namespace,
+                                  $envCase/fots:namespace)),
 
         env:add-var-decl($env, $envCase, $envBaseURI, $testSetURI),