zorba-coders team mailing list archive

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

You have been requested to review the proposed merge of lp:~zorba-coders/zorba/rq-add-fots into lp:zorba.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/rq-add-fots/+merge/147504



-- 
https://code.launchpad.net/~zorba-coders/zorba/rq-add-fots/+merge/147504
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/rq-add-fots into lp:zorba.

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-02-03 11:23:36 +0000
+++ test/fots/CMakeLists.txt	2013-02-09 13:05:24 +0000
@@ -116,6 +116,11 @@
 EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)
 EXPECTED_FOTS_FAILURE (app-Demos itunes 0)
 EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-number-all 0)
+
+# Next two possibly unique to old RQ machine
+#EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-tokenize-7 0)
+#EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-tokenize-all 0)
+
 EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-1 0)
 EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-all 0)
 EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0)
@@ -495,7 +500,10 @@
 EXPECTED_FOTS_FAILURE (fn-node-name fn-node-name-28 0)
 EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-23 0)
 EXPECTED_FOTS_FAILURE (fn-normalize-space fn-normalize-space-25 0)
-EXPECTED_FOTS_FAILURE (fn-normalize-unicode fn-normalize-unicode-11 0)
+
+# This test passes on the old and new RQ machines; fixed?
+#EXPECTED_FOTS_FAILURE (fn-normalize-unicode fn-normalize-unicode-11 0)
+
 EXPECTED_FOTS_FAILURE (fn-normalize-unicode cbcl-fn-normalize-unicode-001 0)
 EXPECTED_FOTS_FAILURE (fn-normalize-unicode cbcl-fn-normalize-unicode-006 0)
 EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-001 0)
@@ -700,7 +708,10 @@
 EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-016 0)
 EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-017 0)
 EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
-EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-016 0)
+
+# This test passes on the old RQ machine but not the new; weird.
+#EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-016 0)
+
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-27 0)
@@ -757,6 +768,10 @@
 EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0)
+
+# Following test fails on old RQ machine but not new.
+#EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-10 0)
+
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-002 0)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-dateTime-001 0)

=== modified file 'test/fots_driver/README.TXT'
--- test/fots_driver/README.TXT	2012-12-11 22:04:02 +0000
+++ test/fots_driver/README.TXT	2013-02-09 13:05:24 +0000
@@ -33,19 +33,24 @@
  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
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-test-cases -e testSetPrefixes:=prod-Literal
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-test-cases -e dependency:=higherOrderFunctions
-zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-test-cases -e dependency:=higherOrderFunctions -e assertType:=assert-count
+zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-test-cases -e dependency:=higherOrderFunctions -e assertions:=assert-count
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=list-matching-test-cases -e pattern:=catch
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod -o result.xml --indent
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod -e expectedFailuresPath:=ExpectedFailures.xml -o result.xml --indent
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod -e dependency:=higherOrderFunctions_false -o result.xml --indent
-zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod -e assertType:=assert-count -o result.xml --indent
+zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod -e assertions:=assert-count -o result.xml --indent
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod-Literal -e verbose:=false -o result.xml --indent
 zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-case -e testSetName:=prod-Literal -e testCaseName:=Literals001 -o result.xml --indent
-zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-and-report -o report.xml --indent
-zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=report -e failuresFilePath:=failures.xml -e verbose:=false -o report.xml --indent
-zorba -f -q /path/to/cli.xq -e mode:=generate-expected-failures -e failuresFilePath:=failures.xml -o ExpectedFailures.xml --indent
+zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-and-report -o results_Zorba_XQ30.xml --indent --disable-http-resolution
+zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=report -e resultsFilePath:=results.xml -o results_Zorba_XQ30.xml --indent
+zorba -f -q /path/to/cli.xq -e mode:=generate-expected-failures -e resultsFilePath:=failures.xml -o ExpectedFailures.xml --indent
+

=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq	2013-02-05 10:14:43 +0000
+++ test/fots_driver/cli.xq	2013-02-09 13:05:24 +0000
@@ -199,8 +199,8 @@
     "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod -e assertions:=assert-count -o result.xml --indent",
     "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-sets -e testSetPrefixes:=prod-Literal -e verbose:=false -o result.xml --indent",
     "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-test-case -e testSetName:=prod-Literal -e testCaseName:=Literals001 -o result.xml --indent",
-    "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-and-report -o report.xml --indent",
-    "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=report -e resultsFilePath:=failures.xml -o results_Zorba_XQ30.xml --indent",
+    "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=run-and-report -o results_Zorba_XQ30.xml --indent --disable-http-resolution",
+    "zorba -f -q /path/to/cli.xq -e fotsPath:=/path/to/QT3-test-suite/catalog.xml -e mode:=report -e resultsFilePath:=results.xml -o results_Zorba_XQ30.xml --indent",
     "zorba -f -q /path/to/cli.xq -e mode:=generate-expected-failures -e resultsFilePath:=failures.xml -o ExpectedFailures.xml --indent",
     ""
     ), "
")

=== modified file 'test/fots_driver/feedback.xq'
--- test/fots_driver/feedback.xq	2013-02-04 16:48:16 +0000
+++ test/fots_driver/feedback.xq	2013-02-09 13:05:24 +0000
@@ -110,7 +110,9 @@
          <fots:info>
            {$env}
            <fots:query>{$zorbaQuery}</fots:query>
-           {$result/descendant::*}
+           {$result/fots:expected-result,
+            $result/fots:result,
+            $result/fots:errors}
          </fots:info>
       as last into $case,
       delete node $case/fots:description,
@@ -161,7 +163,9 @@
         <fots:info>
           {$env}
           <fots:query>{$zorbaQuery}</fots:query>
-          {$result/descendant::*}
+          {$result/fots:expected-result,
+            $result/fots:result,
+            $result/fots:errors}
         </fots:info>
       as last into $case,
       delete node $case/fots:description,
@@ -212,7 +216,9 @@
          <fots:info>
            {$env}
            <fots:query>{$zorbaQuery}</fots:query>
-           {$result/descendant::*}
+           {$result/fots:expected-result,
+            $result/fots:result,
+            $result/fots:errors}
          </fots:info>
        as last into $case,
        delete node $case/fots:description,

=== modified file 'test/fots_driver/reporting.xq'
--- test/fots_driver/reporting.xq	2013-02-05 10:14:43 +0000
+++ test/fots_driver/reporting.xq	2013-02-09 13:05:24 +0000
@@ -62,7 +62,7 @@
   $FOTSZorbaManifestPath  as xs:string,
   $exceptedTestCases      as xs:string*,
   $exceptedTestSets       as xs:string*
-)
+) as document-node()
 {
   try
   {
@@ -122,7 +122,7 @@
   try
   {
     {
-      reporting:W3C-reporting(parse-xml(file:read-text($resultsFilePath)),
+      reporting:W3C-reporting(parse-xml(file:read-text($resultsFilePath))/fots:test-cases,
                               $FOTSZorbaManifestPath)
     }
   }
@@ -139,7 +139,7 @@
  : @return The W3C conformance submission file.
  :)
 declare %ann:sequential function reporting:W3C-reporting(
-  $results                as document-node()?,
+  $results                as element(fots:test-cases)?,
   $FOTSZorbaManifestPath  as xs:string
 ) as document-node()
 {