modifications to mocha.js and some TestExecutor logic

Common/Product/SharedProject/ProcessOutput.cs

@@ -304,7 +304,7 @@ public static ProcessOutput RunElevated(
             return result;
         }
 
-        private static string GetArguments(IEnumerable<string> arguments, bool quoteArgs) {
+        public static string GetArguments(IEnumerable<string> arguments, bool quoteArgs) {
             if (quoteArgs) {
                 return string.Join(" ", arguments.Where(a => a != null).Select(QuoteSingleArgument));
             } else {
@@ -335,7 +335,7 @@ internal static IEnumerable<string> SplitLines(string source) {
             }
         }
 
-        internal static string QuoteSingleArgument(string arg) {
+        public static string QuoteSingleArgument(string arg) {
             if (string.IsNullOrEmpty(arg)) {
                 return "\"\"";
             }

Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js

@@ -2,12 +2,25 @@
 var EOL = require('os').EOL;
 var fs = require('fs');
 var path = require('path');
-
+var result = {
+    "title": "",
+    "passed": false,
+    "stdOut": "",
+    "stdErr": ""
+};
 // Choose 'tap' rather than 'min' or 'xunit'. The reason is that
 // 'min' produces undisplayable text to stdout and stderr under piped/redirect, 
 // and 'xunit' does not print the stack trace from the test.
 var defaultMochaOptions = { ui: 'tdd', reporter: 'tap', timeout: 2000 };
 
+process.stdout.write = function (string, encoding, fd) {
+    result.stdOut += string;
+}
+
+process.stderr.write = function (string, encoding, fd) {
+    result.stdErr += string;
+}
+
 var find_tests = function (testFileList, discoverResultFile, projectFolder) {
     var Mocha = detectMocha(projectFolder);
     if (!Mocha) {
@@ -56,7 +69,8 @@ var find_tests = function (testFileList, discoverResultFile, projectFolder) {
 };
 module.exports.find_tests = find_tests;
 
-var run_tests = function (testName, testFile, workingFolder, projectFolder) {
+var run_tests = function (testName, testFile, workingFolder, projectFolder, callback) {
+    //var testResults = [];
     var Mocha = detectMocha(projectFolder);
     if (!Mocha) {
         return;
@@ -70,10 +84,27 @@ var run_tests = function (testName, testFile, workingFolder, projectFolder) {
         else
             mocha.grep(testName); // prior Mocha 3.0.0
     }
+
     mocha.addFile(testFile);
 
-    mocha.run(function (code) {
-        process.exit(code);
+    // run tests
+    var runner = mocha.run(function (code) { });
+
+    runner.on('start', function () {
+    });
+    runner.on('test', function (test) {
+        result.title = test.title;
+    });
+    runner.on('end', function () {
+        callback(result);
+    });
+    runner.on('pass', function (test) {
+        result.passed = true;
+        //testResults.push(result);
+    });
+    runner.on('fail', function (test, err) {
+        result.passed = false;
+        //testResults.push(result);
     });
 };
 

Nodejs/Product/Nodejs/TestFrameworks/run_tests.js

@@ -1,10 +1,35 @@
 var framework;
-try {
-    framework = require('./' + process.argv[2] + '/' + process.argv[2] + '.js');
-} catch (exception) {
-    console.log("NTVS_ERROR:Failed to load TestFramework (" + process.argv[2] + "), " + exception);
-    process.exit(1);
-}
+var readline = require('readline');
+var old_stdout = process.stdout.write;
+var old_stderr = process.stderr.write;
+var rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
 
-framework.run_tests(process.argv[3], process.argv[4], process.argv[5], process.argv[6]);
+rl.on('line', (line) => {
+    var testInfo = JSON.parse(line);
+    // get rid of leftover quotations from C# (necessary?)
+    for(var s in testInfo) {
+        testInfo[s] = testInfo[s].replace(/["]+/g, '');
+    }
 
+    try {
+        framework = require('./' + testInfo.framework + '/' + testInfo.framework + '.js');
+    } catch (exception) {
+        console.log("NTVS_ERROR:Failed to load TestFramework (" + process.argv[2] + "), " + exception);
+        process.exit(1);
+    }
+
+    function sendResult(result) {
+        process.stdout.write = old_stdout;
+        process.stderr.write = old_stderr;
+        console.log(JSON.stringify(result));
+        process.exit(0);
+    }
+    // run the test
+    framework.run_tests(testInfo.testName, testInfo.testFile, testInfo.workingFolder, testInfo.projectFolder, sendResult);
+
+    // close readline interface
+    rl.close();
+});