zorba-coders team mailing list archive

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

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

Requested reviews:
  Zorba Coders (zorba-coders)
Related bugs:
  Bug #867094 in Zorba: "XQTSX failures due to W3C bugs"
  https://bugs.launchpad.net/zorba/+bug/867094

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

Fixed bug lp:867094.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_867094/+merge/121405
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_867094 into lp:zorba.

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2012-08-16 18:31:02 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2012-08-27 11:30:27 +0000
@@ -230,7 +230,6 @@
 ####
 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
-  #EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
 
   IF (NOT ZORBA_WITH_BIG_INTEGER)
@@ -263,10 +262,6 @@
     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_XQueryX.txt'
--- test/rbkt/Queries/w3c_known_failures_XQueryX.txt	2012-01-26 09:38:39 +0000
+++ test/rbkt/Queries/w3c_known_failures_XQueryX.txt	2012-08-27 11:30:27 +0000
@@ -1,88 +1,79 @@
-test/rbkt/w3c_testsuite/XQueryX/SchemaValidation/ValidateExpression/validateexpr-28
-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-02
-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-01
-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-WhereExpr001
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFunctions/ST-Data001
 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes012
 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes011
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015
 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes013
 test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes014
-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015
-test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFunctions/ST-Data001
-test/rbkt/w3c_testsuite/XQueryX/Basics/EQNames/eqname-013
-test/rbkt/w3c_testsuite/XQueryX/PathExpr/Steps/Steps-leading-lone-slash-8a
-test/rbkt/w3c_testsuite/XQueryX/SchemaImport/SchemaImportProlog/modules-schema-context
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-WhereExpr001
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-01
+test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STFLWORExpr/ST-PITest-02
+test/rbkt/w3c_testsuite/XQueryX/SchemaValidation/ValidateExpression/validateexpr-28
+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
+test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-021
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-049
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-024
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-913
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-046
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-030
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-047
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-914
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-038
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-039
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-037
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-007
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-913
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-015
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-904
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-024
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-017
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-914
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-049
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-018
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-047
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-028
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-036
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-028
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-017
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-038
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-029
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-018
 test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-031
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-039
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-037
-test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-904
-test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
-test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
-test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-005
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-006
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-903
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-003
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-007
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-001
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-901
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-002
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-004
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-902
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-003
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-002
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-903
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-901
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-902
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-004
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-005
+test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-030
+test/rbkt/w3c_testsuite/XQueryX/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
+test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemWhitespace/K2-DirectConElemWhitespace-25
+test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-27
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
+test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-009
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-008
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-001
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-002
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-003
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-002
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-004
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-009
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldLeft/fold-left-005
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-003
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-002
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-004
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-001
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-003
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-901
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/FoldRight/fold-right-005
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-008
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-005
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-006
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-007
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-001
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-901
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-007
 test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-902
-test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-001
-test/rbkt/w3c_testsuite/XQueryX/FunctX/functx-fn-tokenize/functx-fn-tokenize-7
-test/rbkt/w3c_testsuite/XQueryX/FunctX/functx-fn-tokenize/functx-fn-tokenize-all
-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5
-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch08
-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09
-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6
-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch11
-test/rbkt/w3c_testsuite/XQueryX/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10
-test/rbkt/w3c_testsuite/XQueryX/exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-22
-test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-27
-test/rbkt/w3c_testsuite/XQueryX/Construct/DirectConElem/DirectConElemWhitespace/K2-DirectConElemWhitespace-25
-
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/MapPairs/map-pairs-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-902
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-001
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-005
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-006
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-007
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-901
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Map/map-903
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-902
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-003
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-903
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-004
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-901
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-002
+test/rbkt/w3c_testsuite/XQueryX/Functions/HigherOrder/Filter/filter-005
+test/rbkt/w3c_testsuite/XQueryX/Basics/EQNames/eqname-013

=== modified file 'test/rbkt/Scripts/w3c/Readme.txt'
--- test/rbkt/Scripts/w3c/Readme.txt	2012-08-16 18:31:02 +0000
+++ test/rbkt/Scripts/w3c/Readme.txt	2012-08-27 11:30:27 +0000
@@ -19,7 +19,7 @@
     ZORBA_XQUERYX=ON
     ZORBA_TEST_XQUERYX=ON
     ZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON
-    All these options are set to OFF by default.
+    ZORBA_WITH_JSON=OFF
     
 1.  Import XQTS/XQFTTS.
 

=== modified file 'test/rbkt/testdriver_mt.cpp'
--- test/rbkt/testdriver_mt.cpp	2012-08-16 18:31:02 +0000
+++ test/rbkt/testdriver_mt.cpp	2012-08-27 11:30:27 +0000
@@ -933,9 +933,9 @@
     exit(2);
   }
 #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
-  queries.theQueriesDir = path.native_directory_string();
+  queries.theQueriesDir = path.file_string();
 #else
-  queries.theQueriesDir = path.parent_path().generic_string();
+  queries.theQueriesDir = path.generic_string();
 #endif
 
 #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2

=== modified file 'test/update/Scripts/Readme.txt'
--- test/update/Scripts/Readme.txt	2012-08-16 18:31:02 +0000
+++ test/update/Scripts/Readme.txt	2012-08-27 11:30:27 +0000
@@ -19,7 +19,7 @@
     ZORBA_XQUERYX=ON
     ZORBA_TEST_XQUERYX=ON
     ZORBA_TEST_W3C_TO_SUBMIT_RESULTS=ON
-    All these options are set to OFF by default.
+    ZORBA_WITH_JSON=OFF
 
 1.  Import XQUTS.