zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/couchbase-module_null into lp:zorba/couchbase-module.

Commit message:
adapted tests to new syntax and semantic

Requested reviews:
  Matthias Brantner (matthias-brantner)
  William Candillon (wcandillon)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/couchbase-module_null/+merge/155090
-- 
https://code.launchpad.net/~zorba-coders/zorba/couchbase-module_null/+merge/155090
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.

=== modified file 'test/Queries/couchbase_module/create-view.xq'
--- test/Queries/couchbase_module/create-view.xq	2012-11-07 17:08:47 +0000
+++ test/Queries/couchbase_module/create-view.xq	2013-03-23 02:01:21 +0000
@@ -2,8 +2,8 @@
 
 variable $instance := cb:connect({
   "host": "localhost:8091",
-  "username" : null,
-  "password" : null,
+  "username" : jn:null(),
+  "password" : jn:null(),
   "bucket" : "default"});
 
 variable $view-name := cb:create-view($instance, "dev_view", ("test1", "test2"));

=== modified file 'test/Queries/couchbase_module/replace-text.xq'
--- test/Queries/couchbase_module/replace-text.xq	2013-02-22 16:14:35 +0000
+++ test/Queries/couchbase_module/replace-text.xq	2013-03-23 02:01:21 +0000
@@ -2,8 +2,8 @@
 
 variable $instance := cb:connect({
   "host": "localhost:8091",
-  "username" : null,
-  "password" : null,
+  "username" : jn:null(),
+  "password" : jn:null(),
   "bucket" : "default"});
 
 cb:put-text($instance, "replace", "foo");

=== modified file 'test/Queries/couchbase_module/view.xq'
--- test/Queries/couchbase_module/view.xq	2013-03-22 22:53:32 +0000
+++ test/Queries/couchbase_module/view.xq	2013-03-23 02:01:21 +0000
@@ -14,5 +14,9 @@
 variable $view-name := cb:create-view($instance, $cb-document, $cb-view, {"key":"doc.view"});
 variable $data := cb:view($instance, $view-name, {"stale" : "false"});
 for $d in jn:members($data("rows"))
+<<<<<<< TREE
 where $d("key") > 0
+=======
+where $d neq jn:null() and $d("key") >0
+>>>>>>> MERGE-SOURCE
 return $d