load with fake

matepek · Oct 20, 2018 · 1da2fc5 · 1da2fc5
1 parent 1858c93
commit 1da2fc5
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 45 deletions.
diff --git a/src/C2TestSuiteInfo.ts b/src/C2TestSuiteInfo.ts
@@ -284,7 +284,7 @@ export class C2TestSuiteInfo implements TestSuiteInfo {
 
               if (lines.length == 0) this.adapter.log.error('Empty test list.');
 
-              while (lines[lines.length - 1].length == 0) lines.pop();
+              while (lines[lines.length - 1].trim().length == 0) lines.pop();
 
               let i = 1;
               while (i < lines.length - 1) {

diff --git a/src/test/C2TestAdapter.test.ts b/src/test/C2TestAdapter.test.ts
@@ -932,14 +932,40 @@ describe('C2TestAdapter', function() {
   // describe('executables:'
 
   describe('load:', function() {
-    // const cwd = path.join(process.cwd(), 'out', 'test');
+    const cwd = path.join(process.cwd(), 'out', 'test');
+
+    const suite1TestList = `Matching test cases:
+  s1t1
+    ../vscode-catch2-test-adapter/src/test/suite1.cpp:7
+    tag1
+  s1t2
+    ../vscode-catch2-test-adapter/src/test/suite1.cpp:13
+    tag1
+2 matching test cases
+  
+  `;
+
+    const suite2TestList = `Matching test cases:
+  s2t1
+    ../vscode-catch2-test-adapter/src/test/suite2.cpp:7
+    tag1
+  s2t2
+    ../vscode-catch2-test-adapter/src/test/suite2.cpp:13
+    tag1
+      [.]
+  s2t3
+    ../vscode-catch2-test-adapter/src/test/suite2.cpp:19
+    tag1
+3 matching test cases
+  `;
 
     const updateAndLoad = (value: any) => {
       return config.update('executables', value)
           .then(() => {
             const adapter = createAdapterAndSubscribe();
 
             const watchEvents: Map<string, EventEmitter> = new Map();
+            fsWatchStub.reset();
             fsWatchStub.callsFake((path: string) => {
               const ee = new EventEmitter();
               watchEvents.set(path, ee);
@@ -964,57 +990,47 @@ describe('C2TestAdapter', function() {
           });
     };
 
-    const fakeExecFileFunc =
-        (pathAndContent: Map<string, string|undefined>) => {
-          return (path: string, args: string[],
-                  cb: (err: any, stout: string, stderr: string) => void) => {
-            const res = pathAndContent.get(path);
-            if (res === undefined) {
-              cb(new Error('fake file not exists.'), '', '');
-            } else if (args.length == 1 && args[0] === '--help') {
-              cb(null, 'Catch v2.', '');
-            } else if (!deepEqual(args, [
-                         '[.],*', '--verbosity', 'high', '--list-tests',
-                         '--use-colour', 'no'
-                       ])) {
-              assert.ok(false, inspect([path, args]));
-            } else {
-              cb(null, res!, '');
-            };
-          };
+    function fakeExecFileFunc(pathAndContent: Map<string, string|undefined>) {
+      return function(
+          path: string, args: string[],
+          cb: (err: any, stout: string, stderr: string) => void) {
+        const res = pathAndContent.get(path);
+        if (res === undefined) {
+          cb(new Error('fake file not exists.'), '', '');
+        } else if (args.length == 1 && args[0] === '--help') {
+          cb(null, 'Catch v2.', '');
+        } else if (!deepEqual(args, [
+                     '[.],*', '--verbosity', 'high', '--list-tests',
+                     '--use-colour', 'no'
+                   ])) {
+          assert.ok(false, inspect([path, args]));
+        } else {
+          cb(null, res!, '');
         };
+      };
+    };
 
-    const fakeExistsFunc = (pathAndContent: Map<string, string|undefined>) => {
-      return (path: string, cb: (err: any, exists: boolean) => void) => {
+    function fakeExistsFunc(pathAndContent: Map<string, string|undefined>) {
+      return function(path: string, cb: (err: any, exists: boolean) => void) {
         cb(undefined, pathAndContent.has(path));
       };
     };
 
-    it('"path1"', () => {
-      execFileStub.callsFake(
-          (path: string, args: string[],
-           cb: (err: any, stout: string, stderr: string) => void) => {
-            if (args.length == 1 && args[0] === '--help') {
-              cb(null, 'Catch v2.', '');
-            } else if (!deepEqual(args, [
-                         '[.],*', '--verbosity', 'high', '--list-tests',
-                         '--use-colour', 'no'
-                       ])) {
-              assert.ok(false, inspect([path, args]));
-            } else {
-              cb(null, 'alma', '');
-            }
-          });
-
-      fsExistsStub.callsFake(
-          (path: string, cb: (err: any, exists: boolean) => void) => {
-            cb(undefined, true);
-          });
+    const fakeFs = (pathAndContent: Iterable<[string, string]>) => {
+      const map = new Map(pathAndContent);
+      execFileStub.reset();
+      execFileStub.callsFake(fakeExecFileFunc(map));
+      fsExistsStub.reset();
+      fsExistsStub.callsFake(fakeExistsFunc(map));
+    };
 
-      return updateAndLoad('path1').then(
-          (param) => {
+    it('"path1"', () => {
+      this.timeout(99999);
+      fakeFs([[path.join(cwd, 'path1'), suite1TestList]]);
 
-          });
+      return updateAndLoad('path1').then((param) => {
+        assert.equal(param.root.children.length, 1);
+      });
     });
   });
 });