← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/couchbase-tests-keys into lp:zorba/couchbase-module

 

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/couchbase-tests-keys into lp:zorba/couchbase-module.

Commit message:
Changed the name of the keys used in tests to avoid problems between tests.


Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/couchbase-tests-keys/+merge/150089

Changed the name of the keys used in tests to avoid problems between tests.
-- 
https://code.launchpad.net/~zorba-coders/zorba/couchbase-tests-keys/+merge/150089
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.
=== modified file 'test/Queries/couchbase_module/replace-text.xq'
--- test/Queries/couchbase_module/replace-text.xq	2013-01-10 06:51:21 +0000
+++ test/Queries/couchbase_module/replace-text.xq	2013-02-22 16:16:24 +0000
@@ -6,7 +6,7 @@
   "password" : null,
   "bucket" : "default"});
 
-cb:put-text($instance, "key1", "foo");
-cb:put-text($instance, "key1", "foo2", { "operation" : "replace" });
-variable $result := cb:get-text($instance, "key1");
+cb:put-text($instance, "replace", "foo");
+cb:put-text($instance, "replace", "foo2", { "operation" : "replace" });
+variable $result := cb:get-text($instance, "replace");
 $result

=== modified file 'test/Queries/couchbase_module/store-binary2.xq'
--- test/Queries/couchbase_module/store-binary2.xq	2013-01-10 06:51:21 +0000
+++ test/Queries/couchbase_module/store-binary2.xq	2013-02-22 16:16:24 +0000
@@ -8,6 +8,6 @@
   "bucket" : "default"});
 
 variable $binary := f:read-binary(resolve-uri("connect.xq"));
-cb:put-binary($instance, "binary-file", $binary);
-variable $result := cb:get-text($instance, "binary-file");
+cb:put-binary($instance, "binary-file2", $binary);
+variable $result := cb:get-text($instance, "binary-file2");
 $result

=== modified file 'test/Queries/couchbase_module/store-text-encoding2.xq'
--- test/Queries/couchbase_module/store-text-encoding2.xq	2013-01-10 06:51:21 +0000
+++ test/Queries/couchbase_module/store-text-encoding2.xq	2013-02-22 16:16:24 +0000
@@ -6,8 +6,8 @@
   "password" : null,
   "bucket" : "default"});
 
-cb:put-text($instance, "encoding", "äüö", { "encoding" : "ISO-8859-1" });
-variable $result := cb:get-text($instance, "encoding", { "encoding" : "UTF-8" });
+cb:put-text($instance, "encoding2", "äüö", { "encoding" : "ISO-8859-1" });
+variable $result := cb:get-text($instance, "encoding2", { "encoding" : "UTF-8" });
 if ($result = "äüö")
 then true()
 else false()

=== modified file 'test/Queries/couchbase_module/store-text.xq'
--- test/Queries/couchbase_module/store-text.xq	2013-01-10 06:51:21 +0000
+++ test/Queries/couchbase_module/store-text.xq	2013-02-22 16:16:24 +0000
@@ -6,6 +6,6 @@
   "password" : null,
   "bucket" : "default"});
 
-cb:put-text($instance, "key1", "foo");
-variable $result := cb:get-text($instance, "key1");
+cb:put-text($instance, "store", "foo");
+variable $result := cb:get-text($instance, "store");
 $result

=== modified file 'test/Queries/couchbase_module/store-text2.xq'
--- test/Queries/couchbase_module/store-text2.xq	2013-01-10 06:51:21 +0000
+++ test/Queries/couchbase_module/store-text2.xq	2013-02-22 16:16:24 +0000
@@ -6,6 +6,6 @@
   "password" : null,
   "bucket" : "default"});
 
-cb:put-text($instance, "key1", "foo", { "encoding" : "foo" });
-variable $result := cb:get-text($instance, "key1", { "encoding" : "UTF-8" });
+cb:put-text($instance, "store2", "foo", { "encoding" : "foo" });
+variable $result := cb:get-text($instance, "store2", { "encoding" : "UTF-8" });
 $result


Follow ups