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

Proposed by Sorin Marian Nasoi on 2012-06-05
Status: Merged
Approved by: Ghislain Fourny on 2012-08-27
Approved revision: 10872
Merged at revision: 11000
Proposed branch: lp:~zorba-coders/zorba/fix_bug_969251
Merge into: lp:zorba
Diff against target: 69 lines (+3/-1)
1 file modified
test/rbkt/Queries/zorba/modules/mainModule16.xq (+3/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_969251
Reviewer Review Type Date Requested Status
Ghislain Fourny 2012-06-05 Approve on 2012-08-27
Sorin Marian Nasoi Approve on 2012-08-01
Review via email: mp+108679@code.launchpad.net

Commit message

fix for lp:969251.

Description of the change

fix for lp:969251.

To post a comment you must log in.
review: Approve
Ghislain Fourny (gislenius) wrote :

Hi Sorin - how about also declaring the geometry prefix, to make clear that the only error tested here is that the type is not in scope (if we agree that this is what the test is about)?

review: Needs Fixing
10869. By Sorin Marian Nasoi <email address hidden> on 2012-08-01

Merged trunk.

10870. By Sorin Marian Nasoi <email address hidden> on 2012-08-01

Merged trunk.

10871. By Sorin Marian Nasoi <email address hidden> on 2012-08-01

Declared the geometry prefix.

review: Approve
10872. By Sorin Marian Nasoi <email address hidden> on 2012-08-15

Merged trunk.

Ghislain Fourny (gislenius) wrote :

Thanks Sorin ;-)

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_969251-2012-08-27T09-56-00.342Z 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 'doc/java/examples/java_test.sh.in' (properties changed: +x to -x)
2=== modified file 'doc/java/manual/indexpage.dox' (properties changed: +x to -x)
3=== modified file 'doc/zorba/xqdoc/images/Nondeterministic.gif' (properties changed: +x to -x)
4=== modified file 'include/zorba/annotation.h' (properties changed: +x to -x)
5=== modified file 'scripts/chk_kwqnames' (properties changed: +x to -x)
6=== modified file 'scripts/create-doc-tar.sh.in' (properties changed: +x to -x)
7=== modified file 'scripts/create_release.txt' (properties changed: +x to -x)
8=== modified file 'scripts/find_boost_headers' (properties changed: +x to -x)
9=== modified file 'scripts/find_macosx_libraries.sh' (properties changed: +x to -x)
10=== modified file 'scripts/make_tags' (properties changed: +x to -x)
11=== modified file 'scripts/osx_postflight.sh.in' (properties changed: +x to -x)
12=== modified file 'scripts/update_svn_log' (properties changed: +x to -x)
13=== modified file 'scripts/vgsummarize' (properties changed: +x to -x)
14=== modified file 'scripts/zt-wn-compile' (properties changed: +x to -x)
15=== modified file 'scripts/zt-wn-get' (properties changed: +x to -x)
16=== modified file 'src/compiler/parser/copyparser.sh.cmake' (properties changed: +x to -x)
17=== modified file 'test/apitest_spec' (properties changed: +x to -x)
18=== modified file 'test/cmp_5thelem_test_results' (properties changed: +x to -x)
19=== modified file 'test/cmp_ctest_logs' (properties changed: +x to -x)
20=== modified file 'test/collect_ctest_log_errors' (properties changed: +x to -x)
21=== modified file 'test/coverity/update.sh' (properties changed: +x to -x)
22=== modified file 'test/ctest_query_emu' (properties changed: +x to -x)
23=== modified file 'test/ctest_time_elapsed' (properties changed: +x to -x)
24=== modified file 'test/ctest_undef_funcs' (properties changed: +x to -x)
25=== modified file 'test/http-test-data/cgi-bin/test-binary' (properties changed: +x to -x)
26=== modified file 'test/http-test-data/cgi-bin/test-text' (properties changed: +x to -x)
27=== modified file 'test/http-test-data/cgi-bin/test-xml' (properties changed: +x to -x)
28=== modified file 'test/rbkt/Queries/zorba/ext_var/w3c/SchemaImport/hats.xsd' (properties changed: +x to -x)
29=== modified file 'test/rbkt/Queries/zorba/introspection/types.xsd' (properties changed: +x to -x)
30=== modified file 'test/rbkt/Queries/zorba/modules/mainModule16.xq'
31--- test/rbkt/Queries/zorba/modules/mainModule16.xq 2012-08-14 11:13:50 +0000
32+++ test/rbkt/Queries/zorba/modules/mainModule16.xq 2012-08-15 07:11:19 +0000
33@@ -2,10 +2,12 @@
34 (: Test: mainModule16.xq :)
35 (: Written By: Sorin Nasoi :)
36 (: Date: 2008/05/26 :)
37-(: Purpose: Error XPST0081 :)
38+(: Purpose: Error XQST0036 :)
39 (:*******************************************************:)
40
41 import module namespace math = "http://example.org/math-functions" at
42 "libraryModule12.xqlib";
43
44+declare namespace geometry = "http://www.zorba-xquery.com/schema/test/triangle_schema";
45+
46 <result>{math:area(geometry:triangle("Right"))}</result>
47
48=== modified file 'test/rbkt/Scripts/cmp_ctest_logs' (properties changed: +x to -x)
49=== modified file 'test/rbkt/Scripts/lbkt.sh.in' (properties changed: +x to -x)
50=== modified file 'test/rbkt/Scripts/rbkt.sh.in' (properties changed: +x to -x)
51=== modified file 'test/rbkt/Scripts/tidy_xmlfrag' (properties changed: +x to -x)
52=== modified file 'test/rbkt/Scripts/w3c/import_w3c_full_text_testsuite.sh' (properties changed: +x to -x)
53=== modified file 'test/rbkt/Scripts/w3c/import_w3c_testsuite.sh' (properties changed: +x to -x)
54=== modified file 'test/rbkt/update_iter_plans' (properties changed: +x to -x)
55=== modified file 'test/update/Scripts/import_w3c_update_testsuite.sh' (properties changed: +x to -x)
56=== modified file 'test/zorbatest/compile' (properties changed: +x to -x)
57=== modified file 'test/zorbatest/idx_snapshots' (properties changed: +x to -x)
58=== modified file 'test/zorbatest/integrate' (properties changed: +x to -x)
59=== modified file 'test/zorbatest/load_test_env' (properties changed: +x to -x)
60=== modified file 'test/zorbatest/on_build_failure' (properties changed: +x to -x)
61=== modified file 'test/zorbatest/process_test_results' (properties changed: +x to -x)
62=== modified file 'test/zorbatest/report.xqy' (properties changed: +x to -x)
63=== modified file 'test/zorbatest/report_acceptance_failure' (properties changed: +x to -x)
64=== modified file 'test/zorbatest/run_fixture' (properties changed: +x to -x)
65=== modified file 'test/zorbatest/run_pending_tests' (properties changed: +x to -x)
66=== modified file 'test/zorbatest/run_test' (properties changed: +x to -x)
67=== modified file 'test/zorbatest/setup_framework' (properties changed: +x to -x)
68=== modified file 'test/zorbatest/testing/tests/acceptance/rbkt/run' (properties changed: +x to -x)
69=== modified file 'test/zorbatest/testing/tests/acceptance/valgrind/run' (properties changed: +x to -x)

Subscribers

People subscribed via source and target branches