Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba.
Commit message: - bumped QT snapshot to August 5th - removed the environment checking for the default collection and collations other tahn Unicode Codepoint Collection - added necessary dependencies in FOTSZorbaManifest for 'non_unicode_codepoint_collation' and 'non_empty_sequence_collection' Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 -- https://code.launchpad.net/~zorba-coders/zorba/bump_QT_snapshot_August_8th/+merge/178571 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/ImportFOTS.cmake' --- test/fots/ImportFOTS.cmake 2013-07-24 14:14:43 +0000 +++ test/fots/ImportFOTS.cmake 2013-08-05 13:54:28 +0000 @@ -23,8 +23,8 @@ #this is the official QT 1.0 release from 21st June 2013 #SET (FOTS_ARCHIVE "QT3_1_0.tgz") -#this is the QT CVS trunk version as from 24th July 2013 -SET (FOTS_ARCHIVE "QT_240713.tgz") +#this is the QT CVS trunk version as from 5th August 2013 +SET (FOTS_ARCHIVE "QT_050813.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-07-12 08:45:22 +0000 +++ test/fots_driver/FOTSZorbaManifest.xml 2013-08-05 13:54:28 +0000 @@ -11,6 +11,12 @@ <dependency type="feature" value="staticTyping" satisfied="false"/> <dependency type="feature" value="infoset-dtd" satisfied="true"/> <dependency type="feature" value="typedData" satisfied="true"/> + + <!-- Posibility to define other collations besides Unicode Codepoint Collation which is the default--> + <dependency type="feature" value="non_unicode_codepoint_collation" satisfied="false"/> + + <!-- Posibility to set the default collection to something different than empty sequence --> + <dependency type="feature" value="non_empty_sequence_collection" satisfied="false"/> <!-- This dependency marks a XPath 1.0 test-case --> <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/> === modified file 'test/fots_driver/environment.xq' --- test/fots_driver/environment.xq 2013-06-11 17:26:40 +0000 +++ test/fots_driver/environment.xq 2013-08-05 13:54:28 +0000 @@ -737,22 +737,3 @@ } }; -(:~ - : Checks if a test case should be run. Possible reasons for not running a test - : according to http://dev.w3.org/2011/QT3-test-suite/guide/running.html: - : - the environment requires the setting of collections - : - the environment requires the setting of collation URIs - : - : - :) -declare function env:check-prerequisites( - $case as element(fots:test-case), - $env as element(fots:environment)? -) as xs:string? -{ - if(exists($case/fots:environment/fots:collection) or exists($env/fots:collection)) - then 'Default collection is always an empty sequence.' - else if (exists($case/fots:environment/fots:collation) or exists($env/fots:collation)) - then 'Can not define any other collations (other than the Unicode Codepoint Collation).' - else () -}; === modified file 'test/fots_driver/fots-driver.xq' --- test/fots_driver/fots-driver.xq 2013-07-19 08:58:43 +0000 +++ test/fots_driver/fots-driver.xq 2013-08-05 13:54:28 +0000 @@ -906,9 +906,7 @@ $usePlanSerializer); variable $duration := (datetime:current-dateTime() - $startDateTime); - - variable $prerequisitesError as xs:string? := env:check-prerequisites($case, $env); - + variable $checkPass := feedback:check-pass($result, $queryName, $testSetName, $expFailureTC, $ctestMode); if ($checkPass) then @@ -920,15 +918,6 @@ $verbose, $expFailureTC, $ctestMode) - (: - If the test case did not pass, we check to see if the failure is caused - by a environment that requires setting of a COLLATION or COLLECTION. - There are over 130 test cases that are using an environment that requires - setting a COLLATION or COLLECTION but they still PASS even if this setting - is not done. That is why we first run the test case. - :) - else if (exists($prerequisitesError)) then - feedback:not-applicable($case, $prerequisitesError) else if ($expFailureTC/@finalStatus = "disputed") then feedback:disputed($case, concat("For details please see https://www.w3.org/Bugs/Public/show_bug.cgi?id=";, === modified file 'test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml' --- test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-07-12 08:45:22 +0000 +++ test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml 2013-08-05 13:54:28 +0000 @@ -12,6 +12,12 @@ <dependency type="feature" value="infoset-dtd" satisfied="true"/> <dependency type="feature" value="typedData" satisfied="true"/> + <!-- Posibility to define other collations besides Unicode Codepoint Collation which is the default--> + <dependency type="feature" value="non_unicode_codepoint_collation" satisfied="false"/> + + <!-- Posibility to set the default collection to something different than empty sequence --> + <dependency type="feature" value="non_empty_sequence_collection" satisfied="false"/> + <!-- This dependency marks a XPath 1.0 test-case --> <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/> === modified file 'test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml' --- test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-07-12 08:45:22 +0000 +++ test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml 2013-08-05 13:54:28 +0000 @@ -12,6 +12,12 @@ <dependency type="feature" value="infoset-dtd" satisfied="true"/> <dependency type="feature" value="typedData" satisfied="true"/> + <!-- Posibility to define other collations besides Unicode Codepoint Collation which is the default--> + <dependency type="feature" value="non_unicode_codepoint_collation" satisfied="false"/> + + <!-- Posibility to set the default collection to something different than empty sequence --> + <dependency type="feature" value="non_empty_sequence_collection" satisfied="false"/> + <!-- This dependency marks a XPath 1.0 test-case --> <dependency type="feature" value="xpath-1.0-compatibility" satisfied="false"/>
-- 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
