From a9edc7ee30cb392f92f8cd6b0fa8a26e02347054 Mon Sep 17 00:00:00 2001
From: Adrien Castex <adrien.castex@protonmail.com>
Date: Wed, 28 Jun 2017 15:29:06 +0200
Subject: [PATCH] Upgraded the test framework of the v2

---
 test/v2/root.js                              | 6 +++++-
 test/v2/tests.ts/options/.createFiles.ts     | 2 +-
 test/v2/tests.ts/readDir/.createDir.ts       | 5 +++--
 test/v2/tests.ts/readWrite/.createFileTxt.ts | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/v2/root.js b/test/v2/root.js
index abf46321..d643d811 100644
--- a/test/v2/root.js
+++ b/test/v2/root.js
@@ -156,6 +156,10 @@ module.exports = (callback, options) => {
                                 callCallback();
                             }
 
+                            info.exit = (msg) => {
+                                callback(false, msg);
+                            }
+
                             var allGood = true;
                             var allMsg;
                             info.isValid = function(good, msg, error)
@@ -182,7 +186,7 @@ module.exports = (callback, options) => {
                     
                     try
                     {
-                        setTimeout(() => info.isValid(false, 'Timeout'), options.timeout);
+                        setTimeout(() => info.exit('Timeout'), options.timeout);
                         process.nextTick(() => require(fx).default(info, (good, msg, e) => info.isValid(good, msg, e)));
                     }
                     catch(ex)
diff --git a/test/v2/tests.ts/options/.createFiles.ts b/test/v2/tests.ts/options/.createFiles.ts
index 4f5fd846..88fb7d1d 100644
--- a/test/v2/tests.ts/options/.createFiles.ts
+++ b/test/v2/tests.ts/options/.createFiles.ts
@@ -3,7 +3,7 @@ import { v2 } from '../../../../lib/index.js'
 
 export function starter(server : v2.WebDAVServer, info : TestInfo, isValid : TestCallback, name : string, expect : string[], reject : string[], callback : (allowHeader ?: string[]) => void) : void
 {
-    server.rootFileSystem().addSubTree(info.ctx, {
+    server.rootFileSystem().addSubTree(v2.RequestContext.createExternal(server), {
         'folder': v2.ResourceType.Directory,
         'file': v2.ResourceType.File,
         'hybrid': v2.ResourceType.Hybrid,
diff --git a/test/v2/tests.ts/readDir/.createDir.ts b/test/v2/tests.ts/readDir/.createDir.ts
index 6aa7d847..2bdf1547 100644
--- a/test/v2/tests.ts/readDir/.createDir.ts
+++ b/test/v2/tests.ts/readDir/.createDir.ts
@@ -10,7 +10,8 @@ export function starter(server : v2.WebDAVServer, info : TestInfo, isValid : Tes
         'subFile2'
     ];
     const name = 'folder';
-    server.rootFileSystem().addSubTree(info.ctx, {
+    const ctx = v2.RequestContext.createExternal(server);
+    server.rootFileSystem().addSubTree(ctx, {
         [name]: {
             'subFolder1': v2.ResourceType.Directory,
             'subFolder2': v2.ResourceType.Directory,
@@ -20,7 +21,7 @@ export function starter(server : v2.WebDAVServer, info : TestInfo, isValid : Tes
     }, (e) => {
         if(e) return isValid(false, 'Cannot call "addSubTree(...)".', e);
 
-        server.getResource(info.ctx, '/' + name, (e, r) => {
+        server.getResource(ctx, '/' + name, (e, r) => {
             if(e) return isValid(false, 'Could not find /' + name, e);
 
             callback(r, subFiles);
diff --git a/test/v2/tests.ts/readWrite/.createFileTxt.ts b/test/v2/tests.ts/readWrite/.createFileTxt.ts
index 05d4013a..429f4cba 100644
--- a/test/v2/tests.ts/readWrite/.createFileTxt.ts
+++ b/test/v2/tests.ts/readWrite/.createFileTxt.ts
@@ -7,12 +7,13 @@ export function starter(server : v2.WebDAVServer, info : TestInfo, isValid : Tes
     const type = _callback ? _type as v2.ResourceType : v2.ResourceType.File;
 
     const name = 'file.txt';
-    server.rootFileSystem().addSubTree(info.ctx, {
+    const ctx = v2.RequestContext.createExternal(server);
+    server.rootFileSystem().addSubTree(ctx, {
         [name]: type
     }, (e) => {
         if(e) return isValid(false, 'Cannot call "addSubTree(...)".', e);
 
-        server.getResource(info.ctx, '/' + name, (e, r) => {
+        server.getResource(ctx, '/' + name, (e, r) => {
             if(e) return isValid(false, 'Could not find //' + name, e);
 
             if(!type.isFile)