Zorba

Merge lp:~zorba-coders/zorba/bug-1134008 into lp:zorba

  1. bug-1134008
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 11430
Merged at revision: 11429
Proposed branch: lp:~zorba-coders/zorba/bug-1134008
Merge into: lp:zorba
Diff against target: 102 lines (+22/-16)
8 files modified
src/runtime/sequences/sequences_impl.cpp (+2/-2)
test/fots/CMakeLists.txt (+3/-13)
test/fots_driver/fots-driver.xq (+1/-1)
test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res (+1/-0)
test/rbkt/Queries/zorba/uris/doc-base-uri.xq (+4/-0)
test/rbkt/Queries/zorba/uris/file-base-uri.xq (+9/-0)
test/rbkt/Queries/zorba/uris/input.xml (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1134008
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
Chris Hillery Approve
Review via email: mp+162000@code.launchpad.net

Commit message

Set the base-uri of all nodes produced by fn:doc() to be the document retrieval URI, as required by XML Base spec.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T00-22-41.491Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T00-25-39.206Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug-1134008 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1134008-2013-05-02T00-25-39.206Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T04-55-43.961Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug-1134008 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1134008-2013-05-02T04-55-43.961Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) wrote :

Catalog002 needs to be marked as EXPECTED_FOTS_FAILURE. Also it and Catalog010 and Catalog011 can be associated with bug 1172273. After making that change, this can be merged.

lp:~zorba-coders/zorba/bug-1134008 updated
11428. By sorin.marian.nasoi <email address hidden>

merged lp:zorba trunk.

11429. By sorin.marian.nasoi <email address hidden>

- fixed bug that caused 'comment' node to be wrong when run with 'ctestMode' set to 'true'. Please note that this issue did not impact the FOTS reporting since the reports are generated with 'ctestMode' set to 'false'.
- added EXPECTED_FOTS_FAILURE for 'Catalog002' test-case.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-02T20-19-39.258Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1134008-2013-05-02T20-19-39.258Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

lp:~zorba-coders/zorba/bug-1134008 updated
11430. By sorin.marian.nasoi <email address hidden>

- added LP bug number for the 3 remaining failures in 'app-CatalogCheck' test-set

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1134008-2013-05-03T07-17-48.644Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-1134008-2013-05-03T07-17-48.644Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/runtime/sequences/sequences_impl.cpp'
2--- src/runtime/sequences/sequences_impl.cpp 2013-04-30 23:57:10 +0000
3+++ src/runtime/sequences/sequences_impl.cpp 2013-05-02 20:59:26 +0000
4@@ -1895,6 +1895,7 @@
5 store::LoadProperties lLoadProperties;
6 lLoadProperties.setStoreDocument(true);
7 lLoadProperties.setDTDValidate( aSctx->is_feature_set( feature::dtd ) );
8+ lLoadProperties.setBaseUri(lNormUri);
9
10 // Resolve URI to a stream
11 zstring lErrorMessage;
12@@ -1927,8 +1928,7 @@
13 try
14 {
15 store::Store& lStore = GENV.getStore();
16- zstring lBaseUri = aSctx->get_base_uri();
17- oResult = lStore.loadDocument(lBaseUri, lNormUri, *lStream, lLoadProperties);
18+ oResult = lStore.loadDocument(lNormUri, lNormUri, *lStream, lLoadProperties);
19 fillTime(t0, t0user, aPlanState);
20 }
21 catch (ZorbaException& e)
22
23=== modified file 'test/fots/CMakeLists.txt'
24--- test/fots/CMakeLists.txt 2013-05-02 01:21:38 +0000
25+++ test/fots/CMakeLists.txt 2013-05-02 20:59:26 +0000
26@@ -157,19 +157,9 @@
27
28 # This test passes on the old and new RQ machines, but fails for Sorin.
29 #EXPECTED_FOTS_FAILURE (fn-normalize-unicode fn-normalize-unicode-11 0)
30-
31-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog001 0)
32-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog002 0)
33-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog003 0)
34-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog004 0)
35-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog005 0)
36-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog006 0)
37-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog007 0)
38-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog008 0)
39-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog009 0)
40-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 0)
41-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 0)
42-EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog012 0)
43+EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog002 1172273)
44+EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog010 1172273)
45+EXPECTED_FOTS_FAILURE (app-CatalogCheck Catalog011 1172273)
46 EXPECTED_FOTS_FAILURE (fn-available-environment-variables fn-available-environment-variables-011 0)
47 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-36 0)
48 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-37 0)
49
50=== modified file 'test/fots_driver/fots-driver.xq'
51--- test/fots_driver/fots-driver.xq 2013-05-01 22:22:26 +0000
52+++ test/fots_driver/fots-driver.xq 2013-05-02 20:59:26 +0000
53@@ -941,7 +941,7 @@
54 $env,
55 $duration,
56 $verbose,
57- if(not($checkPass) and $ctestMode)
58+ if(not($checkPass) and ($ctestMode and exists($expFailureTC)))
59 then "Test case passed but it is marked with EXPECTED_FOTS_FAILURE in test/fots/CMakeLists.txt"
60 else ())
61 }
62
63=== added file 'test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res'
64--- test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res 1970-01-01 00:00:00 +0000
65+++ test/rbkt/ExpQueryResults/zorba/uris/doc-base-uri.xml.res 2013-05-02 20:59:26 +0000
66@@ -0,0 +1,1 @@
67+true
68
69=== added file 'test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res'
70--- test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res 1970-01-01 00:00:00 +0000
71+++ test/rbkt/ExpQueryResults/zorba/uris/file-base-uri.xml.res 2013-05-02 20:59:26 +0000
72@@ -0,0 +1,1 @@
73+true
74
75=== added file 'test/rbkt/Queries/zorba/uris/doc-base-uri.xq'
76--- test/rbkt/Queries/zorba/uris/doc-base-uri.xq 1970-01-01 00:00:00 +0000
77+++ test/rbkt/Queries/zorba/uris/doc-base-uri.xq 2013-05-02 20:59:26 +0000
78@@ -0,0 +1,4 @@
79+(: The base-uri of a document node should be the retrieval URI. :)
80+let $uri := fn:resolve-uri( "input.xml", fn:static-base-uri() )
81+let $doc := fn:doc($uri)
82+return (fn:base-uri($doc) eq $uri)
83
84=== added file 'test/rbkt/Queries/zorba/uris/file-base-uri.xq'
85--- test/rbkt/Queries/zorba/uris/file-base-uri.xq 1970-01-01 00:00:00 +0000
86+++ test/rbkt/Queries/zorba/uris/file-base-uri.xq 2013-05-02 20:59:26 +0000
87@@ -0,0 +1,9 @@
88+import module namespace file="http://expath.org/ns/file";
89+import module namespace x="http://www.zorba-xquery.com/modules/xml";
90+import schema namespace opt="http://www.zorba-xquery.com/modules/xml-options";
91+
92+let $uri := fn:resolve-uri( "input.xml", fn:static-base-uri() )
93+let $content := file:read-text($uri)
94+let $doc := x:parse($content,
95+ <opt:options><opt:base-uri opt:value="{$uri}"/></opt:options>)
96+return (fn:base-uri($doc) eq $uri)
97
98=== added file 'test/rbkt/Queries/zorba/uris/input.xml'
99--- test/rbkt/Queries/zorba/uris/input.xml 1970-01-01 00:00:00 +0000
100+++ test/rbkt/Queries/zorba/uris/input.xml 2013-05-02 20:59:26 +0000
101@@ -0,0 +1,1 @@
102+<a/>

Subscribers

People subscribed via source and target branches