Update test runner as necessary

Author: andyleejordan

test/testRunner.ts renamed to test/index.ts

@@ -1,14 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import * as glob from "glob";
-import * as Mocha from "mocha";
+// NOTE: This code is borrowed under permission from:
+// https://github.com/microsoft/vscode-extension-samples/tree/main/helloworld-test-sample/src/test
+
 import * as path from "path";
+import * as Mocha from "mocha";
+import * as glob from "glob";
 
 export function run(): Promise<void> {
     // Create the mocha test
     const mocha = new Mocha({
-        ui: "tdd",         // the TDD UI is being used in extension.test.ts (suite, test, etc.)
+        ui: "tdd",
         color: !process.env.TF_BUILD, // colored output from test results
         reporter: "mocha-multi-reporters",
         timeout: 5000,
@@ -23,24 +26,26 @@ export function run(): Promise<void> {
     const testsRoot = path.resolve(__dirname, "..");
 
     return new Promise((c, e) => {
-        glob("**/**.test.js", { cwd: testsRoot }, (err: any, files: any[]) => {
+        glob("**/**.test.js", { cwd: testsRoot }, (err, files) => {
             if (err) {
                 return e(err);
             }
 
             // Add files to the test suite
-            files.forEach((f) => mocha.addFile(path.resolve(testsRoot, f)));
+            files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
 
             try {
                 // Run the mocha test
-                mocha.run((failures) => {
+                mocha.run(failures => {
                     if (failures > 0) {
                         e(new Error(`${failures} tests failed.`));
                     } else {
                         c();
                     }
                 });
             } catch (err) {
+                // tslint:disable-next-line:no-console
+                console.error(err);
                 e(err);
             }
         });

test/runTests.ts

@@ -1,38 +1,33 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import * as path from "path";
+// NOTE: This code is borrowed under permission from:
+// https://github.com/microsoft/vscode-extension-samples/tree/main/helloworld-test-sample/src/test
 
-import { runTests } from "vscode-test";
+import * as path from "path";
 
-// tslint:disable-next-line: no-var-requires
-const PackageJSON: any = require("../../package.json");
-const testExtensionId = `${PackageJSON.publisher}.${PackageJSON.name}`;
+import { runTests } from "@vscode/test-electron";
 
 async function main() {
     try {
         // The folder containing the Extension Manifest package.json
         // Passed to `--extensionDevelopmentPath`
         const extensionDevelopmentPath = path.resolve(__dirname, "../../");
 
-        // The path to the extension test runner script
+        // The path to the extension test script
         // Passed to --extensionTestsPath
-        const extensionTestsPath = path.resolve(__dirname, "./testRunner");
+        const extensionTestsPath = path.resolve(__dirname, "./index");
 
-        // Download VS Code, unzip it and run the integration test from the local directory.
+        // Download VS Code, unzip it and run the integration test
         await runTests({
             extensionDevelopmentPath,
             extensionTestsPath,
-            launchArgs: [
-                "--disable-extensions",
-                "--enable-proposed-api", testExtensionId,
-                "./test"
-            ],
+            launchArgs: ["--disable-extensions", "./test"],
+            // This is necessary because the tests fail if more than once
+            // instance of Code is running.
             version: "insiders"
         });
     } catch (err) {
-        // tslint:disable-next-line:no-console
-        console.error(err);
         // tslint:disable-next-line:no-console
         console.error("Failed to run tests");
         process.exit(1);