Enabling test explorer for unit tests. (#18218)

Author: aasimkhan30

.vscode-test.mjs

@@ -0,0 +1,13 @@
+import * as testCli from '@vscode/test-cli';
+
+export default testCli.defineConfig([
+	{
+		label: 'Unit Tests',
+		files: 'out/test/**/*.test.js',
+		version: 'insiders',
+		mocha: {
+			ui: 'tdd',
+			timeout: 5000
+		}
+	}
+])

.vscode/extensions.json

@@ -6,6 +6,7 @@
 		"EditorConfig.EditorConfig",
 		"GitHub.vscode-pull-request-github",
 		"ms-playwright.playwright",
-		"esbenp.prettier-vscode"
+		"esbenp.prettier-vscode",
+		"ms-vscode.extension-test-runner"
 	]
 }

package.json

@@ -108,7 +108,8 @@
     "@typescript-eslint/parser": "^8.7.0",
     "@vscode/l10n": "^0.0.18",
     "@vscode/l10n-dev": "^0.0.35",
-    "@vscode/test-electron": "^2.3.9",
+    "@vscode/test-cli": "^0.0.10",
+    "@vscode/test-electron": "^2.4.1",
     "@vscode/vsce": "^3.1.1",
     "@xmldom/xmldom": "0.8.4",
     "angular-in-memory-web-api": "0.1.13",

test/unit/initialization.test.ts

@@ -3,42 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as Extension from "../../src/extension";
 import * as assert from "assert";
-import * as vscode from "vscode";
 
-import * as Extension from "../../src/extension";
 import ConnectionManager from "../../src/controllers/connectionManager";
 import MainController from "../../src/controllers/mainController";
-
-function ensureExtensionIsActive(): Promise<any> {
-    return new Promise((resolve, reject) => {
-        waitForExtensionToBeActive(resolve);
-    });
-}
-
-function waitForExtensionToBeActive(resolve): void {
-    if (
-        typeof vscode.extensions.getExtension("ms-mssql.mssql") ===
-            "undefined" ||
-        !vscode.extensions.getExtension("ms-mssql.mssql").isActive
-    ) {
-        // tslint:disable-next-line no-invalid-this Bind to the mocha context so it resolves properly
-        setTimeout(waitForExtensionToBeActive.bind(this, resolve), 50);
-    } else {
-        resolve();
-    }
-}
+import { activateExtension } from "./utils";
 
 suite("Initialization Tests", () => {
-    test("Connection manager is initialized properly", (done) => {
-        // Wait for the extension to activate
-        void ensureExtensionIsActive().then(async () => {
-            // Verify that the connection manager was initialized properly
-            let controller: MainController = await Extension.getController();
-            let connectionManager: ConnectionManager =
-                controller.connectionManager;
-            assert.notStrictEqual(undefined, connectionManager.client);
-            done();
-        });
+    test("Connection manager is initialized properly", async () => {
+        await activateExtension();
+        let controller: MainController = await Extension.getController();
+        let connectionManager: ConnectionManager = controller.connectionManager;
+        assert.notStrictEqual(undefined, connectionManager.client);
     });
 });

test/unit/mainController.test.ts

@@ -14,8 +14,9 @@ import * as LocalizedConstants from "../../src/constants/locConstants";
 import VscodeWrapper from "../../src/controllers/vscodeWrapper";
 import { TestExtensionContext } from "./stubs";
 import * as assert from "assert";
+import { activateExtension } from "./utils";
 
-suite("MainController Tests", () => {
+suite("MainController Tests", function () {
     let document: vscode.TextDocument;
     let newDocument: vscode.TextDocument;
     let mainController: MainController;
@@ -27,6 +28,9 @@ suite("MainController Tests", () => {
     let newDocUriCallback: string;
 
     setup(async () => {
+        // Need to activate the extension to get the mainController
+        await activateExtension();
+
         // Setup a standard document and a new document
         docUri = "docURI.sql";
         newDocUri = "newDocURI.sql";
@@ -52,7 +56,6 @@ suite("MainController Tests", () => {
         // Resetting call back variables
         docUriCallback = "";
         newDocUriCallback = "";
-
         // Using the mainController that was instantiated with the extension
         mainController = await Extension.getController();
 

test/unit/utils.ts

@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as constants from "../../src/constants/constants";
+import * as vscode from "vscode";
+
+export async function activateExtension() {
+    const extension = vscode.extensions.getExtension(constants.extensionId);
+    await extension.activate();
+}