Merge lp:~zorba-coders/zorba/fix_notRun_test-cases into lp:zorba

[Sorin Marian Nasoi]

- test-cases that are not run because they use an environment that requires setting of a COLLATION or COLLECTION are marked 'n/a' instead of 'notRun'.
For more details please see W3C bug #22423.

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

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

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/fix_notRun_test-cases/+merge/175734 :
Votes: {'Approve': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/fix_notRun_test-cases/+merge/175734

Stage "CommitZorba" failed.

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

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'test/fots_driver/feedback.xq'
--- test/fots_driver/feedback.xq	2013-06-06 12:04:21 +0000
+++ test/fots_driver/feedback.xq	2013-07-19 06:03:29 +0000
@@ -246,7 +246,7 @@
   $dependencyError  as xs:string
 ) as element(fots:test-case)
 {
-  <fots:test-case name="{data($case/@name)}"
+  <fots:test-case name="{$case/@name}"
                   result="n/a"
                   comment="{$dependencyError}"/>
 };

=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-06-11 17:26:40 +0000
+++ test/fots_driver/fots-driver.xq	2013-07-19 06:03:29 +0000
@@ -928,7 +928,7 @@
       is not done. That is why we first run the test case.
      :)
     else if (exists($prerequisitesError)) then
-      feedback:not-run($case, $prerequisitesError)
+      feedback:not-applicable($case, $prerequisitesError)
     else if ($expFailureTC/@finalStatus = "disputed") then
       feedback:disputed($case,
                         concat("For details please see https://www.w3.org/Bugs/Public/show_bug.cgi?id=",