xwikistorage tests added

test/jio.storage/xwikistorage.tests.js

+/*jslint indent: 2, maxlen: 80, nomen: true */
+/*global define, jIO, jio_tests, test, ok, deepEqual, sinon */
+
+// define([module_name], [dependencies], module);
+(function (dependencies, module) {
+  "use strict";
+  if (typeof define === 'function' && define.amd) {
+    return define(dependencies, module);
+  }
+  module(jIO, jio_tests);
+}(['jio', 'jio_tests', 'xwikistorage'], function (jIO, util) {
+  "use strict";
+
+  function generateTools() {
+    var o = {
+      clock: sinon.useFakeTimers(),
+      spy: util.ospy,
+      tick: util.otick
+    };
+    function addFakeServerResponse(type, method, path, status, response) {
+      o.server.respondWith(method, new RegExp(path), [
+        status,
+        {"Content-Type": 'application/xml'},
+        response
+      ]);
+    }
+    o.addFakeServerResponse = addFakeServerResponse;
+    return o;
+  }
+
+  (function() {
+  module ('XWikiStorage');
+  var setUp = function(that, liveTest) {
+      var o = generateTools(that);
+      o.server = sinon.fakeServer.create();
+      o.jio = jIO.newJio({type:'xwiki',formTokenPath:'form_token'});
+      o.addFakeServerResponse("xwiki", "GET", "form_token", 200,
+                              '<meta name="form_token" content="OMGHAX"/>');
+      o._addFakeServerResponse = o.addFakeServerResponse;
+      o.expectedRequests = [];
+      o.addFakeServerResponse = function(a,b,c,d,e) {
+          o._addFakeServerResponse(a,b,c,d,e);
+          o.expectedRequests.push([b,c]);
+      };
+      o.assertReqs = function(count, message) {
+          o.requests = (o.requests || 0) + count;
+          ok(o.server.requests.length === o.requests,
+             message + "[expected [" + count + "] got [" +
+                (o.server.requests.length - (o.requests - count)) + "]]");
+          for (var i = 1; i <= count; i++) {
+              var req = o.server.requests[o.server.requests.length - i];
+              if (!req) {
+                  break;
+              }
+              for (var j = o.expectedRequests.length - 1; j >= 0; --j) {
+                  var expected = o.expectedRequests[j];
+                  if (req.method === expected[0] &&
+                      req.url.indexOf(expected[1]) !== 0)
+                  {
+                      o.expectedRequests.splice(j, 1);
+                  }
+              }
+          }
+          var ex = o.expectedRequests.pop();
+          if (ex) {
+              ok(0, "expected [" +  ex[0] + "] request for [" + ex[1] + "]");
+          }
+      };
+      return o;
+  };
+
+  test ("Post", function () {
+
+      var o = setUp(this);
+
+      // post without id
+      o.spy (o, "status", 405, "Post without id");
+      o.jio.post({}, o.f);
+      o.clock.tick(5000);
+      o.assertReqs(0, "no id -> no request");
+
+      // post non empty document
+      o.addFakeServerResponse("xwiki", "POST", "myFile", 201, "HTML RESPONSE");
+      o.spy(o, "value", {"id": "myFile", "ok": true},
+            "Create = POST non empty document");
+      o.jio.post({"_id": "myFile", "title": "hello there"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(3, "put -> 1 request to get csrf token, 1 to get doc and 1 to post data");
+
+      // post but document already exists (post = error!, put = ok)
+      o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
+          '<page xmlns="http://www.xwiki.org"><title>hello there</title></page>';
+      o.addFakeServerResponse("xwiki", "GET", "myFile2", 200, o.answer);
+      o.spy (o, "status", 409, "Post but document already exists");
+      o.jio.post({"_id": "myFile2", "title": "hello again"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "post w/ existing doc -> 1 request to get doc then fail");
+
+      util.closeAndcleanUpJio(o.jio);
+  });
+
+  test ("Put", function(){
+
+      var o = setUp(this);
+
+      // put without id => id required
+      o.spy (o, "status", 20, "Put without id");
+      o.jio.put({}, o.f);
+      o.clock.tick(5000);
+      o.assertReqs(0, "put w/o id -> 0 requests");
+
+      // put non empty document
+      o.addFakeServerResponse("xwiki", "POST", "put1", 201, "HTML RESPONSE");
+      o.spy (o, "value", {"ok": true, "id": "put1"},
+             "Create = PUT non empty document");
+      o.jio.put({"_id": "put1", "title": "myPut1"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(3, "put normal doc -> 1 req to get doc, 1 for csrf token, 1 to post");
+
+      // put but document already exists = update
+      o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
+          '<page xmlns="http://www.xwiki.org"><title>mtPut1</title></page>';
+      o.addFakeServerResponse("xwiki", "GET", "put2", 200, o.answer);
+      o.addFakeServerResponse("xwiki", "POST", "put2", 201, "HTML RESPONSE");
+      o.spy (o, "value", {"ok": true, "id": "put2"}, "Updated the document");
+      o.jio.put({"_id": "put2", "title": "myPut2abcdedg"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(3, "put update doc -> 1 req to get doc, 1 for csrf token, 1 to post");
+
+      util.closeAndcleanUpJio(o.jio);
+  });
+
+  test ("PutAttachment", function(){
+
+      var o = setUp(this);
+
+      // putAttachment without doc id => id required
+      o.spy(o, "status", 20, "PutAttachment without doc id");
+      o.jio.putAttachment({}, o.f);
+      o.clock.tick(5000);
+      o.assertReqs(0, "put attach w/o doc id -> 0 requests");
+
+      // putAttachment without attachment id => attachment id required
+      o.spy(o, "status", 22, "PutAttachment without attachment id");
+      o.jio.putAttachment({"_id": "putattmt1"}, o.f);
+      o.clock.tick(5000);
+      o.assertReqs(0, "put attach w/o attach id -> 0 requests");
+
+      // putAttachment without underlying document => not found
+      o.addFakeServerResponse("xwiki", "GET", "putattmtx", 404, "HTML RESPONSE");
+      o.spy(o, "status", 404, "PutAttachment without document");
+      o.jio.putAttachment({"_id": "putattmtx", "_attachment": "putattmt2"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "put attach w/o existing document -> 1 request to get doc");
+
+      // putAttachment with document without data
+      o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
+          '<page xmlns="http://www.xwiki.org"><title>myPutAttm</title></page>';
+      o.addFakeServerResponse("xwiki", "GET", "putattmt1", 200, o.answer);
+      o.addFakeServerResponse("xwiki", "POST", "putattmt1/putattmt2", 201,"HTML"+
+        + "RESPONSE");
+      o.spy(o, "value", {"ok": true, "id": "putattmt1/putattmt2"},
+            "PutAttachment with document, without data");
+      o.jio.putAttachment({"_id": "putattmt1", "_attachment": "putattmt2"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(3, "put attach -> 1 request to get document, 1 to put " +
+                      "attach, 1 to get csrf token");
+
+      util.closeAndcleanUpJio(o.jio);
+  });
+
+  test ("Get", function(){
+
+      var o = setUp(this);
+
+      // get inexistent document
+      o.spy(o, "status", 404, "Get non existing document");
+      o.jio.get("get1", o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "try to get nonexistent doc -> 1 request");
+
+      // get inexistent attachment
+      o.spy(o, "status", 404, "Get non existing attachment");
+      o.jio.get("get1/get2", o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "try to get nonexistent attach -> 1 request");
+
+      // get document
+      o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
+          '<page xmlns="http://www.xwiki.org"><title>some title</title></page>';
+      o.addFakeServerResponse("xwiki", "GET", "get3", 200, o.answer);
+      o.spy(o, "value", {"_id": "get3", "title": "some title"}, "Get document");
+      o.jio.get("get3", o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "get document -> 1 request");
+
+      // get inexistent attachment (document exists)
+      o.spy(o, "status", 404, "Get non existing attachment (doc exists)");
+      o.jio.get({"_id": "get3", "_attachment": "getx"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "get nonexistant attachment -> 1 request");
+
+      // get attachment
+      o.answer = JSON.stringify({"_id": "get4", "title": "some attachment"});
+      o.addFakeServerResponse("xwiki", "GET", "get3/get4", 200, o.answer);
+      o.spy(o, "value", {"_id": "get4", "title": "some attachment"},
+        "Get attachment");
+      o.jio.get({"_id": "get3", "_attachment": "get4"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(1, "get attachment -> 1 request");
+
+      util.closeAndcleanUpJio(o.jio);
+  });
+
+  test ("Remove", function(){
+
+      var o = setUp(this);
+
+      // remove inexistent document
+      o.addFakeServerResponse("xwiki", "GET", "remove1", 404, "HTML RESPONSE");
+      o.spy(o, "status", 404, "Remove non existening document");
+      o.jio.remove({"_id": "remove1"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(2, "remove nonexistent doc -> 1 request for csrf and 1 for doc");
+
+      // remove inexistent document/attachment
+      o.addFakeServerResponse("xwiki", "GET", "remove1/remove2", 404, "HTML" +
+        "RESPONSE");
+      o.spy(o, "status", 404, "Remove inexistent document/attachment");
+      o.jio.removeAttachment({"_id": "remove1", "_attachment": "remove2"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(2, "remove nonexistant attach -> 1 request for csrf and 1 for doc");
+
+      // remove document
+      //o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
+      //    '<page xmlns="http://www.xwiki.org"><title>some doc</title></page>';
+      //o.addFakeServerResponse("xwiki", "GET", "remove3", 200, o.answer);
+      o.addFakeServerResponse("xwiki", "POST", "bin/delete/Main/remove3",
+                              200, "HTML RESPONSE");
+      o.spy(o, "value", {"ok": true, "id": "remove3"}, "Remove document");
+      o.jio.remove({"_id": "remove3"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(2, "remove document -> 1 request for csrf and 1 for deleting doc");
+
+      o.answer = JSON.stringify({
+        "_id": "remove4",
+        "title": "some doc",
+        "_attachments": {
+              "remove5": {
+                  "length": 4,
+                  "digest": "md5-d41d8cd98f00b204e9800998ecf8427e"
+              }
+        }
+      });
+      // remove attachment
+      o.addFakeServerResponse("xwiki", "POST", "delattachment/Main/remove4/remove5",
+                              200, "HTML RESPONSE");
+      o.spy(o, "value", {"ok": true, "id": "remove4/remove5"},
+            "Remove attachment");
+      o.jio.removeAttachment({"_id": "remove4", "_attachment": "remove5"}, o.f);
+      o.clock.tick(5000);
+      o.server.respond();
+      o.assertReqs(2, "remove attach -> 1 request for csrf and 1 for deletion");
+
+      util.closeAndcleanUpJio(o.jio);
+  });
+
+  var nThen = function(next) {
+      var funcs = [];
+      var calls = 0;
+      var waitFor = function(func) {
+          calls++;
+          return function() {
+              if (func) {
+                  func.apply(null, arguments);
+              }
+              calls = (calls || 1) - 1;
+              while (!calls && funcs.length) {
+                  funcs.shift()(waitFor);
+              }
+          };
+      };
+      next(waitFor);
+      var ret = {
+          nThen: function(next) {
+              funcs.push(next);
+              return ret;
+          },
+          orTimeout: function(func, milliseconds) {
+              var cto;
+              var timeout = setTimeout(function() {
+                  while (funcs.shift() !== cto) ;
+                  func(waitFor);
+                  calls = (calls || 1) - 1;
+                  while (!calls && funcs.length) {
+                    //console.log("call");
+                    funcs.shift()(waitFor);
+                  }
+              }, milliseconds);
+              funcs.push(cto = function() { clearTimeout(timeout); });
+              return ret;
+          }
+      };
+      return ret;
+  };
+
+
+  if (window.location.href.match(/xwiki\/bin\/view/)) (function() {
+  // This test will only be run if we are inside of a live XWiki instance.
+  test ("XWiki Live Server setup", function () {
+
+      var o = setUp(this);
+      o.jio.stop();
+      this.sandbox.restore();
+      o.server.restore();
+      o.jio.start();
+      QUnit.stop();
+
+      nThen(function(waitFor) {
+
+          // Remove the document if it exists.
+          o.jio.remove({"_id": "one.json"}, waitFor());
+
+      }).nThen(function(waitFor) {
+
+          // post a new document
+          o.spy(o, "value", {"id": "one.json", "ok": true}, "Live post document");
+          o.jio.post({"_id": "one.json", "title": "hello"}, waitFor(o.f));
+
+      }).nThen(function(waitFor) {
+
+          o.jio.get("one.json", waitFor(function(err, ret) {
+              ok(!err);
+              ok(ret._id == "one.json");
+              ok(ret.title == "hello");
+          }));
+
+      }).nThen(function(waitFor) {
+
+          // modify document
+          o.spy(o, "value", {"id": "one.json", "ok": true}, "Live modify document");
+          o.jio.put({"_id": "one.json", "title": "hello modified"}, waitFor(o.f));
+
+      }).nThen(function(waitFor) {
+
+          o.jio.get("one.json", waitFor(function(err, ret) {
+              ok(!err);
+              ok(ret.title == "hello modified");
+          }));
+
+      }).nThen(function(waitFor) {
+
+          // add attachment
+          o.spy(o, "value", {"id": "one.json/att.txt", "ok": true}, "Put attachment");
+          o.jio.putAttachment({
+            "_id": "one.json",
+            "_attachment": "att.txt",
+            "_mimetype": "text/plain",
+            "_data": "there2"
+          }, waitFor(o.f));
+
+      }).nThen(function(waitFor) {
+
+          // test allDocs
+          /*o.jio.allDocs({"include_docs":true},
+            function(s){console.log(s);},
+            function ( e ) {console.log(e);
+          }, o.f);*/
+
+      }).nThen(function(waitFor) {
+
+          // get Attachment
+          o.jio.getAttachment({"_id":"one.json", "_attachment":"att.txt"}, waitFor(function(err, ret) {
+              ok(!err);
+              ok(ret == "there2");
+          }));
+
+      }).nThen(function(waitFor) {
+
+          // remove Attachment
+          o.spy(o, "value", {"id": "one.json/att.txt", "ok": true}, "Remove attachment");
+          o.jio.removeAttachment({"_id":"one.json","_attachment":"att.txt"}, waitFor(o.f));
+
+      }).nThen(function(waitFor) {
+
+          // remove Document
+          o.spy(o, "value", {"id": "one.json", "ok": true}, "Remove document");
+          o.jio.remove("one.json", waitFor(o.f));
+
+      }).nThen(function(waitFor) {
+
+          //console.log("success");
+
+      }).orTimeout(function() {
+
+          //console.log("failed");
+          ok(0);
+
+      }, 15000).nThen(function() {
+
+          //console.log("complete");
+          o.jio.stop();
+          QUnit.start();
+
+      });
+
+  });
+  })(); // Live XWiki
+
+  })(); // xwiki
+
+
+}));

test/jiotests.js

@@ -1847,257 +1847,6 @@ test ('Get revision List', function () {
     o.jio.stop();
 });
 */
-
-;(function() {
-module ('Jio XWikiStorage');
-var setUp = function(that, liveTest) {
-    var o = generateTools(that);
-    o.server = sinon.fakeServer.create();
-    o.jio = JIO.newJio({type:'xwiki',formTokenPath:'form_token'});
-    o.addFakeServerResponse("xwiki", "GET", "form_token", 200,
-                            '<meta name="form_token" content="OMGHAX"/>');
-    o._addFakeServerResponse = o.addFakeServerResponse;
-    o.expectedRequests = [];
-    o.addFakeServerResponse = function(a,b,c,d,e) {
-        o._addFakeServerResponse(a,b,c,d,e);
-        o.expectedRequests.push([b,c]);
-    };
-    o.assertReqs = function(count, message) {
-        o.requests = (o.requests || 0) + count;
-        ok(o.server.requests.length === o.requests,
-           message + "[expected [" + count + "] got [" +
-              (o.server.requests.length - (o.requests - count)) + "]]");
-        for (var i = 1; i <= count; i++) {
-            var req = o.server.requests[o.server.requests.length - i];
-            if (!req) {
-                break;
-            }
-            for (var j = o.expectedRequests.length - 1; j >= 0; --j) {
-                var expected = o.expectedRequests[j];
-                if (req.method === expected[0] &&
-                    req.url.indexOf(expected[1]) !== 0)
-                {
-                    o.expectedRequests.splice(j, 1);
-                }
-            }
-        }
-        var ex = o.expectedRequests.pop();
-        if (ex) {
-            ok(0, "expected [" +  ex[0] + "] request for [" + ex[1] + "]");
-        }
-    };
-    return o;
-};
-
-test ("Post", function () {
-
-    var o = setUp(this);
-
-    // post without id
-    o.spy (o, "status", 405, "Post without id");
-    o.jio.post({}, o.f);
-    o.clock.tick(5000);
-    o.assertReqs(0, "no id -> no request");
-
-    // post non empty document
-    o.addFakeServerResponse("xwiki", "POST", "myFile", 201, "HTML RESPONSE");
-    o.spy(o, "value", {"id": "myFile", "ok": true},
-          "Create = POST non empty document");
-    o.jio.post({"_id": "myFile", "title": "hello there"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(3, "put -> 1 request to get csrf token, 1 to get doc and 1 to post data");
-
-    // post but document already exists (post = error!, put = ok)
-    o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
-        '<page xmlns="http://www.xwiki.org"><title>hello there</title></page>';
-    o.addFakeServerResponse("xwiki", "GET", "myFile2", 200, o.answer);
-    o.spy (o, "status", 409, "Post but document already exists");
-    o.jio.post({"_id": "myFile2", "title": "hello again"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "post w/ existing doc -> 1 request to get doc then fail");
-
-    o.jio.stop();
-});
-
-test ("Put", function(){
-
-    var o = setUp(this);
-
-    // put without id => id required
-    o.spy (o, "status", 20, "Put without id");
-    o.jio.put({}, o.f);
-    o.clock.tick(5000);
-    o.assertReqs(0, "put w/o id -> 0 requests");
-
-    // put non empty document
-    o.addFakeServerResponse("xwiki", "POST", "put1", 201, "HTML RESPONSE");
-    o.spy (o, "value", {"ok": true, "id": "put1"},
-           "Create = PUT non empty document");
-    o.jio.put({"_id": "put1", "title": "myPut1"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(3, "put normal doc -> 1 req to get doc, 1 for csrf token, 1 to post");
-
-    // put but document already exists = update
-    o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
-        '<page xmlns="http://www.xwiki.org"><title>mtPut1</title></page>';
-    o.addFakeServerResponse("xwiki", "GET", "put2", 200, o.answer);
-    o.addFakeServerResponse("xwiki", "POST", "put2", 201, "HTML RESPONSE");
-    o.spy (o, "value", {"ok": true, "id": "put2"}, "Updated the document");
-    o.jio.put({"_id": "put2", "title": "myPut2abcdedg"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(3, "put update doc -> 1 req to get doc, 1 for csrf token, 1 to post");
-
-    o.jio.stop();
-});
-
-test ("PutAttachment", function(){
-
-    var o = setUp(this);
-
-    // putAttachment without doc id => id required
-    o.spy(o, "status", 20, "PutAttachment without doc id");
-    o.jio.putAttachment({}, o.f);
-    o.clock.tick(5000);
-    o.assertReqs(0, "put attach w/o doc id -> 0 requests");
-
-    // putAttachment without attachment id => attachment id required
-    o.spy(o, "status", 22, "PutAttachment without attachment id");
-    o.jio.putAttachment({"_id": "putattmt1"}, o.f);
-    o.clock.tick(5000);
-    o.assertReqs(0, "put attach w/o attach id -> 0 requests");
-
-    // putAttachment without underlying document => not found
-    o.addFakeServerResponse("xwiki", "GET", "putattmtx", 404, "HTML RESPONSE");
-    o.spy(o, "status", 404, "PutAttachment without document");
-    o.jio.putAttachment({"_id": "putattmtx", "_attachment": "putattmt2"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "put attach w/o existing document -> 1 request to get doc");
-
-    // putAttachment with document without data
-    o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
-        '<page xmlns="http://www.xwiki.org"><title>myPutAttm</title></page>';
-    o.addFakeServerResponse("xwiki", "GET", "putattmt1", 200, o.answer);
-    o.addFakeServerResponse("xwiki", "POST", "putattmt1/putattmt2", 201,"HTML"+
-      + "RESPONSE");
-    o.spy(o, "value", {"ok": true, "id": "putattmt1/putattmt2"},
-          "PutAttachment with document, without data");
-    o.jio.putAttachment({"_id": "putattmt1", "_attachment": "putattmt2"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(3, "put attach -> 1 request to get document, 1 to put " +
-                    "attach, 1 to get csrf token");
-
-    o.jio.stop();
-});
-
-test ("Get", function(){
-
-    var o = setUp(this);
-
-    // get inexistent document
-    o.spy(o, "status", 404, "Get non existing document");
-    o.jio.get("get1", o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "try to get nonexistent doc -> 1 request");
-
-    // get inexistent attachment
-    o.spy(o, "status", 404, "Get non existing attachment");
-    o.jio.get("get1/get2", o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "try to get nonexistent attach -> 1 request");
-
-    // get document
-    o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
-        '<page xmlns="http://www.xwiki.org"><title>some title</title></page>';
-    o.addFakeServerResponse("xwiki", "GET", "get3", 200, o.answer);
-    o.spy(o, "value", {"_id": "get3", "title": "some title"}, "Get document");
-    o.jio.get("get3", o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "get document -> 1 request");
-
-    // get inexistent attachment (document exists)
-    o.spy(o, "status", 404, "Get non existing attachment (doc exists)");
-    o.jio.get({"_id": "get3", "_attachment": "getx"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "get nonexistant attachment -> 1 request");
-
-    // get attachment
-    o.answer = JSON.stringify({"_id": "get4", "title": "some attachment"});
-    o.addFakeServerResponse("xwiki", "GET", "get3/get4", 200, o.answer);
-    o.spy(o, "value", {"_id": "get4", "title": "some attachment"},
-      "Get attachment");
-    o.jio.get({"_id": "get3", "_attachment": "get4"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(1, "get attachment -> 1 request");
-
-    o.jio.stop();
-});
-
-test ("Remove", function(){
-
-    var o = setUp(this);
-
-    // remove inexistent document
-    o.addFakeServerResponse("xwiki", "GET", "remove1", 404, "HTML RESPONSE");
-    o.spy(o, "status", 404, "Remove non existening document");
-    o.jio.remove({"_id": "remove1"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(2, "remove nonexistent doc -> 1 request for csrf and 1 for doc");
-
-    // remove inexistent document/attachment
-    o.addFakeServerResponse("xwiki", "GET", "remove1/remove2", 404, "HTML" +
-      "RESPONSE");
-    o.spy(o, "status", 404, "Remove inexistent document/attachment");
-    o.jio.removeAttachment({"_id": "remove1", "_attachment": "remove2"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(2, "remove nonexistant attach -> 1 request for csrf and 1 for doc");
-
-    // remove document
-    //o.answer = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' +
-    //    '<page xmlns="http://www.xwiki.org"><title>some doc</title></page>';
-    //o.addFakeServerResponse("xwiki", "GET", "remove3", 200, o.answer);
-    o.addFakeServerResponse("xwiki", "POST", "bin/delete/Main/remove3",
-                            200, "HTML RESPONSE");
-    o.spy(o, "value", {"ok": true, "id": "remove3"}, "Remove document");
-    o.jio.remove({"_id": "remove3"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(2, "remove document -> 1 request for csrf and 1 for deleting doc");
-
-    o.answer = JSON.stringify({
-      "_id": "remove4",
-      "title": "some doc",
-      "_attachments": {
-            "remove5": {
-                "length": 4,
-                "digest": "md5-d41d8cd98f00b204e9800998ecf8427e"
-            }
-      }
-    });
-    // remove attachment
-    o.addFakeServerResponse("xwiki", "POST", "delattachment/Main/remove4/remove5",
-                            200, "HTML RESPONSE");
-    o.spy(o, "value", {"ok": true, "id": "remove4/remove5"},
-          "Remove attachment");
-    o.jio.removeAttachment({"_id": "remove4", "_attachment": "remove5"}, o.f);
-    o.clock.tick(5000);
-    o.server.respond();
-    o.assertReqs(2, "remove attach -> 1 request for csrf and 1 for deletion");
-
-    o.jio.stop();
-});
 /*
 test ("AllDocs", function () {
 
@@ -2728,148 +2477,6 @@ test ("AllDocs", function(){
     o.jio.stop();
 });
 
-
-var nThen = function(next) {
-    var funcs = [];
-    var calls = 0;
-    var waitFor = function(func) {
-        calls++;
-        return function() {
-            if (func) {
-                func.apply(null, arguments);
-            }
-            calls = (calls || 1) - 1;
-            while (!calls && funcs.length) {
-                funcs.shift()(waitFor);
-            }
-        };
-    };
-    next(waitFor);
-    var ret = {
-        nThen: function(next) {
-            funcs.push(next);
-            return ret;
-        },
-        orTimeout: function(func, milliseconds) {
-            var cto;
-            var timeout = setTimeout(function() {
-                while (funcs.shift() !== cto) ;
-                func(waitFor);
-                calls = (calls || 1) - 1;
-                while (!calls && funcs.length) { console.log("call"); funcs.shift()(waitFor); }
-            }, milliseconds);
-            funcs.push(cto = function() { clearTimeout(timeout); });
-            return ret;
-        }
-    };
-    return ret;
-};
-
-
-if (window.location.href.match(/xwiki\/bin\/view/)) (function() {
-// This test will only be run if we are inside of a live XWiki instance.
-test ("XWiki Live Server setup", function () {
-
-    var o = setUp(this);
-    o.jio.stop();
-    this.sandbox.restore();
-    o.server.restore();
-    o.jio.start();
-    QUnit.stop();
-
-    nThen(function(waitFor) {
-
-        // Remove the document if it exists.
-        o.jio.remove({"_id": "one.json"}, waitFor());
-
-    }).nThen(function(waitFor) {
-
-        // post a new document
-        o.spy(o, "value", {"id": "one.json", "ok": true}, "Live post document");
-        o.jio.post({"_id": "one.json", "title": "hello"}, waitFor(o.f));
-
-    }).nThen(function(waitFor) {
-
-        o.jio.get("one.json", waitFor(function(err, ret) {
-            ok(!err);
-            ok(ret._id == "one.json");
-            ok(ret.title == "hello");
-        }));
-
-    }).nThen(function(waitFor) {
-
-        // modify document
-        o.spy(o, "value", {"id": "one.json", "ok": true}, "Live modify document");
-        o.jio.put({"_id": "one.json", "title": "hello modified"}, waitFor(o.f));
-
-    }).nThen(function(waitFor) {
-
-        o.jio.get("one.json", waitFor(function(err, ret) {
-            ok(!err);
-            ok(ret.title == "hello modified");
-        }));
-
-    }).nThen(function(waitFor) {
-
-        // add attachment
-        o.spy(o, "value", {"id": "one.json/att.txt", "ok": true}, "Put attachment");
-        o.jio.putAttachment({
-          "_id": "one.json",
-          "_attachment": "att.txt",
-          "_mimetype": "text/plain",
-          "_data": "there2"
-        }, waitFor(o.f));
-
-    }).nThen(function(waitFor) {
-
-        // test allDocs
-        /*o.jio.allDocs({"include_docs":true},
-          function(s){console.log(s);},
-          function ( e ) {console.log(e);
-        }, o.f);*/
-
-    }).nThen(function(waitFor) {
-
-        // get Attachment
-        o.jio.getAttachment({"_id":"one.json", "_attachment":"att.txt"}, waitFor(function(err, ret) {
-            ok(!err);
-            ok(ret == "there2");
-        }));
-
-    }).nThen(function(waitFor) {
-
-        // remove Attachment
-        o.spy(o, "value", {"id": "one.json/att.txt", "ok": true}, "Remove attachment");
-        o.jio.removeAttachment({"_id":"one.json","_attachment":"att.txt"}, waitFor(o.f));
-
-    }).nThen(function(waitFor) {
-
-        // remove Document
-        o.spy(o, "value", {"id": "one.json", "ok": true}, "Remove document");
-        o.jio.remove("one.json", waitFor(o.f));
-
-    }).nThen(function(waitFor) {
-
-        //console.log("success");
-
-    }).orTimeout(function() {
-
-        //console.log("failed");
-        ok(0);
-
-    }, 15000).nThen(function() {
-
-        //console.log("complete");
-        o.jio.stop();
-        QUnit.start();
-
-    });
-
-});
-})(); // Live XWiki
-
-})(); // xwiki
-
 };                              // end thisfun
 
 if (window.requirejs) {

test/jiotests_withoutrequirejs.html

@@ -40,5 +40,8 @@
   <script src="../lib/jquery/jquery.min.js"></script>
   <script src="../src/jio.storage/davstorage.js"></script>
   <script src="./jio.storage/davstorage.tests.js"></script>
+
+  <script src="../src/jio.storage/xwikistorage.js"></script>
+  <script src="./jio.storage/xwikistorage.tests.js"></script>
 </body>
 </html>

test/tests.require.js

@@ -28,6 +28,8 @@
       "splitstorage_tests": "jio.storage/splitstorage.tests",
       "gidstorage": "../src/jio.storage/gidstorage",
       "gidstorage_tests": "jio.storage/gidstorage.tests",
+      "xwikistorage": "../src/jio.storage/xwikistorage",
+      "xwikistorage_tests": "jio.storage/xwikistorage.tests",
 
       "qunit": "../lib/qunit/qunit",
       "sinon": "../lib/sinon/sinon",
@@ -54,5 +56,6 @@
     "splitstorage_tests",
     "gidstorage_tests",
     "davstorage_tests",
+    "xwikistorage_tests",
   ]);
 }());