zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/oracle-ctest-j8 into lp:zorba/oracle-nosql-db-module.

Commit message:
Modified tests to use distinct major keys, so they may be run in parallel.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/oracle-ctest-j8/+merge/147338
-- 
https://code.launchpad.net/~zorba-coders/zorba/oracle-ctest-j8/+merge/147338
Your team Zorba Coders is subscribed to branch lp:zorba/oracle-nosql-db-module.

=== modified file 'test/ExpQueryResults/oracle-nosql-db/all-binary.xml.res'
--- test/ExpQueryResults/oracle-nosql-db/all-binary.xml.res	2012-12-18 19:21:31 +0000
+++ test/ExpQueryResults/oracle-nosql-db/all-binary.xml.res	2013-02-08 10:30:28 +0000
@@ -1,1 +1,1 @@
-{ "db" : true, "put1 version" : true, "get1" : "VmFsdWUgZm9yIE1rZXkxYS9Na2V5MWItbWs=", "get1 value as string" : "Value for Mkey1a/Mkey1b-mk", "put2" : true, "get2" : "VmFsdWUgZm9yIGtleTI=", "get2 value as string" : "Value for key2", "del2" : true, "get2 again" : null }
+{ "db" : true, "put1 version" : true, "get1" : "VmFsdWUgZm9yIGEtYmtleTFhL2EtYmtleTFiLW1r", "get1 value as string" : "Value for a-bkey1a/a-bkey1b-mk", "put2" : true, "get2" : "VmFsdWUgZm9yIGtleTI=", "get2 value as string" : "Value for key2", "del2" : true, "get2 again" : null }

=== modified file 'test/ExpQueryResults/oracle-nosql-db/all-text.xml.res'
--- test/ExpQueryResults/oracle-nosql-db/all-text.xml.res	2012-12-18 19:21:31 +0000
+++ test/ExpQueryResults/oracle-nosql-db/all-text.xml.res	2013-02-08 10:30:28 +0000
@@ -1,1 +1,1 @@
-{ "db" : true, "put1 version" : true, "get1" : "Value for Mkey1a/Mkey1b-mk", "put2" : true, "get2" : "Value for key2", "del2" : true, "get2 again" : null }
+{ "db" : true, "put1 version" : true, "get1" : "Value for a-tkey1a/a-tkey1b-mk", "put2" : true, "get2" : "Value for key2", "del2" : true, "get2 again" : null }

=== modified file 'test/Queries/oracle-nosql-db/all-binary.xq'
--- test/Queries/oracle-nosql-db/all-binary.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/all-binary.xq	2013-02-08 10:30:28 +0000
@@ -10,17 +10,17 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["Mkey1a", "Mkey1b"], 
+        "major": ["a-bkey1a", "a-bkey1b"], 
         "minor":["mk"]
       };
   
   variable $key2 := { 
-        "major": ["Mkey2a", "Mkey2b"]
+        "major": ["a-bkey2a", "a-bkey2b"]
         , 
         "minor":[null] 
       };
       
-  variable $val1 as xs:base64Binary := base64:encode("Value for Mkey1a/Mkey1b-mk");  
+  variable $val1 as xs:base64Binary := base64:encode("Value for a-bkey1a/a-bkey1b-mk");  
   variable $ts1 := nosql:put-binary($db, $key1, $val1 );
   variable $valueVer1 := nosql:get-binary($db, $key1);
   

=== modified file 'test/Queries/oracle-nosql-db/all-text.xq'
--- test/Queries/oracle-nosql-db/all-text.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/all-text.xq	2013-02-08 10:30:28 +0000
@@ -10,18 +10,18 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["Mkey1a", "Mkey1b"], 
+        "major": ["a-tkey1a", "a-tkey1b"], 
         "minor":["mk"]
       };
   
   variable $key2 := { 
-        "major": ["Mkey2a", "Mkey2b"]
+        "major": ["a-tkey2a", "a-tkey2b"]
         , 
         "minor":[null] 
       };
       
   
-  variable $ts1 := nosql:put-text($db, $key1, "Value for Mkey1a/Mkey1b-mk" );
+  variable $ts1 := nosql:put-text($db, $key1, "Value for a-tkey1a/a-tkey1b-mk" );
   variable $valueVer1 := nosql:get-text($db, $key1);
   
   

=== modified file 'test/Queries/oracle-nosql-db/delete.xq'
--- test/Queries/oracle-nosql-db/delete.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/delete.xq	2013-02-08 10:30:28 +0000
@@ -10,11 +10,11 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["Mkey2", "Mkey21"], 
+        "major": ["deletekey2", "deletekey21"], 
         "minor":["mk2"]
       };
   
-  variable $ts := nosql:put-text($db, $key1, "Value for Mkey2/Mkey21-mk2" );
+  variable $ts := nosql:put-text($db, $key1, "Value for deletekey2/deletekey21-mk2" );
   variable $valueVersion := nosql:get-text($db, $key1);
   variable $delRes := nosql:remove($db, $key1);
 

=== modified file 'test/Queries/oracle-nosql-db/get.xq'
--- test/Queries/oracle-nosql-db/get.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/get.xq	2013-02-08 10:30:28 +0000
@@ -10,11 +10,11 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["Mkey2", "Mkey21"], 
+        "major": ["getkey2", "getkey21"], 
         "minor":["mk2"]
       };
   
-  variable $v := "Value for Mkey2/Mkey21-mk2";
+  variable $v := "Value for getkey2/getkey21-mk2";
   
   variable $ts := nosql:put-text($db, $key1, $v  );
   variable $valueVersion := nosql:get-text($db, $key1);

=== modified file 'test/Queries/oracle-nosql-db/multiDeletePrefix.xq'
--- test/Queries/oracle-nosql-db/multiDeletePrefix.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/multiDeletePrefix.xq	2013-02-08 10:30:28 +0000
@@ -10,27 +10,27 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDP1", "mDP2"], 
         "minor":["m1"]
       };
   
   variable $key2 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDP1", "mDP2"], 
         "minor":["m2"]
       };
       
   variable $key31 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDP1", "mDP2"], 
         "minor":["m3", "m31"]
       };
 
   variable $key32 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDP1", "mDP2"], 
         "minor":["m3", "m32"]
       };
 
   variable $key4 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDP1", "mDP2"], 
         "minor":["m4", "a", "b"]
       };
 
@@ -40,7 +40,7 @@
   nosql:put-text($db, $key32, "V m32" );
   nosql:put-text($db, $key4, "V m4 a b" );
 
-  variable $parentKey := {"major": ["M1", "M2"] };
+  variable $parentKey := {"major": ["mDP1", "mDP2"] };
 
   variable $md1 := nosql:multi-remove($db, $parentKey, { "prefix" : "a" }, "PARENT_AND_DESCENDANTS");
 

=== modified file 'test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq'
--- test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/multiDeleteStartEnd.xq	2013-02-08 10:30:28 +0000
@@ -10,27 +10,27 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDSE1", "mDSE2"], 
         "minor":["m1"]
       };
   
   variable $key2 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDSE1", "mDSE2"], 
         "minor":["m2"]
       };
       
   variable $key31 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDSE1", "mDSE2"], 
         "minor":["m3", "m31"]
       };
 
   variable $key32 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDSE1", "mDSE2"], 
         "minor":["m3", "m32"]
       };
 
   variable $key4 := {
-        "major": ["M1", "M2"], 
+        "major": ["mDSE1", "mDSE2"], 
         "minor":["m4", "a", "b"]
       };
 
@@ -40,7 +40,7 @@
   nosql:put-text($db, $key32, "V m32" );
   nosql:put-text($db, $key4, "V m4 a b" );
 
-  variable $parentKey := {"major": ["M1", "M2"] };
+  variable $parentKey := {"major": ["mDSE1", "mDSE2"] };
 
   variable $md1 := nosql:multi-remove($db, $parentKey, { "start" : "a", "end": "b" }, "PARENT_AND_DESCENDANTS");
 

=== modified file 'test/Queries/oracle-nosql-db/put.xq'
--- test/Queries/oracle-nosql-db/put.xq	2013-01-09 17:56:22 +0000
+++ test/Queries/oracle-nosql-db/put.xq	2013-02-08 10:30:28 +0000
@@ -10,11 +10,11 @@
   variable $db := nosql:connect( $opt);
   
   variable $key1 := {
-        "major": ["Mkey2", "Mkey21"], 
+        "major": ["putkey2", "putkey21"], 
         "minor":["mk2"]
       };
   
-  variable $ts := nosql:put-text($db, $key1, "Value for Mkey2/Mkey21-mk2" );
+  variable $ts := nosql:put-text($db, $key1, "Value for putkey2/putkey21-mk2" );
 
   (: nosql:disconnect($db); :)
   

=== modified file 'test/Readme.txt'
--- test/Readme.txt	2012-11-08 22:30:17 +0000
+++ test/Readme.txt	2013-02-08 10:30:28 +0000
@@ -1,7 +1,7 @@
 How to run the tests
 --------------------
 
-1. Install NpSQL DB
+1. Install Oracle NoSQL DB
 
 Download Oracle NoSQL Database, Community Edition from: 
 http://www.oracle.com/technetwork/products/nosqldb/downloads/index.html