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

[Sorin Marian Nasoi]

- fix for lp:1173640
- test case "contextDecl-047" that used to 'fail' is now passing
- test cases "contextDecl-020" and "contextDecl-054" that used to report "wrongError" are now passing also

- fix for lp:1173640
- test case "contextDecl-047" that used to 'fail' is now passing
- test cases "contextDecl-020" and "contextDecl-054" that used to report "wrongError" are now passing also

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

11387. By sorin.marian.nasoi <email address hidden> on 2013-04-29

Merget lp:zorba trunk.

11388. By sorin.marian.nasoi <email address hidden> on 2013-04-29

- fix for lp:1173640
- test case "contextDecl-047" that used to 'fail' is now passing
- test cases "contextDecl-020" and "contextDecl-054" teht used to report "wrongError" are now passing also

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

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1173640-2013-04-29T09-52-43.933Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix_bug_1173640-2013-04-29T09-52-43.933Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 2 Pending.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1173640-2013-04-29T15-11-40.544Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix_bug_1173640-2013-04-29T15-11-40.544Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-28 16:23:28 +0000
+++ test/fots/CMakeLists.txt	2013-04-29 09:51:56 +0000
@@ -293,7 +293,6 @@
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 0)
 EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0)
 EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0)
-EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0)
 EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0)
 EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998)

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-04-25 21:43:36 +0000
+++ test/fots_driver/environment.xq	2013-04-29 09:51:56 +0000
@@ -374,6 +374,11 @@
     ,
     "
"
     )
+  else if(exists($env/fots:context-item/@select))
+  then
+    concat('xqxq:bind-context-item($queryID,',
+           $env/fots:context-item/@select,
+           ');')
   else
     ()
 };