Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fixing_issues_FOTS_driver-2013-03-27T09-03-54.253Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Validation queue job fixing_issues_FOTS_driver-2013-03-27T09-03-54.253Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fixing_issues_FOTS_driver-2013-03-26T16-29-45.841Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Commit Message changed to: - implemented support for assert-xml ignore-prefixes='true'; as a result 2 more test cases pass. - fixed 'qischema016' - added bug number for test cases 'qischema040' and 'qischema040a' - added correct validation type for the source documents - in 'assert-xml' we now first try to see if deep-equal is true, then we try to canonicalize (fixed 4 test cases) - document URL resolving is now done using URL resolver. Fixed 6 test cases. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Description changed to: - implemented support for assert-xml ignore-prefixes='true'; as a result 2 more test cases pass. - fixed 'qischema016' - added bug number for test cases 'qischema040' and 'qischema040a' - added correct validation type for the source documents - in 'assert-xml' we now first try to see if deep-equal is true, then we try to canonicalize (fixed 4 test cases) - document URL resolving is now done using URL resolver. Fixed 6 test cases. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Review: Needs Information I don't think it's correct to try deep-equal() for assert-xml test cases. Certainly this doesn't match with the description of that assertion at http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert-xml . Can you tell me why you did that? I'm also confused how this could have corrected 4 test cases. The remainder of the changes seem fine. -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
I don't think it's correct to try deep-equal() for assert-xml test cases. Certainly this doesn't match with the description of that assertion at http://dev.w3.org/2011/QT3-test-suite/catalog-schema.html#elem_assert-xml. As an alternative to canonicalizing, the results may be compared using the fn:deep-equal() function. Can you tell me why you did that? I'm also confused how this could have corrected 4 test cases. These fixed 4 test cases where the parsing of the serialized XML content with libxml2 raised errors. Although parsing the same exact thing with parse-xml did not. This is how, for these 4 cases, fn:deep-equal(parse-xml($x1), parse-xml($x2)) returned correct result while $x1 eq $x2 raised errors where $x1, $x2 are xml:canonicalize() Take for example this example namespaceDecl-24 from prod-NamespaceDecl: This works: import module namespace zorba-xml = http://www.zorba-xquery.com/modules/xml#2.1;; import schema namespace output = http://www.w3.org/2010/xslt-xquery-serialization;; declare variable $serParamXml := output:serialization-parameters output:methodvalue=xml / output:indentvalue=no / output:omit-xml-declaration value=yes / /output:serialization-parameters; let $content := abc:someElement xmlns:abc=mailto:someu...@someserver.com;some content/abc:someElement return parse-xml(fn:serialize($content, $serParamXml)) while this fails: import module namespace zorba-xml = http://www.zorba-xquery.com/modules/xml#2.1;; import schema namespace output = http://www.w3.org/2010/xslt-xquery-serialization;; declare variable $serParamXml := output:serialization-parameters output:methodvalue=xml / output:indentvalue=no / output:omit-xml-declaration value=yes / /output:serialization-parameters; let $content := abc:someElement xmlns:abc=mailto:someu...@someserver.com;some content/abc:someElement return zorba-xml:canonicalize(fn:serialize($content, $serParamXml)) Error: C14N error : Relative namespace UR is invalid here : mailto C14N error : Internal error : checking for relative namespaces C14N error : Internal error : processing docs children list C14N error : Internal error : saving doc to output buffer /home/spungi/work/zorba/repo/tmp/bump_FOTS_snapshot/build/URI_PATH/com/zorba-xquery/www/modules/xml_2.xq:444,3: dynamic error [err:FOCZ0001]: invalid content passed to x:canonicalize(): abc:someElement xmlns:abc=mailto:someu...@someserver.com;some content/abc:someElement -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Sorin Marian Nasoi has proposed merging
lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba.
Commit message:
- implemented support for assert-xml ignore-prefixes='true'; as a result 2
more test cases pass.
- fixed 'qischema016'
- added bug number for test cases 'qischema040' and 'qischema040a'
- added correct validation type for the source documents
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294
- implemented support for assert-xml ignore-prefixes='true'; as a result 2
more test cases pass.
- fixed 'qischema016'
- added bug number for test cases 'qischema040' and 'qischema040a'
- added correct validation type for the source documents
--
https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-03-23 15:23:57 +
+++ test/fots/CMakeLists.txt 2013-03-25 17:26:22 +
@@ -443,7 +443,6 @@
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-039 0)
EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-016 0)
@@ -564,11 +563,9 @@
EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 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 qischema040 21339)
+EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema040a 21339)
EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0)
EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0)
EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-003 0)
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq 2013-03-21 18:43:40 +
+++ test/fots_driver/environment.xq 2013-03-25 17:26:22 +
@@ -426,7 +426,7 @@
{
let $ciURI := resolve-uri($env/fots:source[@role = .]/@file, $envBaseURI)
return
- if (empty($env/fots:source[@validation = strict]))
+ if (empty($env/fots:source/@validation))
then
{
if($needsDTDValidation)
@@ -445,7 +445,7 @@
(,
',
env:get-schema-import($env),
-concat('validate { doc(', $ciURI, ')', }),
+concat('validate ', xs:string($env/fots:source/@validation),' { doc(', $ciURI, ')', }),
',,
(), mapper:uri-mapper#2,
);,
@@ -653,11 +653,23 @@
$testSetBaseURI as xs:anyURI
) as xs:string?
{
- let $envSchema := $env/fots:schema,
- $tcSchema := $case/fots:environment/fots:schema,
- $schemas := ($envSchema, $tcSchema)
+ let $envSchema := $env/fots:schema
+ let $tcSchema := $case/fots:environment/fots:schema
+ (:
+ Schema documents are identified in the environment in a similar way to source
+ documents. The role attribute indicates whether the schema is imported into
+ the query, or used for source document validation.
+ :)
+ let $schemas := ($envSchema, $tcSchema)
+ let $envSource := for $s in $env/fots:source
+where empty($s[@role = .])
+return $s
+ let $tcSource := for $s in $case/fots:environment/fots:source
+ where empty($s[@role = .])
+ return $s
+ let $sources := ($envSource, $tcSource)
return
-if (empty($schemas))
+if (empty($schemas) and empty($sources))
then ()
else string-join(
(declare function mapper:uri-mapper($namespace as xs:string, $entity as xs:string) {,
@@ -680,6 +692,24 @@
default return ())),
#xA;)
else (),
+if (exists($sources))
+then string-join((case '',
+ return switch($namespace),
+(for $source in $envSource
+ return concat(case ',
+ data($source/@uri),
+ ' return ',
+ resolve-uri($source/@file, $envBaseURI),
+ '),
+ for $source in $tcSource
+ return concat(case ',
+ data($source/@uri),
+
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fixing_issues_FOTS_driver-2013-03-25T17-38-55.092Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Validation queue job fixing_issues_FOTS_driver-2013-03-25T17-38-55.092Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Commit Message changed to: - implemented support for assert-xml ignore-prefixes='true'; as a result 2 more test cases pass. - fixed 'qischema016' - added bug number for test cases 'qischema040' and 'qischema040a' - added correct validation type for the source documents - in 'assert-xml' we now first try to see if deep-equal is true, then we try to canonicalize (fixed 4 test cases) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixing_issues_FOTS_driver into lp:zorba has been updated. Description changed to: - implemented support for assert-xml ignore-prefixes='true'; as a result 2 more test cases pass. - fixed 'qischema016' - added bug number for test cases 'qischema040' and 'qischema040a' - added correct validation type for the source documents - in 'assert-xml' we now first try to see if deep-equal is true, then we try to canonicalize (fixed 4 test cases) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 -- https://code.launchpad.net/~zorba-coders/zorba/fixing_issues_FOTS_driver/+merge/155294 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
