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

[Sorin Marian Nasoi]

Fix for lp:1079006.

Fix for lp:1079006.

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

review: Approve

[Cezar Andrei (cezar-andrei)]

This is very useful when trying to debug failures.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1079006-2013-01-22T14-22-49.153Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/fix_bug_1079006 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job fix_bug_1079006-2013-01-22T14-22-49.153Z is finished.
  The final status was:

  5 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in test/fots_driver/cli.xq

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

11194. By Sorin Marian Nasoi <email address hidden> on 2013-01-24

Merged trunk.

[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_1079006-2013-01-24T07-14-03.801Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix_bug_1079006-2013-01-24T07-14-03.801Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq	2013-01-22 23:18:40 +0000
+++ test/fots_driver/cli.xq	2013-01-24 07:09:26 +0000
@@ -147,9 +147,10 @@
 
 
 (:~ 
-  Enable or disable verbose output 
+  Enable or disable verbose output. When this is set to true the exact query
+  that is run by XQXQ is also written down into a query_*.xq file.
 :)
-declare variable $verbose as xs:string external := "true";
+declare variable $verbose as xs:string external := "false";
 
 
 declare function local:usage() as xs:string
@@ -165,6 +166,10 @@
     " This way you will see trace information in the CLI window and detailed",
     " results of the test cases in the 'output.xml'.",
     "",
+    " Please note that when Verbose is set to true the query that is executed",
+  	" is written down into a query_TESTCASENAME.xq file, where TESTCASENAME is",
+  	" the test case name.",
+  	"",
     "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e fotsZorbaManifestPath:=/path/to/Zorba_manifest.xml -e mode:=list-test-sets",
     "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-test-sets",
     "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-test-sets -e testSetPrefixes:=prod,app",
@@ -188,13 +193,14 @@
 
 (:~
   Tokenize a string that contains a comma-separated list of tokens.
-  Note: if the input string is empty, the function returns the empty sequence.
+  Note: if the input string is empty, the function returns the empty string.
 :)
 declare %private function local:tokenize(
   $input as xs:string
 ) as xs:string*
 {
-  tokenize($input, ",")
+  let $tokens := tokenize($input, ",")
+  return if (exists($tokens)) then $tokens else ""
 };
 
 

=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-01-22 23:18:40 +0000
+++ test/fots_driver/fots-driver.xq	2013-01-24 07:09:26 +0000
@@ -702,8 +702,14 @@
                                                   $case,
                                                   $env,
                                                   $envBaseURI,
-                                                  $testSetBaseURI),
-           $startDateTime := datetime:current-dateTime (),
+                                                  $testSetBaseURI);
+
+  (: if $verbose then print the query to a file :)
+  if($verbose)
+  then util:write-query-to-file($xqxqQuery, $queryName);
+  else ();
+
+  variable $startDateTime := datetime:current-dateTime (),
            $result := driver:xqxq-invoke($xqxqQuery,
                                          $case,
                                          $verbose,

=== modified file 'test/fots_driver/util.xq'
--- test/fots_driver/util.xq	2013-01-22 23:18:40 +0000
+++ test/fots_driver/util.xq	2013-01-24 07:09:26 +0000
@@ -50,7 +50,7 @@
     <output:indent                value="no"  />
     <output:omit-xml-declaration  value="yes" />
   </output:serialization-parameters>;
-  
+
 (:~
  : The serialization parameters for XML serialization.
  :)
@@ -130,3 +130,12 @@
    then fn:serialize($res, $SerParams)
    else fn:string($res)
 };
+
+declare %ann:sequential function util:write-query-to-file(
+  $query        as xs:string,
+  $queryName    as xs:string
+) {
+  file:write(concat("query_", $queryName, ".xq"),
+             $query,
+             $util:serParamXml);
+};