zorba-coders team mailing list archive

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

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

Commit message:
Fixes FOTS driver.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

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

Fixes FOTS driver.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver/+merge/153009
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-03-12 15:34:52 +0000
+++ test/fots/CMakeLists.txt	2013-03-12 20:29:28 +0000
@@ -121,7 +121,6 @@
 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 0)
 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 0)
 EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
-EXPECTED_FOTS_FAILURE (app-Demos currencysvg 0)
 EXPECTED_FOTS_FAILURE (app-Demos itunes 0)
 EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0)
 EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0)
@@ -722,25 +721,6 @@
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl version_declaration-023-v3 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase01S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase02S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase03S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase04S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase05S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase06S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase07S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase08S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase09S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase10S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase11S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase12S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase13S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase14S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase15S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase16S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase17S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase18S 0)
-EXPECTED_FOTS_FAILURE (prod-WindowClause WindowingUseCase19S 0)
 EXPECTED_FOTS_FAILURE (prod-WindowClause SlidingWindowExpr507 0)
 EXPECTED_FOTS_FAILURE (prod-WindowClause TumblingWindowExpr507 0)
 EXPECTED_FOTS_FAILURE (xs-anyURI cbcl-anyURI-002 0)

=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq	2013-02-28 11:15:32 +0000
+++ test/fots_driver/cli.xq	2013-03-12 20:29:28 +0000
@@ -370,6 +370,13 @@
            $resultsFilePath)
 }
 
+case "wiki-report"
+return
+{
+  r:wiki-report($fotsPath,
+                $resultsFilePath)
+}
+
 case "generate-expected-failures"
 return
 {

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-03-12 13:56:51 +0000
+++ test/fots_driver/environment.xq	2013-03-12 20:29:28 +0000
@@ -459,15 +459,20 @@
                                 then xs:string($namespace/@prefix)
                                 else "p"
     return
-      if ($prefix eq "")
-      then concat('import schema default element namespace "',
-                  $env/fots:schema/@uri,
-                  '";
')
-      else concat('import schema namespace ',
-                  $prefix,
-                  ' = "',
-                  $env/fots:schema/@uri,
-                  '";
')
+      if (empty($env/fots:schema/@uri))
+      then 'import schema default element namespace "";'
+      else
+      {
+        if ($prefix eq "")
+        then concat('import schema default element namespace "',
+                    $env/fots:schema/@uri,
+                    '";
')
+        else concat('import schema namespace ',
+                    $prefix,
+                    ' = "',
+                    $env/fots:schema/@uri,
+                    '";
')
+      }
 };
 
 

=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-03-07 13:49:26 +0000
+++ test/fots_driver/fots-driver.xq	2013-03-12 20:29:28 +0000
@@ -416,7 +416,7 @@
                            $expectedFailures,
                            $cliMode)
   }
-  catch *
+  catch err:FODC0002
   {
     error($err:code,
           concat("
Please make sure the passed 'fotsPath' points to the",
@@ -566,7 +566,7 @@
                            $expectedFailures,
                            $cliMode)
   }
-  catch *
+  catch err:FODC0002
   {
     error($err:code,
           concat("
Please make sure the passed 'fotsPath' points to the",

=== modified file 'test/fots_driver/reporting.xq'
--- test/fots_driver/reporting.xq	2013-03-12 13:56:51 +0000
+++ test/fots_driver/reporting.xq	2013-03-12 20:29:28 +0000
@@ -99,7 +99,7 @@
                               $FOTSZorbaManifestPath)
     }
   }
-  catch *
+  catch err:FODC0002
   {
     error($err:code,
           $err:description,
@@ -205,7 +205,7 @@
       $W3CTemplate
     }
   }
-  catch *
+  catch err:FODC0002
   {
     error($err:code,
           $err:description,
@@ -220,7 +220,7 @@
  : @param $failures Path to the results fo the FOTS.
  : @return a report of tests run.
  :)
-declare %ann:nondeterministic function reporting:do-reporting(
+declare %ann:nondeterministic function reporting:wiki-report(
   $FOTSCatalogFilePath  as xs:string,
   $resultsFilePath      as xs:string
 ) as element(fots:report)
@@ -282,7 +282,7 @@
   
   }
 }
-catch *
+catch err:FODC0002
 {
   error($err:code,
         $err:description,

=== modified file 'test/fots_driver/util.xq'
--- test/fots_driver/util.xq	2013-03-12 13:56:51 +0000
+++ test/fots_driver/util.xq	2013-03-12 20:29:28 +0000
@@ -96,7 +96,12 @@
     where (fn:local-name-from-QName(fn:node-name($node)) eq $node-name)
     return
       if ($node/@file)
-      then fn:unparsed-text(resolve-uri($node/@file, $baseURI))
+      then
+      {
+        if(ends-with($node/@file, ".xml"))
+        then fn:serialize(doc(resolve-uri($node/@file, $baseURI)), $util:serParamXml)
+        else fn:unparsed-text(resolve-uri($node/@file, $baseURI))
+      }
       else fn:string($node)
   }
   catch *