zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1173640 into lp:zorba.

Commit message:
- 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

Requested reviews:
  Markos Zaharioudakis (markos-za)
  Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
  Bug #1173640 in Zorba: "FOTS test cast contextDecl-047 fails due to FOTS driver bug"
  https://bugs.launchpad.net/zorba/+bug/1173640

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1173640/+merge/161387

- 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
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1173640/+merge/161387
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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
     ()
 };