Merge pull request #3506 from PowerShell/andschwa/tests

Update test runner

Author: andyleejordan

package-lock.json

@@ -64,6 +64,7 @@
     "@types/sinon": "~10.0.2",
     "@types/uuid": "~8.3.1",
     "@types/vscode": "~1.53.0",
+    "@vscode/test-electron": "~1.6.2",
     "mocha": "~9.0.3",
     "mocha-junit-reporter": "~2.0.0",
     "mocha-multi-reporters": "~1.5.1",
@@ -72,8 +73,7 @@
     "sinon": "~11.1.2",
     "tslint": "~6.1.3",
     "typescript": "~4.3.5",
-    "vsce": "~1.96.1",
-    "vscode-test": "~1.6.1"
+    "vsce": "~1.96.1"
   },
   "extensionDependencies": [
     "vscode.powershell"

package.json

@@ -6,7 +6,7 @@ import mockFS = require("mock-fs");
 import FileSystem = require("mock-fs/lib/filesystem");
 import * as path from "path";
 import * as sinon from "sinon";
-import * as platform from "../src/platform";
+import * as platform from "../../src/platform";
 
 /**
  * Describes a platform on which the PowerShell extension should work,

test/platform.test.ts renamed to test/core/platform.test.ts

@@ -3,7 +3,7 @@
 
 import * as assert from "assert";
 import * as vscode from "vscode";
-import Settings = require("../src/settings");
+import Settings = require("../../src/settings");
 
 suite("Settings module", () => {
     test("Settings load without error", () => {

test/settings.test.ts renamed to test/core/settings.test.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/fixtures/.gitattributes

@@ -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);