Merge lp:~nbrinza/zorba/bugs into lp:zorba

Proposed by Nicolae Brinza
Status: Superseded
Proposed branch: lp:~nbrinza/zorba/bugs
Merge into: lp:zorba
Diff against target: 234 lines (+121/-1)
19 files modified
ChangeLog (+1/-0)
test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res (+1/-0)
test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res (+1/-0)
test/rbkt/Queries/CMakeLists.txt (+0/-1)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq (+10/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq (+10/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq (+10/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq (+10/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq (+9/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq (+9/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq (+9/-0)
test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq (+9/-0)
test/rbkt/Queries/zorba/schemas/orderData.xsd (+36/-0)
To merge this branch: bzr merge lp:~nbrinza/zorba/bugs
Reviewer Review Type Date Requested Status
Matthias Brantner Pending
Markos Zaharioudakis Pending
Review via email: mp+86408@code.launchpad.net

This proposal supersedes a proposal from 2011-12-18.

This proposal has been superseded by a proposal from 2012-05-10.

Commit message

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

Description of the change

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal

Nicolae, could you please also update the ChangeLog?

review: Needs Fixing
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bugs-2011-11-03T02-45-02.853Z 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 : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue job bugs-2011-11-07T17-26-04.331Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue job bugs-2011-11-07T17-48-33.425Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Matthias Brantner (matthias-brantner) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T18-09-02.8Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue job bugs-2011-11-07T18-09-02.8Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

Revision history for this message
Matthias Brantner (matthias-brantner) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Markos Zaharioudakis (markos-za) wrote : Posted in a previous version of this proposal

In computing the value of the is_element_test variable, why do we need the condition:

dynamic_cast<const NodeXQType*>(m_content_type.getp())->m_schema_test == false

? In fact, this seems wrong to me, because if "this" is document-node(SchemaElementTest), then we will return true without really checking the SchemaElementTest.

BTW, the dynamic_cast is not necessary since you have already checked the type kind. A static_cast is better here.

Revision history for this message
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal

Indeed, the condition that Markos mentioned was not necessary, so I have removed it. Resubmitting for merge into the trunk.

Revision history for this message
Markos Zaharioudakis (markos-za) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Markos Zaharioudakis (markos-za) wrote : Posted in a previous version of this proposal

Nicolae, I have approved the branch, but it would be nice to also add a test for the document-node(schema-element-test) case. Apparently, the XQTS does not have one!

Revision history for this message
Markos Zaharioudakis (markos-za) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bugs-2011-12-19T15-39-06.572Z 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
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal

Reposting a comment, as I have incorrectly put it in the description of the change:

Markos,

There are some tests in the XQTS with the document-node(schema-element()) node test. But they indeed do not cover all the cases. In fact I found a few queries involving variable declared "as document-node(schema-element())" and "instance of" expressions which did not work correctly in Zorba. I have added a few tests to cover them.

Revision history for this message
Nicolae Brinza (nbrinza) wrote : Posted in a previous version of this proposal

I have struggled to reproduce the regression that is reported by the remote queue, but I have not been successful: the test passes on my machine. I have merged again the trunk into the branch and I'm resubmitting it again in the hopes it was a problem with the merge. Please re-approve.

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

The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bugs-2011-12-20T16-46-13.591Z 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 :

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog
text conflict in src/types/typeimpl.cpp

lp:~nbrinza/zorba/bugs updated
10547. By Nicolae Brinza

Merged with Zorba trunk

10548. By Nicolae Brinza

Merged with Zorba trunk

10549. By Nicolae Brinza

Fixed the 6 failing doc-node-schema-elem-test- tests

10550. By Nicolae Brinza

Merged with Zorba trunk

Unmerged revisions

10550. By Nicolae Brinza

Merged with Zorba trunk

10549. By Nicolae Brinza

Fixed the 6 failing doc-node-schema-elem-test- tests

10548. By Nicolae Brinza

Merged with Zorba trunk

10547. By Nicolae Brinza

Merged with Zorba trunk

10546. By Nicolae Brinza

Merged with Zorba trunk

10545. By Nicolae Brinza

Merged with Zorba trunk

10544. By Nicolae Brinza

Merged with Zorba trunk

10543. By Nicolae Brinza

Added spec files for tests with the document-node(schema-element()) node tests

10542. By Nicolae Brinza

Added test results files for the previous commit (tests for document-node(schema-element()) node test)

10541. By Nicolae Brinza

Added tests for the document-node(schema-element()) node test, used as variable types and in 'instance of' expressions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-05-09 01:25:37 +0000
3+++ ChangeLog 2012-05-10 12:19:18 +0000
4@@ -3,6 +3,7 @@
5
6 version 2.x
7
8+ * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
9 * Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
10
11
12
13=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res'
14--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res 1970-01-01 00:00:00 +0000
15+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res 2012-05-10 12:19:18 +0000
16@@ -0,0 +1,1 @@
17+true
18\ No newline at end of file
19
20=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res'
21--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res 1970-01-01 00:00:00 +0000
22+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res 2012-05-10 12:19:18 +0000
23@@ -0,0 +1,1 @@
24+false
25\ No newline at end of file
26
27=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res'
28--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res 1970-01-01 00:00:00 +0000
29+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res 2012-05-10 12:19:18 +0000
30@@ -0,0 +1,1 @@
31+false
32\ No newline at end of file
33
34=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res'
35--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res 1970-01-01 00:00:00 +0000
36+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res 2012-05-10 12:19:18 +0000
37@@ -0,0 +1,1 @@
38+true
39\ No newline at end of file
40
41=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res'
42--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res 1970-01-01 00:00:00 +0000
43+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res 2012-05-10 12:19:18 +0000
44@@ -0,0 +1,1 @@
45+false
46\ No newline at end of file
47
48=== modified file 'test/rbkt/Queries/CMakeLists.txt'
49--- test/rbkt/Queries/CMakeLists.txt 2012-05-04 16:05:42 +0000
50+++ test/rbkt/Queries/CMakeLists.txt 2012-05-10 12:19:18 +0000
51@@ -230,7 +230,6 @@
52 ####
53 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
54
55- EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
56 EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
57
58 IF (ZORBA_TEST_XQUERYX)
59
60=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec'
61--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec 1970-01-01 00:00:00 +0000
62+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec 2012-05-10 12:19:18 +0000
63@@ -0,0 +1,1 @@
64+Error: http://www.w3.org/2005/xqt-errors:XPTY0004
65
66=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq'
67--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq 1970-01-01 00:00:00 +0000
68+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq 2012-05-10 12:19:18 +0000
69@@ -0,0 +1,10 @@
70+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
71+
72+declare variable $source := document { (
73+ <!--comment-->,
74+ <Strings><orderData>one string</orderData></Strings>,
75+ <?processing instruction?>
76+ ) };
77+
78+let $document as document-node(schema-element(Strings)) := $source
79+return true()
80
81=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec'
82--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec 1970-01-01 00:00:00 +0000
83+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec 2012-05-10 12:19:18 +0000
84@@ -0,0 +1,1 @@
85+Error: http://www.w3.org/2005/xqt-errors:XPTY0004
86
87=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq'
88--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq 1970-01-01 00:00:00 +0000
89+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq 2012-05-10 12:19:18 +0000
90@@ -0,0 +1,10 @@
91+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
92+
93+declare variable $source := document { (
94+ <!--comment-->,
95+ <Strings><orderData>one string</orderData></Strings>,
96+ <?processing instruction?>
97+ ) };
98+
99+let $document as document-node(schema-element(Strings2)) := $source
100+return true()
101
102=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq'
103--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq 1970-01-01 00:00:00 +0000
104+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq 2012-05-10 12:19:18 +0000
105@@ -0,0 +1,10 @@
106+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
107+
108+declare variable $source := document { (
109+ <!--comment-->,
110+ <Strings><orderData>one string</orderData></Strings>,
111+ <?processing instruction?>
112+ ) };
113+
114+let $document as document-node(schema-element(Strings)) := validate { $source }
115+return true()
116
117=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec'
118--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec 1970-01-01 00:00:00 +0000
119+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec 2012-05-10 12:19:18 +0000
120@@ -0,0 +1,1 @@
121+Error: http://www.w3.org/2005/xqt-errors:XPTY0004
122
123=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq'
124--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq 1970-01-01 00:00:00 +0000
125+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq 2012-05-10 12:19:18 +0000
126@@ -0,0 +1,10 @@
127+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
128+
129+declare variable $source := document { (
130+ <!--comment-->,
131+ <Strings><orderData>one string</orderData></Strings>,
132+ <?processing instruction?>
133+ ) };
134+
135+let $document as document-node(schema-element(Strings2)) := validate { $source }
136+return true()
137
138=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq'
139--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq 1970-01-01 00:00:00 +0000
140+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq 2012-05-10 12:19:18 +0000
141@@ -0,0 +1,9 @@
142+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
143+
144+declare variable $source := document { (
145+ <!--comment-->,
146+ <Strings><orderData>one string</orderData></Strings>,
147+ <?processing instruction?>
148+ ) };
149+
150+$source instance of document-node(schema-element(Strings))
151
152=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq'
153--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq 1970-01-01 00:00:00 +0000
154+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq 2012-05-10 12:19:18 +0000
155@@ -0,0 +1,9 @@
156+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
157+
158+declare variable $source := document { (
159+ <!--comment-->,
160+ <Strings><orderData>one string</orderData></Strings>,
161+ <?processing instruction?>
162+ ) };
163+
164+$source instance of document-node(schema-element(Strings2))
165
166=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq'
167--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq 1970-01-01 00:00:00 +0000
168+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq 2012-05-10 12:19:18 +0000
169@@ -0,0 +1,9 @@
170+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
171+
172+declare variable $source := document { (
173+ <!--comment-->,
174+ <Strings><orderData>one string</orderData></Strings>,
175+ <?processing instruction?>
176+ ) };
177+
178+validate{$source} instance of document-node(schema-element(Strings))
179
180=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq'
181--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq 1970-01-01 00:00:00 +0000
182+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq 2012-05-10 12:19:18 +0000
183@@ -0,0 +1,9 @@
184+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd";
185+
186+declare variable $source := document { (
187+ <!--comment-->,
188+ <Strings><orderData>one string</orderData></Strings>,
189+ <?processing instruction?>
190+ ) };
191+
192+validate{$source} instance of document-node(schema-element(Strings2))
193
194=== added file 'test/rbkt/Queries/zorba/schemas/orderData.xsd'
195--- test/rbkt/Queries/zorba/schemas/orderData.xsd 1970-01-01 00:00:00 +0000
196+++ test/rbkt/Queries/zorba/schemas/orderData.xsd 2012-05-10 12:19:18 +0000
197@@ -0,0 +1,36 @@
198+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:order="http://www.w3.org/XQueryTestOrderBy" targetNamespace="http://www.w3.org/XQueryTestOrderBy" elementFormDefault="qualified">
199+ <xs:complexType name = "numbers">
200+ <xs:sequence>
201+ <xs:element name="orderData" type="xs:decimal" minOccurs="0" maxOccurs="unbounded"/>
202+ </xs:sequence>
203+ </xs:complexType>
204+ <xs:element name = "Strings">
205+ <xs:complexType>
206+ <xs:sequence>
207+ <xs:element name="orderData" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
208+ </xs:sequence>
209+ </xs:complexType>
210+ </xs:element>
211+ <xs:element name = "Strings2">
212+ <xs:complexType>
213+ <xs:sequence>
214+ <xs:element name="orderData" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
215+ </xs:sequence>
216+ </xs:complexType>
217+ </xs:element>
218+ <xs:element name = "NegativeNumbers" type = "order:numbers"/>
219+ <xs:element name = "PositiveNumbers" type = "order:numbers"/>
220+ <xs:element name = "SmallNegativeNumbers" type = "order:numbers"/>
221+ <xs:element name = "SmallPositiveNumbers" type = "order:numbers"/>
222+ <xs:element name = "DataValues">
223+ <xs:complexType>
224+ <xs:sequence>
225+ <xs:element ref="order:Strings"/>
226+ <xs:element ref="order:NegativeNumbers"/>
227+ <xs:element ref="order:PositiveNumbers"/>
228+ <xs:element ref="order:SmallNegativeNumbers"/>
229+ <xs:element ref="order:SmallPositiveNumbers"/>
230+ </xs:sequence>
231+ </xs:complexType>
232+ </xs:element>
233+</xs:schema>
234\ No newline at end of file

Subscribers

People subscribed via source and target branches