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

[Sorin Marian Nasoi]

Fix for bug lp:882002:
- changed the error thrown for W3C test fn-collection-2 according to the decision took by the W3C in http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 that is reflected in the latest XQuery 3.0 F&O spec for fn:collection: "An error is raised [err:FODC0002] if available collections provides no mapping for the absolutized URI."
- added a new expected result for the RQ because it uses XQTS_1_0_3 where the expected error for this test is [err:FODC0004].
- removed the exception added for fn-collection-2 in the script that generates the conformance results for W3C

Fix for bug lp:882002:
- changed the error thrown for W3C test fn-collection-2 according to the decision took by the W3C in http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 that is reflected in the latest XQuery 3.0 F&O spec for fn:collection: "An error is raised [err:FODC0002] if available collections provides no mapping for the absolutized URI."
- added a new expected result for the RQ because it uses XQTS_1_0_3 where the expected error for this test is [err:FODC0004].
- removed the exception added for fn-collection-2 in the script that generates the conformance results for W3C

[Daniel Turcanu (danielturcanu)]

Ok

review: Approve

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

Reviewed and approved.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug_882002-2011-11-09T13-47-11.43Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug_882002-2011-11-09T13-47-11.43Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/collections/collections_impl.cpp'
--- src/runtime/collections/collections_impl.cpp	2011-11-01 13:47:10 +0000
+++ src/runtime/collections/collections_impl.cpp	2011-11-02 15:51:46 +0000
@@ -161,7 +161,7 @@
   if ( lCollResource == 0 || !(coll = lCollResource->getCollection()) )
   {
     throw XQUERY_EXCEPTION(
-      err::FODC0004,
+      err::FODC0002,
       ERROR_PARAMS( resolvedURIString, lErrorMessage ),
       ERROR_LOC( loc )
     );

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-10-13 12:46:50 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2011-11-02 15:51:46 +0000
@@ -201,7 +201,7 @@
 ENDIF (ZORBATEST_TESTDRIVER_MT_AVAILABLE AND ZORBATEST_USE_MT_XQTS AND
   IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/w3c_testsuite")
 
-SET(ZORBA_TEST_W3C_TO_SUBMIT_RESULTS OFF CACHE BOOL "Bool var that says if w3c testing results are to be submited to w3c, or just for internal testing. If they are for internal testing then we can mark some failing tests as expected results.")
+SET(ZORBA_TEST_W3C_TO_SUBMIT_RESULTS OFF CACHE BOOL "Bool var that says if w3c testing results are to be submitted to w3c, or just for internal testing. If they are for internal testing then we can mark some failing tests as expected results.")
 MARK_AS_ADVANCED(ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
 ####
@@ -230,6 +230,10 @@
     EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes014 3355019)
     EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015 3355019)
   ENDIF(ZORBA_TEST_XQUERYX)
+  
+  #this is marked as expected failure because the RQ uses XQTS_1_0_3. In that version the expected result is err:FODC0004 instead of err:FODC0002.
+  #W3C has changed the expected result for this test in the meantime: please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542
+  EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2 882002)
 
 ENDIF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 

=== modified file 'test/rbkt/Queries/w3c_known_failures.txt'
--- test/rbkt/Queries/w3c_known_failures.txt	2011-10-13 12:46:50 +0000
+++ test/rbkt/Queries/w3c_known_failures.txt	2011-11-02 15:51:46 +0000
@@ -69,6 +69,7 @@
 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
+test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-004
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-903
 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007

=== modified file 'test/rbkt/Scripts/w3c/generate-submission-xqts.xq'
--- test/rbkt/Scripts/w3c/generate-submission-xqts.xq	2011-10-07 08:28:43 +0000
+++ test/rbkt/Scripts/w3c/generate-submission-xqts.xq	2011-11-02 15:51:46 +0000
@@ -83,12 +83,6 @@
           result="pass"
           comment="Opened W3C bug #11584."
         />
-      else if($testname = 'fn-collection-2')then
-      <test-case
-          name="{$testname}"
-          result="pass"
-          comment="Opened W3C bug #12542."
-        />
       else
         <test-case
           name="{$testname}"