Zorba

Merge lp:~zorba-coders/zorba/fix_bug_1123843 into lp:zorba

  1. fix_bug_1123843
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Chris Hillery
Approved revision: 11246
Merged at revision: 11245
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1123843
Merge into: lp:zorba
Diff against target: 104 lines (+3/-50)
2 files modified
test/fots/CMakeLists.txt (+0/-45)
test/fots_driver/evaluate.xq (+3/-5)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1123843
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Sorin Marian Nasoi Approve
Review via email: mp+149344@code.launchpad.net

Commit message

Fix lp:1123843.

Description of the change

Fix lp:1123843.

To post a comment you must log in.
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/fix_bug_1123843-2013-02-19T17-13-41.282Z/log.html

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

The attempt to merge lp:~zorba-coders/zorba/fix_bug_1123843 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 fix_bug_1123843-2013-02-19T17-13-41.282Z is finished.
  The final status was:

  6 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/fix_bug_1123843-2013-02-19T19-31-47.687Z/log.html

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

Validation queue job fix_bug_1123843-2013-02-19T19-31-47.687Z 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. Got: 1 Approve.

Revision history for this message
Markos Zaharioudakis (markos-za) wrote :

Why do you need the second deep-equal? (the one that reverses $x)

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

> Why do you need the second deep-equal? (the one that reverses $x)
It's a fix for test case "fn-distinct-values-mixed-args-011" from "fn-distinct-values":

[...]
fn:distinct-values((xs:decimal('1.2'), '1.2'))
[...]
<assert-permutation>"1.2", 1.2</assert-permutation>
[...]

The proposed fix thus covers all existing usage of 'assert-permutation', not all possible cases that may exist.

Revision history for this message
Markos Zaharioudakis (markos-za) :
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/fix_bug_1123843-2013-02-20T21-44-37.928Z/log.html

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

Validation queue job fix_bug_1123843-2013-02-20T21-44-37.928Z 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 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-02-11 19:49:26 +0000
3+++ test/fots/CMakeLists.txt 2013-02-19 18:11:20 +0000
4@@ -185,14 +185,6 @@
5 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-37 0)
6 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-38 0)
7 EXPECTED_FOTS_FAILURE (fn-deep-equal K2-SeqDeepEqualFunc-39 0)
8-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-005 0)
9-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-006 0)
10-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-009 0)
11-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-010 0)
12-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-011 0)
13-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-018 0)
14-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-mixed-args-032 0)
15-EXPECTED_FOTS_FAILURE (fn-distinct-values fn-distinct-values-2 0)
16 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002 0)
17 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-002b 0)
18 EXPECTED_FOTS_FAILURE (fn-distinct-values cbcl-distinct-values-003 0)
19@@ -364,10 +356,6 @@
20 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-23 0)
21 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-24 0)
22 EXPECTED_FOTS_FAILURE (fn-idref fn-idref-dtd-25 0)
23-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes fn-in-scope-prefixes-21 0)
24-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes fn-in-scope-prefixes-22 0)
25-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes fn-in-scope-prefixes-24 0)
26-EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes fn-in-scope-prefixes-25 0)
27 EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-11 0)
28 EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-12 0)
29 EXPECTED_FOTS_FAILURE (fn-in-scope-prefixes K2-InScopePrefixesFunc-18 0)
30@@ -546,29 +534,6 @@
31 EXPECTED_FOTS_FAILURE (fn-substring-before fn-substring-before-24 0)
32 EXPECTED_FOTS_FAILURE (fn-tokenize fn-tokenize-31 0)
33 EXPECTED_FOTS_FAILURE (fn-tokenize fn-tokenize-32 0)
34-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-001 0)
35-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-002 0)
36-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-003 0)
37-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-004 0)
38-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-005 0)
39-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-006 0)
40-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-007 0)
41-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-008 0)
42-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-009 0)
43-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-010 0)
44-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-011 0)
45-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-012 0)
46-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-013 0)
47-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-014 0)
48-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-015 0)
49-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-016 0)
50-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-017 0)
51-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-018 0)
52-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-019 0)
53-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-020 0)
54-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-021 0)
55-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-022 0)
56-EXPECTED_FOTS_FAILURE (fn-unordered fn-unordered-mix-args-023 0)
57 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-037 0)
58 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-038 0)
59 EXPECTED_FOTS_FAILURE (fn-unparsed-text fn-unparsed-text-039 0)
60@@ -825,7 +790,6 @@
61 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-031 0)
62 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-047 0)
63 EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-049 0)
64-EXPECTED_FOTS_FAILURE (prod-CopyNamespacesDecl copynamespace-3 0)
65 EXPECTED_FOTS_FAILURE (prod-CopyNamespacesDecl K2-CopyNamespacesProlog-5 0)
66 EXPECTED_FOTS_FAILURE (prod-CountClause count-007 0)
67 EXPECTED_FOTS_FAILURE (prod-CountClause count-008 0)
68@@ -926,15 +890,6 @@
69 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0)
70 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0)
71 EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0)
72-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-001 0)
73-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-001a 0)
74-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-002 0)
75-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-002a 0)
76-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-003 0)
77-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-003a 0)
78-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-004 0)
79-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-007 0)
80-EXPECTED_FOTS_FAILURE (prod-GroupByClause group-011 0)
81 EXPECTED_FOTS_FAILURE (prod-GroupByClause group-013 0)
82 EXPECTED_FOTS_FAILURE (prod-GroupByClause group-014 0)
83 EXPECTED_FOTS_FAILURE (prod-IfExpr CondExpr012 0)
84
85=== modified file 'test/fots_driver/evaluate.xq'
86--- test/fots_driver/evaluate.xq 2013-01-31 18:06:16 +0000
87+++ test/fots_driver/evaluate.xq 2013-02-19 18:11:20 +0000
88@@ -391,13 +391,11 @@
89 try {
90 {
91 variable $queryText := concat(
92- "xquery version '3.0';",
93- "declare namespace o = 'http://www.zorba-xquery.com/options/features';",
94- "declare option o:enable 'hof';",
95 "declare variable $x external;",
96+ "declare function local:order-string-values($items){ for $item in $items order by xs:string($item) return $item};",
97 "let $y := (",string(data($expResult)),") return ",
98- (: if count(intersection(M1,M2)) = count(union(M1,M2)) = count(M1) then the sequences are identical :)
99- "(count(distinct-values($x[ . = $y])) = count(distinct-values(($x, $y)))) = count(distinct-values($x))");
100+ "deep-equal(local:order-string-values($x), local:order-string-values($y)) or
101+ deep-equal(reverse($x), $y)");
102 variable $queryKey := xqxq:prepare-main-module($queryText),
103 $queryKeyResult := xqxq:bind-variable($queryKey,
104 xs:QName('x'),

Subscribers

People subscribed via source and target branches