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

Commit message:
- updated FOTS snapshot to May 1st
- updated expected failures accordingly
- updated W3C_submission_template.xml
- updated FOTSZorbaManifest to include the newly added "infoset-dtd" dependency
- updated FOTS driver to check for "infoset-dtd" dependency instead of certain 
test-case and test-set names

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

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_1st/+merge/161934
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_May_1st/+merge/161934
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-05-01 10:08:16 +0000
+++ test/fots/CMakeLists.txt	2013-05-01 19:32:46 +0000
@@ -119,21 +119,11 @@
 #All these entries should have a *valid* opened bug number from W3C bugzilla.
 EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport qischema040 21339)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-SchemaImport qischema040a 21339)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en126 21423)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en127 21423)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en128 21423)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en132 21423)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en133 21423)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en134 21423)
-EXPECTED_FOTS_FAILURE (DISPUTED fn-format-dateTime format-dateTime-011 21794)
 EXPECTED_FOTS_FAILURE (DISPUTED fn-format-integer format-integer-044 21448)
 EXPECTED_FOTS_FAILURE (DISPUTED fn-format-date format-date-en152 21558)
 EXPECTED_FOTS_FAILURE (DISPUTED fn-format-dateTime format-dateTime-en152 21558)
-EXPECTED_FOTS_FAILURE (DISPUTED prod-AxisStep cbcl-childAxis-001 21620)
-EXPECTED_FOTS_FAILURE (DISPUTED prod-AxisStep Axes115 21620)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
-EXPECTED_FOTS_FAILURE (DISPUTED misc-CombinedErrorCodes XQST0085 21730)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-001 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-003 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-005 21568)
@@ -150,7 +140,6 @@
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-027 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568)
-EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-003 21868)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-004 21868)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-005 21868)
@@ -158,6 +147,8 @@
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-028 21868)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-031 21868)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED fn-id K2-SeqIDFunc-11 21414)
+EXPECTED_FOTS_FAILURE (DISPUTED fn-id K2-SeqIDFunc-12 21414)
 
 # Next three possibly unique to old RQ machine, but they need to be
 # marked for the RQ to pass.
@@ -229,7 +220,6 @@
 EXPECTED_FOTS_FAILURE (fn-string-length fn-string-length-24 0)
 EXPECTED_FOTS_FAILURE (fn-tokenize fn-tokenize-31 0)
 EXPECTED_FOTS_FAILURE (fn-tokenize fn-tokenize-32 0)
-EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-037 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-038 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-039 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-042 0)
@@ -239,7 +229,6 @@
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-available fn-unparsed-text-available-036 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-available fn-unparsed-text-available-037 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-available fn-unparsed-text-available-038 0)
-EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-037 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-038 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-039 0)
 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-042 0)

=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake	2013-04-23 02:39:22 +0000
+++ test/fots/ImportFOTS.cmake	2013-05-01 19:32:46 +0000
@@ -19,7 +19,7 @@
 
 
 # Change this to publish updated FOTS archives
-SET (FOTS_ARCHIVE "FOTS_230413.tgz")
+SET (FOTS_ARCHIVE "FOTS_010513.tgz")
 
 # Change this to modify which elements in FOTS driver results are output
 # as CDATA

=== modified file 'test/fots_driver/FOTSZorbaManifest.xml'
--- test/fots_driver/FOTSZorbaManifest.xml	2013-04-17 11:11:24 +0000
+++ test/fots_driver/FOTSZorbaManifest.xml	2013-05-01 19:32:46 +0000
@@ -10,6 +10,7 @@
   <dependency type="feature" value="schemaValidation" satisfied="true"/>
   <dependency type="feature" value="staticTyping" satisfied="false"/>
   <dependency type="feature" value="xpath-1.0-compatibility" satisfied="true"/>       <!-- Is this correct? -->
+  <dependency type="feature" value="infoset-dtd" satisfied="true"/>
 
   <!-- We are not interested in running XPath test cases, we only run XQuery test cases -->
   <dependency type="spec" value="XP10+" satisfied="false"/>

=== modified file 'test/fots_driver/W3C_submission_template.xml'
--- test/fots_driver/W3C_submission_template.xml	2013-02-04 16:48:16 +0000
+++ test/fots_driver/W3C_submission_template.xml	2013-05-01 19:32:46 +0000
@@ -3,15 +3,15 @@
     <created  by="Sorin Nasoi"
               email="sorin.marian.nasoi_at_gmail.com"
               organization="FLWOR Foundation"
-              on="2013-01-24"/>
+              on="2013-04-01"/>
     <test-run test-suite-version="CVS"
-              date-run="2013-01-24"/>
+              date-run="2013-04-01"/>
     <notes/>
   </submission>
   <product  vendor="FLWOR Foundation"
-            name="Zorba"
-            version="2.8"
-            released="true"
+            name="Zorba_11424"
+            version="11424"
+            released="false"
             open-source="true"
             language="XQ30"/>
 </test-suite-result>

=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq	2013-04-30 06:29:23 +0000
+++ test/fots_driver/fots-driver.xq	2013-05-01 19:32:46 +0000
@@ -715,8 +715,6 @@
                          then $catalogBaseURI
                          else $tsBaseURI,
                         
-                         exists(index-of(('fn-id', 'fn-idref', 'app-FunctxFunctx'), $tsName)),
-                        
                          $verbose,
                         
                          $cliMode,
@@ -748,8 +746,6 @@
  :        environment is specified in. It is used to calculate the full URI
  :        for the different children of the <environment> that have a @file
  :        attribute.
- : @param $mayNeedDTDValidation true if the test case may need DTD validation
- :        for the document bound as context item.
  : @param $verbose if true, the resulting XML tree will contain more details
  :        about the test-case.
  : @param $cliMode the cli command.
@@ -767,7 +763,6 @@
   $FOTSZorbaManifest    as document-node(),
   $env                  as element(fots:environment)?,
   $envBaseURI           as xs:anyURI?,
-  $mayNeedDTDValidation as xs:boolean,
   $verbose              as xs:boolean,
   $cliMode              as xs:string,
   $usePlanSerializer    as xs:boolean
@@ -809,7 +804,6 @@
                          $expFailureTC,
                          $ctestMode,
                          $cliMode,
-                         $mayNeedDTDValidation,
                          $usePlanSerializer)
   }
 };
@@ -836,8 +830,6 @@
  : @param $ctestMode true if the known failures are to be reported as 'pass'
  :        instead of 'fail'.
  : @param $cliMode the cli command.
- : @param $mayNeedDTDValidation true if the test-case may need DTD validation
- :        for the document bound as context item.
  : @param $usePlanSerializer if true the plan serializer is used.
  : @return an XML tree containing the result of running the test-case.
  :)
@@ -852,7 +844,6 @@
   $expFailureTC         as element(Test)?,
   $ctestMode            as xs:boolean,
   $cliMode              as xs:string,
-  $mayNeedDTDValidation as xs:boolean,
   $usePlanSerializer    as xs:boolean
 ) as element(fots:test-case)?
 {
@@ -893,24 +884,12 @@
       "&#xA;"
       );
 
-   variable $needsDTDValidation :=
-    if (not($mayNeedDTDValidation))
-    then fn:false()
-    else if (($testSetName = 'app-FunctxFunctx') and
-             (xs:string($case/@name) = 'functx-functx-id-from-element-1'))
-    then fn:true()
-    else if (($testSetName = 'fn-id') and
-             starts-with(xs:string($case/@name), 'fn-id-dtd-'))
-    then fn:true()
-    else (($testSetName = 'fn-idref') and
-         starts-with(xs:string($case/@name), 'fn-idref-dtd-'));
-
     variable $xqxqQuery := driver:create-XQXQ-query($query,
                                                     $case,
                                                     $env,
                                                     $envBaseURI,
                                                     $testSetBaseURI,
-                                                    $needsDTDValidation);
+                                                    $deps);
 
     (:if $verbose then print the query to a file:)
     if ($verbose and
@@ -997,9 +976,9 @@
  : @param $env the environment.
  : @param $envBaseURI URI of the environment.
  : @param $testSetBaseURI the URI of the directory that contains the file of the
-          associated test set.
- : @param $needsDTDValidation true if the test case needs DTD validation
- :        for the document bound as context item.
+ :        associated test set.
+ : @param $deps the dependencies that should be checked for given test-case.
+ :        These may be defined at test-set level and/or test-case level.
  : @return the query that will be evaluated.
  :)
 declare %private function driver:create-XQXQ-query(
@@ -1008,7 +987,7 @@
   $env                as element(fots:environment)?,
   $envBaseURI         as xs:anyURI?,
   $testSetBaseURI     as xs:anyURI,
-  $needsDTDValidation as xs:boolean
+  $deps               as element(fots:dependency)*
 ) as xs:string
 {
   let $resolver as xs:string? := env:resolver($case,
@@ -1019,6 +998,7 @@
                                           $env,
                                           $envBaseURI,
                                           $testSetBaseURI)
+  let $needsDTDValidation := exists($deps[@type="feature" and @value="infoset-dtd"])
   return
     string-join
     (

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to