Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1086398 into lp:zorba.
Requested reviews: Sorin Marian Nasoi (sorin.marian.nasoi) Related bugs: Bug #1086398 in Zorba: "FOTS: add canonicalization in eval:assert-xml function" https://bugs.launchpad.net/zorba/+bug/1086398 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1086398/+merge/152788 Implemented 'assert-xml' using the new canonicalize function. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1086398/+merge/152788 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/com/zorba-xquery/www/modules/xml.xq' --- modules/com/zorba-xquery/www/modules/xml.xq 2013-03-06 07:39:18 +0000 +++ modules/com/zorba-xquery/www/modules/xml.xq 2013-03-11 22:04:23 +0000 @@ -89,8 +89,8 @@ : The options element must conform to the xml-options:options element type : from the xml-options.xsd schema. Some of these : will be passed to the underlying library (LibXml2) and further documentation - : for them can be found at <a href="http://xmlsoft.org/html/libxml-parser.html";> - : LibXml2 parser</a>. + : for them can be found at <a href="http://xmlsoft.org/html/libxml-parser.html#xmlParserOption";> + : LibXml2 parser#xmlParserOption</a>. : : The list of available options: : === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-03-07 12:35:29 +0000 +++ test/fots/CMakeLists.txt 2013-03-11 22:04:23 +0000 @@ -121,26 +121,16 @@ 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-FunctxFn functx-fn-number-all 0) -EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-1 0) -EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-copy-attributes-all 0) EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-id-from-element-1 0) EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-as-numeric-all 0) EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-case-insensitive-all 0) EXPECTED_FOTS_FAILURE (app-FunctxFunctx functx-functx-sort-all 0) -EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q5 0) -EXPECTED_FOTS_FAILURE (app-UseCaseNS ns-queries-results-q8 0) -EXPECTED_FOTS_FAILURE (app-XMark XMark-Q3 0) -EXPECTED_FOTS_FAILURE (app-XMark XMark-All 0) EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-002 0) EXPECTED_FOTS_FAILURE (fn-adjust-date-to-timezone cbcl-adjust-date-to-timezone-003 0) EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-002 0) EXPECTED_FOTS_FAILURE (fn-adjust-dateTime-to-timezone cbcl-adjust-dateTime-to-timezone-003 0) -EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-008 0) -EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017 0) -EXPECTED_FOTS_FAILURE (fn-analyze-string analyzeString-017a 0) EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0) EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-002 0) EXPECTED_FOTS_FAILURE (fn-avg cbcl-avg-003 0) @@ -168,8 +158,6 @@ EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0) EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0) EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-003 0) -EXPECTED_FOTS_FAILURE (fn-doc fn-doc-25 0) -EXPECTED_FOTS_FAILURE (fn-doc fn-doc-33 0) EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-005 0) EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-006 0) EXPECTED_FOTS_FAILURE (fn-environment-variable environment-variable-007 0) @@ -338,7 +326,6 @@ EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-25 0) EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-11 0) EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-12 0) -EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-18 0) EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-26 0) EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-28 0) EXPECTED_FOTS_FAILURE (fn-iri-to-uri fn-iri-to-uri-18A 0) @@ -376,7 +363,6 @@ EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-010 0) EXPECTED_FOTS_FAILURE (fn-parse-xml parse-xml-011 0) EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-001 0) -EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-010 0) EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-011 0) EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-012 0) EXPECTED_FOTS_FAILURE (fn-parse-xml-fragment parse-xml-fragment-016 0) @@ -463,34 +449,6 @@ EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0) EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0) EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-5 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-7 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-8 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-9 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-12 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-13 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-15 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-16 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-17 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-18 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-19 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-20 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-21 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-id-23 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-5 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-7 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-8 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-9 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-15 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-16 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-17 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-18 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-19 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-20 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-21 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-23 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-30 0) -EXPECTED_FOTS_FAILURE (misc-MiscFunctions fn-idref-31 0) EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 0) EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-2 0) EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-3 0) @@ -501,14 +459,13 @@ EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0) EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0) EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0) -EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-5ed-Included-char-1 0) EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0) +EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0) +EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-008 0) -EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0) -EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0) EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-date cbcl-add-yearMonthDuration-to-date-003 0) EXPECTED_FOTS_FAILURE (op-add-yearMonthDuration-to-dateTime cbcl-add-yearMonthDuration-to-dateTime-003 0) EXPECTED_FOTS_FAILURE (op-date-greater-than cbcl-date-gt-001 0) @@ -522,16 +479,14 @@ EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration cbcl-divide-yearMonthDuration-003 0) EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0) EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-002 0) -EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-015 0) -EXPECTED_FOTS_FAILURE (op-intersect fn-intersect-node-args-016 0) +EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0) +EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0) +EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0) +EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0) EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-001 0) EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-002 0) EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-003 0) EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-004 0) -EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0) -EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-003 0) -EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-004 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-date cbcl-subtract-dayTimeDuration-from-date-002 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-dateTime cbcl-subtract-dayTimeDuration-from-dateTime-002 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-subtract-dayTimeDurations-003 0) @@ -546,9 +501,6 @@ EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0) EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0) EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0) -EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-015 0) -EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-016 0) -EXPECTED_FOTS_FAILURE (op-union fn-union-node-args-017 0) EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0) EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0) EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0) @@ -567,9 +519,6 @@ EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-8 0) EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 0) EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 0) -EXPECTED_FOTS_FAILURE (prod-AxisStep Axes085 0) -EXPECTED_FOTS_FAILURE (prod-AxisStep Axes086 0) -EXPECTED_FOTS_FAILURE (prod-AxisStep Axes089 0) EXPECTED_FOTS_FAILURE (prod-AxisStep Axes115 0) EXPECTED_FOTS_FAILURE (prod-AxisStep Axes117 0) EXPECTED_FOTS_FAILURE (prod-AxisStep cbcl-childAxis-001 0) @@ -591,15 +540,6 @@ EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self ancestorself-15 0) EXPECTED_FOTS_FAILURE (prod-AxisStep.ancestor-or-self unabbreviatedSyntax-11 0) EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0) -EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0) EXPECTED_FOTS_FAILURE (prod-CastExpr CastAs674a 0) EXPECTED_FOTS_FAILURE (prod-CastExpr K-SeqExprCast-71b 0) EXPECTED_FOTS_FAILURE (prod-CastExpr.derived cbcl-cast-date-001 0) @@ -626,29 +566,25 @@ EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-23 0) EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-25 0) EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-ListType-31 0) -EXPECTED_FOTS_FAILURE (prod-Comment XQueryComment012 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-001 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-date-002 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-001 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-dateTime-002 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-001 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-duration-002 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-001 0) +EXPECTED_FOTS_FAILURE (prod-CastableExpr cbcl-castable-yearMonthDuration-002 0) EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-51 0) EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-53 0) EXPECTED_FOTS_FAILURE (prod-CompAttrConstructor K2-ComputeConAttr-58 0) EXPECTED_FOTS_FAILURE (prod-CompDocConstructor K2-ConDocNode-2 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-012 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-015 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-022 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-027 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-031 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-032 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-033 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-035 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-036 0) -EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-037 0) EXPECTED_FOTS_FAILURE (prod-CompNamespaceConstructor nscons-039 0) -EXPECTED_FOTS_FAILURE (prod-CompTextConstructor K2-ConText-4 0) EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-016 0) EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-017 0) EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-031 0) EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0) EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-049 0) -EXPECTED_FOTS_FAILURE (prod-CopyNamespacesDecl K2-CopyNamespacesProlog-5 0) EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0) EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0) EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-14 0) @@ -658,28 +594,12 @@ EXPECTED_FOTS_FAILURE (prod-DecimalFormatDecl decimal-format-911err 0) EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-6 0) EXPECTED_FOTS_FAILURE (prod-DefaultNamespaceDecl defaultnamespacedeclerr-8 0) -EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-3 0) -EXPECTED_FOTS_FAILURE (prod-DirAttributeList Constr-attr-nsprein-4 0) -EXPECTED_FOTS_FAILURE (prod-DirAttributeList DirectConElemAttr-1 0) -EXPECTED_FOTS_FAILURE (prod-DirectConstructor K2-DirectConOther-66 0) -EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-38 0) EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-48 0) -EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-49 0) -EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-52 0) EXPECTED_FOTS_FAILURE (prod-DirElemConstructor K2-DirectConElem-53a 0) EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-charref-2 1130998) -EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-5 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent Constr-cont-nsmode-6 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-40 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-56 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-10 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-12 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-21 0) -EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace Constr-inscope-22 0) -EXPECTED_FOTS_FAILURE (prod-EQName eqname-017 0) -EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-2 0) -EXPECTED_FOTS_FAILURE (prod-FLWORExpr step-expr-si-3 0) -EXPECTED_FOTS_FAILURE (prod-ForClause ForExpr004 0) +EXPECTED_FOTS_FAILURE (prod-DirElemContent.namespace K2-DirectConElemNamespace-76 0) +EXPECTED_FOTS_FAILURE (prod-EQName eqname-010 0) +EXPECTED_FOTS_FAILURE (prod-EQName eqname-011 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-003 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-005 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-009 0) @@ -704,7 +624,6 @@ EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0) EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0) EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0) -EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0) EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0) EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr017 0) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0) @@ -737,13 +656,11 @@ EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-001 0) EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-002 0) EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0) -EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-30 0) -EXPECTED_FOTS_FAILURE (prod-NameTest K2-NameTest-31 0) +EXPECTED_FOTS_FAILURE (prod-NamespaceDecl namespaceDecl-24 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0) -EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-025 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-028 0) EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0) @@ -763,7 +680,6 @@ EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-8p 0) EXPECTED_FOTS_FAILURE (prod-PathExpr PathExpr-9p 0) EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-5 0) -EXPECTED_FOTS_FAILURE (prod-Predicate K2-FilterExpr-7 0) EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0) EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-1-ns 0) EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-2-ns 0) @@ -797,15 +713,11 @@ EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-ns 0) EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0) EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-8-ns 0) -EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr010 0) -EXPECTED_FOTS_FAILURE (prod-ReturnClause ReturnExpr016 0) -EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema005 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema016 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema032c 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040a 0) -EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema070 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0) EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-003 0) @@ -827,7 +739,6 @@ EXPECTED_FOTS_FAILURE (prod-SchemaImport cbcl-validated-schema-element-4 0) EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-in-xpath 0) EXPECTED_FOTS_FAILURE (prod-TypeswitchExpr typeswitch-113 0) -EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-35 0) EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-36 0) EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-38 0) EXPECTED_FOTS_FAILURE (prod-ValidateExpr validateexpr-41 0) @@ -844,8 +755,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-WhereClause WhereExpr001 0) -EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr003 0) EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr022 0) EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr024 0) EXPECTED_FOTS_FAILURE (prod-WhereClause WhereExpr025 0) === modified file 'test/fots_driver/environment.xq' --- test/fots_driver/environment.xq 2013-02-26 05:21:15 +0000 +++ test/fots_driver/environment.xq 2013-03-11 22:04:23 +0000 @@ -451,7 +451,7 @@ ) as xs:string { if (empty($env)) - then + then "" else let $namespace := $env/fots:namespace[@uri eq $env/fots:schema/@uri] @@ -459,15 +459,18 @@ 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 "" + 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/evaluate.xq' --- test/fots_driver/evaluate.xq 2013-02-26 06:30:28 +0000 +++ test/fots_driver/evaluate.xq 2013-03-11 22:04:23 +0000 @@ -482,17 +482,16 @@ $baseURI as xs:anyURI ) { -(:TODO call xml-canonicalization after bug #1076919 is implemented.:) try { - let $serRes := util:serialize-result($result), - $result1 as xs:string := string-join($serRes,''), - $result2 as xs:string := string-join($serRes,' '), - $expectedResult as xs:string := util:get-value($expResult, $baseURI, "assert-xml") + let $serActualResult as xs:string* := util:serialize-result($result) + let $actualResult1 as xs:string := util:canonicalize(string-join($serActualResult,'')) + let $actualResult2 as xs:string := util:canonicalize(string-join($serActualResult,' ')) + let $expectedResult as xs:string := util:canonicalize(util:get-value($expResult, $baseURI, "assert-xml")) return - if ((normalize-space($result1) eq normalize-space(string($expectedResult))) or - (normalize-space($result2) eq normalize-space(string($expectedResult)))) + if (($actualResult1 eq $expectedResult) or + ($actualResult2 eq $expectedResult)) then () - else "'assert-xml' returned: result is different from the expected result." + else concat("'assert-xml' returned: result 
'", $actualResult1,"'
'" , $actualResult2 ,"'
 is different from the expected result 
'", $expectedResult,"'
") } catch * { concat("'assert-xml' returned: fail with error ", $err:code, " : ", $err:description) === 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-11 22:04:23 +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-02-27 12:14:01 +0000 +++ test/fots_driver/reporting.xq 2013-03-11 22:04:23 +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, @@ -282,7 +282,7 @@ } } -catch * +catch err:FODC0002 { error($err:code, $err:description, @@ -318,6 +318,7 @@ for $testSet in $results//fots:test-set let $countFailures := count($testSet//fots:test-case[@result ="fail"]) let $testSetName := xs:string($testSet/@name) + order by $testSetName where $countFailures gt xs:integer(0) return for $testCase in $testSet//fots:test-case[@result ="fail"] === modified file 'test/fots_driver/util.xq' --- test/fots_driver/util.xq 2013-02-27 11:47:33 +0000 +++ test/fots_driver/util.xq 2013-03-11 22:04:23 +0000 @@ -31,6 +31,9 @@ import module namespace fots-err = "http://www.zorba-xquery.com/fots-driver/errors"; at "errors.xq"; +import module namespace zorba-xml = + "http://www.zorba-xquery.com/modules/xml#2.1";; + declare namespace err = "http://www.w3.org/2005/xqt-errors";; @@ -96,7 +99,10 @@ 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 * @@ -120,6 +126,20 @@ xs:anyURI(fn:substring-before($path, file:base-name($path))) }; +declare %private function util:replace-entity-references( + $input as xs:string +) as xs:string +{ + replace(replace($input,'>','>'),'<','<') +}; + +declare function util:canonicalize( + $input as xs:string +) as xs:string +{ + zorba-xml:canonicalize(concat('<root>', util:replace-entity-references($input), '</root>')) +}; + declare function util:serialize-result( $result as item()*
-- 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
