Zorba

Merge lp:~zorba-coders/zorba/matthias-disallow-mixed-tests into lp:zorba

  1. matthias-disallow-mixed-tests
  2. Merge into trunk
Proposed by Ghislain Fourny
Status: Merged
Approved by: Till Westmann
Approved revision: 10775
Merged at revision: 10926
Proposed branch: lp:~zorba-coders/zorba/matthias-disallow-mixed-tests
Merge into: lp:zorba
Diff against target: 33 lines (+12/-0)
4 files modified
test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.spec (+2/-0)
test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.xq (+4/-0)
test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.spec (+2/-0)
test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.xq (+4/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/matthias-disallow-mixed-tests
Reviewer Review Type Date Requested Status
Till Westmann Approve
Matthias Brantner Approve
Review via email: mp+114176@code.launchpad.net

Commit message

Adding two tests for allowing two errors upon sequence of several JSON items and an XML node.

Description of the change

Adding two tests for allowing two errors upon sequence of several JSON items and an XML node.

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Till Westmann (tillw) :
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/matthias-disallow-mixed-tests-2012-07-11T06-09-57.422Z/log.html

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

Validation queue job matthias-disallow-mixed-tests-2012-07-11T06-09-57.422Z 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
=== added file 'test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.spec'
--- test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.spec 2012-07-10 12:03:34 +0000
@@ -0,0 +1,2 @@
1Error: http://www.zorba-xquery.com/errors:ZAPI0045
2Error: http://www.jsoniq.org/errors:JNSE0012
03
=== added file 'test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.xq'
--- test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.xq 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-3.xq 2012-07-10 12:03:34 +0000
@@ -0,0 +1,4 @@
1{
2 for $i in 1 to 10
3 return { concat("o", $i) : $i }
4}, <a/>
0\ No newline at end of file5\ No newline at end of file
16
=== added file 'test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.spec'
--- test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.spec 2012-07-10 12:03:34 +0000
@@ -0,0 +1,2 @@
1Error: http://www.zorba-xquery.com/errors:ZAPI0045
2Error: http://www.jsoniq.org/errors:JNSE0012
03
=== added file 'test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.xq'
--- test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.xq 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/serializer-jsoniq-disallow-mixed-4.xq 2012-07-10 12:03:34 +0000
@@ -0,0 +1,4 @@
1<a/>, {
2 for $i in 1 to 10
3 return { concat("o", $i) : $i }
4}
0\ No newline at end of file5\ No newline at end of file

Subscribers

People subscribed via source and target branches