Update ReplicateStorage and Jio tests

OfficeJS/src/jio.storage/replicatestorage.js

@@ -20,84 +20,82 @@ var newReplicateStorage = function ( spec, my ) {
         return '';
     };
 
-    priv.isTheLast = function () {
-        return (priv.return_value_array.length === priv.nb_storage);
+    priv.isTheLast = function (error_array) {
+        return (error_array.length === priv.nb_storage);
     };
 
-    priv.doJob = function (command,errormessage) {
+    priv.doJob = function (command,errormessage,nodocid) {
         var done = false, error_array = [], i,
-        onErrorDo = function (result) {
-            priv.return_value_array.push(result);
+        error = function (err) {
             if (!done) {
-                error_array.push(result);
-                if (priv.isTheLast()) {
-                    that.error (
-                        {status:207,
-                         statusText:'Multi-Status',
-                         message:errormessage,
-                         array:error_array});
+                error_array.push(err);
+                if (priv.isTheLast(error_array)) {
+                    that.error ({
+                        status:207,
+                        statusText:'Multi-Status',
+                        error:'multi_status',
+                        message:'All '+errormessage+
+                            (!nodocid?' "'+command.getDocId()+'"':' ') +
+                            ' requests have failed.',
+                        reason:'requests fail',
+                        array:error_array
+                    });
                 }
             }
         },
-        onSuccessDo = function (result) {
-            priv.return_value_array.push(result);
+        success = function (val) {
             if (!done) {
                 done = true;
-                that.success (result);
+                that.success (val);
             }
         };
         for (i = 0; i < priv.nb_storage; i+= 1) {
-            var newcommand = command.clone();
-            var newstorage = that.newStorage(priv.storagelist[i]);
-            newcommand.onErrorDo (onErrorDo);
-            newcommand.onSuccessDo (onSuccessDo);
-            that.addJob (newstorage, newcommand);
+            var cloned_option = command.cloneOption();
+            that.addJob (command.getLabel(),priv.storagelist[i],
+                         command.cloneDoc(),cloned_option,success,error);
         }
     };
 
+    that.post = function (command) {
+        priv.doJob (command,'post');
+        that.end();
+    };
+
     /**
      * Save a document in several storages.
-     * @method saveDocument
+     * @method put
      */
-    that.saveDocument = function (command) {
-        priv.doJob (
-            command,
-            'All save "'+ command.getPath() +'" requests have failed.');
+    that.put = function (command) {
+        priv.doJob (command,'put');
         that.end();
     };
 
     /**
      * Load a document from several storages, and send the first retreived
      * document.
-     * @method loadDocument
+     * @method get
      */
-    that.loadDocument = function (command) {
-        priv.doJob (
-            command,
-            'All load "'+ command.getPath() +'" requests have failed.');
+    that.get = function (command) {
+        priv.doJob (command,'get');
         that.end();
     };
 
     /**
      * Get a document list from several storages, and returns the first
      * retreived document list.
-     * @method getDocumentList
+     * @method allDocs
      */
-    that.getDocumentList = function (command) {
-        priv.doJob (
-            command,
-            'All get document list requests have failed.');
+    that.allDocs = function (command) {
+        priv.doJob (command,'allDocs',true);
         that.end();
     };
 
     /**
      * Remove a document from several storages.
-     * @method removeDocument
+     * @method remove
      */
-    that.removeDocument = function (command) {
-        priv.doJob (
-            command,
-            'All remove "' + command.getPath() + '" requests have failed.');
+    that.remove = function (command) {
+        priv.doJob (command,'remove');
         that.end();
     };
 

OfficeJS/test/jiotests.js

@@ -873,17 +873,17 @@ test ('Document load', function () {
     var o = {}; o.clock = this.sandbox.useFakeTimers(); o.t = this;
     o.clock.tick(base_tick);
     o.mytest = function (message,doc,doc2) {
-        o.f = function (result) {
+        o.f = function (err,val) {
             var gooddoc = doc;
-            if (result && !result.status) {
-                if (doc2 && result.content === doc2.content) {
+            if (val) {
+                if (doc2 && val.content === doc2.content) {
                     gooddoc = doc2;
                 }
             }
-            deepEqual (result,gooddoc,message);
+            deepEqual (err || val,gooddoc,message);
         };
         o.t.spy(o,'f');
-        o.jio.loadDocument('file',{success:o.f,error:o.f,max_retry:3});
+        o.jio.get('file',{max_retry:3},o.f);
         o.clock.tick(10000);
         if (!o.f.calledOnce) {
             if (o.f.called) {
@@ -897,9 +897,10 @@ test ('Document load', function () {
         {type:'dummyallok',username:'1'},
         {type:'dummyallok',username:'2'}]});
     o.mytest('DummyStorageAllOK,OK: load same file',{
-        name:'file',content:'content',
-        last_modified:15000,
-        creation_date:10000});
+        _id:'file',content:'content',
+        _last_modified:15000,
+        _creation_date:10000
+    });
     o.jio.stop();
 
     o.jio = JIO.newJio({type:'replicate',storagelist:[
@@ -907,13 +908,12 @@ test ('Document load', function () {
         {type:'dummyallok'}]});
     o.mytest('DummyStorageAllOK,3tries: load 2 different files',
              {
-                 name:'file',content:'content',
-                 last_modified:15000,creation_date:10000
+                 _id:'file',content:'content',
+                 _last_modified:15000,_creation_date:10000
              },{
-                 name:'file',content:'content2',
-                 last_modified:17000,creation_date:11000
+                 _id:'file',content:'content file',
+                 _last_modified:17000,_creation_date:11000
              });
-
     o.jio.stop();
 });
 
@@ -923,17 +923,14 @@ test ('Document save', function () {
     var o = {}; o.clock = this.sandbox.useFakeTimers(); o.t = this;
     o.clock.tick(base_tick);
     o.mytest = function (message,value) {
-        o.f = function (result) {
-            if (!result) {
-                result = 'done';
-            } else {
-                result = 'fail';
+        o.f = function (err,val) {
+            if (err) {
+                err = err.status;
             }
-            deepEqual (result,value,message);
+            deepEqual (err || val,value,message);
         };
         o.t.spy(o,'f');
-        o.jio.saveDocument('file','content',{
-            success:o.f,error:o.f,max_retry:3});
+        o.jio.put({_id:'file',content:'content'},{max_retry:3},o.f);
         o.clock.tick(500);
         if (!o.f.calledOnce) {
             if (o.f.called) {
@@ -946,13 +943,13 @@ test ('Document save', function () {
     o.jio = JIO.newJio({type:'replicate',storagelist:[
         {type:'dummyallok',username:'1'},
         {type:'dummyallok',username:'2'}]});
-    o.mytest('DummyStorageAllOK,OK: save a file.','done');
+    o.mytest('DummyStorageAllOK,OK: save a file.',{ok:true,id:'file'});
     o.jio.stop();
 
     o.jio = JIO.newJio({type:'replicate',storagelist:[
         {type:'dummyall3tries',username:'1'},
         {type:'dummyallok',username:'2'}]});
-    o.mytest('DummyStorageAll3Tries,OK: save a file.','done');
+    o.mytest('DummyStorageAll3Tries,OK: save a file.',{ok:true,id:'file'});
     o.jio.stop();
 });
 
@@ -962,12 +959,12 @@ test ('Get Document List', function () {
     var o = {}; o.clock = this.sandbox.useFakeTimers(); o.t = this;
     o.clock.tick(base_tick);
     o.mytest = function (message,value) {
-        o.f = function (result) {
-            deepEqual (objectifyDocumentArray(result),
+        o.f = function (err,val) {
+            deepEqual (err || objectifyDocumentArray(val.rows),
                        objectifyDocumentArray(value),message);
         };
         o.t.spy(o,'f');
-        o.jio.getDocumentList('.',{success:o.f,error:o.f,max_retry:3});
+        o.jio.allDocs({max_retry:3},o.f);
         o.clock.tick(10000);
         if (!o.f.calledOnce) {
             if (o.f.called) {
@@ -980,10 +977,10 @@ test ('Get Document List', function () {
     o.jio = JIO.newJio({type:'replicate',storagelist:[
         {type:'dummyall3tries',username:'1'},
         {type:'dummyallok',username:'2'}]});
-    o.doc1 = {name:'file',
-              last_modified:15000,creation_date:10000};
-    o.doc2 = {name:'memo',
-              last_modified:25000,creation_date:20000};
+    o.doc1 = {id:'file',key:'file',value:{
+              _last_modified:15000,_creation_date:10000}};
+    o.doc2 = {id:'memo',key:'memo',value:{
+              _last_modified:25000,_creation_date:20000}};
     o.mytest('DummyStorageAllOK,3tries: get document list.',
              [o.doc1,o.doc2]);
     o.jio.stop();
@@ -1002,16 +999,14 @@ test ('Remove document', function () {
     var o = {}; o.clock = this.sandbox.useFakeTimers(); o.t = this;
     o.clock.tick(base_tick);
     o.mytest = function (message,value) {
-        o.f = function (result) {
-            if (!result) {
-                result = 'done';
-            } else {
-                result = 'fail';
+        o.f = function (err,val) {
+            if (err) {
+                err = err.status;
             }
-            deepEqual (result,value,message);
+            deepEqual (err || val,value,message);
         };
         o.t.spy(o,'f');
-        o.jio.removeDocument('file',{success:o.f,error:o.f,max_retry:3});
+        o.jio.remove({_id:'file'},{max_retry:3},o.f);
         o.clock.tick(10000);
         if (!o.f.calledOnce) {
             if (o.f.called) {
@@ -1024,7 +1019,7 @@ test ('Remove document', function () {
     o.jio = JIO.newJio({type:'replicate',storagelist:[
         {type:'dummyallok',username:'1'},
         {type:'dummyall3tries',username:'2'}]});
-    o.mytest('DummyStorageAllOK,3tries: remove document.','done');
+    o.mytest('DummyStorageAllOK,3tries: remove document.',{ok:true,id:'file'});
     o.jio.stop();
 });