Upgraded the test framework of the v2

OpenMarshal · Jun 28, 2017 · a9edc7e · a9edc7e
1 parent deb443b
commit a9edc7e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)