Some test path fixes

Author: Den1552

src/extension.ts

@@ -136,7 +136,7 @@ import {
 } from "./vcastUtilities";
 
 import fs = require("fs");
-import { getNonce } from "./manage/manageSrc/manageUtils";
+import { getNonce, resolveWebviewBase } from "./manage/manageSrc/manageUtils";
 const path = require("path");
 let messagePane: vscode.OutputChannel = vscode.window.createOutputChannel(
   "VectorCAST Test Explorer"
@@ -744,20 +744,19 @@ function configureExtension(context: vscode.ExtensionContext) {
   const addTestsuiteToCompiler = vscode.commands.registerCommand(
     "vectorcastTestExplorer.addTestsuiteToCompiler",
     async (node: any) => {
+      const manageWebviewSrcDir = resolveWebviewBase(context);
       const panel = vscode.window.createWebviewPanel(
         "addTestsuiteToCompiler",
         "Add Testsuite to Compiler",
         vscode.ViewColumn.Active,
         {
           enableScripts: true,
           retainContextWhenHidden: true,
-          localResourceRoots: [
-            vscode.Uri.file(path.join(context.extensionPath, "src", "manage")),
-          ],
+          localResourceRoots: [vscode.Uri.file(manageWebviewSrcDir)],
         }
       );
 
-      panel.webview.html = getTestsuiteWebviewContent(context, panel);
+      panel.webview.html = await getTestsuiteWebviewContent(context, panel);
 
       panel.webview.onDidReceiveMessage((message) => {
         if (message.command === "submit") {
@@ -779,11 +778,11 @@ function configureExtension(context: vscode.ExtensionContext) {
   context.subscriptions.push(addTestsuiteToCompiler);
 
   // Webview HTML content.
-  function getTestsuiteWebviewContent(
+  async function getTestsuiteWebviewContent(
     context: vscode.ExtensionContext,
     panel: vscode.WebviewPanel
-  ): string {
-    const base = path.join(context.extensionPath, "src", "manage", "webviews");
+  ): Promise<string> {
+    const base = resolveWebviewBase(context);
 
     // on-disk locations
     const cssOnDisk = vscode.Uri.file(
@@ -1182,22 +1181,23 @@ async function installPreActivationEventHandlers(
   const importEnviroToProject = vscode.commands.registerCommand(
     "vectorcastTestExplorer.importEnviroToProject",
     async (_args: vscode.Uri, argList: vscode.Uri[]) => {
+      const manageWebviewSrcDir = await resolveWebviewBase(context);
       const panel = vscode.window.createWebviewPanel(
         "importEnviroToProject",
         "Import Environment to Project",
         vscode.ViewColumn.Active,
         {
           enableScripts: true,
           retainContextWhenHidden: true,
-          localResourceRoots: [
-            vscode.Uri.file(
-              path.join(context.extensionPath, "src", "manage", "webviews")
-            ),
-          ],
+          localResourceRoots: [vscode.Uri.file(manageWebviewSrcDir)],
         }
       );
 
-      panel.webview.html = getImportEnvWebviewContent(context, panel, argList);
+      panel.webview.html = await getImportEnvWebviewContent(
+        context,
+        panel,
+        argList
+      );
 
       panel.webview.onDidReceiveMessage(
         async (message) => {
@@ -1247,23 +1247,20 @@ async function installPreActivationEventHandlers(
   const addEnviroToProject = vscode.commands.registerCommand(
     "vectorcastTestExplorer.addEnviroToProject",
     async (_projectNode: any) => {
+      const manageWebviewSrcDir = resolveWebviewBase(context);
       const panel = vscode.window.createWebviewPanel(
         "addEnviroToProject",
         "Add Environment To Project",
         vscode.ViewColumn.Active,
         {
           enableScripts: true,
           retainContextWhenHidden: true,
-          localResourceRoots: [
-            vscode.Uri.file(
-              path.join(context.extensionPath, "src", "manage", "webviews")
-            ),
-          ],
+          localResourceRoots: [vscode.Uri.file(manageWebviewSrcDir)],
         }
       );
 
       // no initial env files
-      panel.webview.html = getImportEnvWebviewContent(context, panel, []);
+      panel.webview.html = await getImportEnvWebviewContent(context, panel, []);
 
       panel.webview.onDidReceiveMessage(
         async (message) => {
@@ -1330,12 +1327,12 @@ async function installPreActivationEventHandlers(
    *
    * The label "Source Files" is replaced with "Env Files" in this version.
    */
-  function getImportEnvWebviewContent(
+  async function getImportEnvWebviewContent(
     context: vscode.ExtensionContext,
     panel: vscode.WebviewPanel,
     argList: vscode.Uri[]
-  ): string {
-    const base = path.join(context.extensionPath, "src", "manage", "webviews");
+  ): Promise<string> {
+    const base = resolveWebviewBase(context);
 
     // on-disk resource locations
     const cssOnDisk = vscode.Uri.file(path.join(base, "css", "importEnv.css"));
@@ -1388,22 +1385,23 @@ async function installPreActivationEventHandlers(
   const newEnviroInProjectVCASTCommand = vscode.commands.registerCommand(
     "vectorcastTestExplorer.newEnviroInProjectVCAST",
     async (_args: vscode.Uri, argList: vscode.Uri[]) => {
+      const manageWebviewSrcDir = resolveWebviewBase(context);
       const panel = vscode.window.createWebviewPanel(
         "newEnvProject",
         "Create Environment in Project",
         vscode.ViewColumn.Active,
         {
           enableScripts: true,
           retainContextWhenHidden: true,
-          localResourceRoots: [
-            vscode.Uri.file(
-              path.join(context.extensionPath, "src", "manage", "webviews")
-            ),
-          ],
+          localResourceRoots: [vscode.Uri.file(manageWebviewSrcDir)],
         }
       );
 
-      panel.webview.html = getNewEnvWebviewContent(context, panel, argList);
+      panel.webview.html = await getNewEnvWebviewContent(
+        context,
+        panel,
+        argList
+      );
 
       panel.webview.onDidReceiveMessage(
         async (message) => {
@@ -1436,12 +1434,12 @@ async function installPreActivationEventHandlers(
   );
   context.subscriptions.push(newEnviroInProjectVCASTCommand);
 
-  function getNewEnvWebviewContent(
+  async function getNewEnvWebviewContent(
     context: vscode.ExtensionContext,
     panel: vscode.WebviewPanel,
     argList: vscode.Uri[]
-  ): string {
-    const base = path.join(context.extensionPath, "src", "manage", "webviews");
+  ): Promise<string> {
+    const base = resolveWebviewBase(context);
     const cssOnDisk = vscode.Uri.file(
       path.join(base, "css", "newEnvProject.css")
     );

src/manage/manageSrc/manageUtils.ts

@@ -1,6 +1,9 @@
 import * as vscode from "vscode";
+import * as fs from "fs";
+import * as path from "path";
 
 import { globalController } from "../../testPane";
+import { vectorMessage } from "../../messagePane";
 
 /**
  * Searches the entire globalController for a test item with the specified id.
@@ -63,3 +66,47 @@ export function getNonce(): string {
   }
   return text;
 }
+
+/**
+ * Resolves the on‐disk base directory for our `src/manage/webviews` folder.
+ *
+ * 1. Tries the normal location under the installed extension:
+ *      <extensionPath>/src/manage/webviews
+ * 2. If that doesn’t exist, checks if we're running in the E2E test harness
+ *    under "<...>/tests/internal/e2e/test/extension". If so, strips off
+ *    that suffix and uses the repo root to locate:
+ *      <repoRoot>/src/manage/webviews
+ * 3. If neither exists, throws an error.
+ *
+ * @param context The ExtensionContext, used to read `extensionPath`.
+ * @returns The filesystem path to the `webviews` folder.
+ * @throws If no valid `webviews` folder can be found.
+ */
+export function resolveWebviewBase(context: vscode.ExtensionContext): string {
+  // 1) Normal installed extension layout
+  const normal = path.join(context.extensionPath, "src", "manage", "webviews");
+  if (fs.existsSync(normal)) {
+    return normal;
+  }
+
+  // 2) Fallback for E2E tests under tests/internal/e2e/test/extension
+  const marker = path.join("tests", "internal", "e2e", "test", "extension");
+  const extPath = context.extensionPath;
+  const idx = extPath.indexOf(marker);
+  if (idx !== -1) {
+    const repoRoot = extPath.slice(0, idx);
+    const fallback = path.join(repoRoot, "src", "manage", "webviews");
+    if (fs.existsSync(fallback)) {
+      return fallback;
+    }
+  }
+
+  throw new Error(
+    `Could not resolve webview base directory. Tried:\n` +
+      `  ${normal}\n` +
+      (marker && extPath.indexOf(marker) !== -1
+        ? `  ${path.join(extPath.slice(0, extPath.indexOf(marker)), "src/manage/webviews")}\n`
+        : "") +
+      `Please ensure that 'src/manage/webviews' exists either under the extension path or under the repo root.`
+  );
+}

src/manage/webviews/html/addTestsuite.html

@@ -13,7 +13,7 @@
     <h2>Add Testsuite to Compiler</h2>
     <label for="testsuiteInput">Testsuite Name:</label>
     <input
-      aria-label="testSuiteInput"
+      aria-label="Testsuite Input"
       type="text"
       id="testsuiteInput"
       placeholder="Enter Testsuite Name"

src/manage/webviews/html/newEnvProject.html

@@ -60,7 +60,7 @@ <h2>Create Environment in Project</h2>
         type="button"
         class="primary-button"
         id="btnSubmit"
-        aria-label="OK"
+        aria-label="Import OK"
       >OK</button>
     </div>
   </div>

tests/internal/e2e/test/specs/vcast_manage.test.ts

@@ -234,7 +234,7 @@ describe("vTypeCheck VS Code Extension", () => {
       "Add existing Environment to Project"
     );
     console.log("Insert the path to the env file");
-    await insertStringToInput(testInputManage, "envFileInput");
+    await insertStringToInput(testInputManage, "Environment File Path");
 
     const button = await $(`aria/OK`);
     await button.click();
@@ -421,7 +421,7 @@ describe("vTypeCheck VS Code Extension", () => {
       true,
       "Add Testsuite to Compiler"
     );
-    await insertStringToInput("GreyBox", "testSuiteInput");
+    await insertStringToInput("GreyBox", "Testsuite Input");
 
     const button = await $(`aria/OK`);
     await button.click();
@@ -455,7 +455,6 @@ describe("vTypeCheck VS Code Extension", () => {
     console.log("Checking if Testsuite node is in tree");
     const testsuiteNode = await findTreeNodeAtLevel(2, "GreyBox");
     expect(testsuiteNode).toBeDefined();
-    // Check for VSCODE info message?
   });
 
   it("testing deleting a Testsuite", async () => {
@@ -482,7 +481,6 @@ describe("vTypeCheck VS Code Extension", () => {
     console.log("Checking if Testsuite node is not in Tree");
     const testsuiteNode = await findTreeNodeAtLevel(2, "GreyBox");
     expect(testsuiteNode).toBeUndefined();
-    // Check for VSCODE info message?
   });
 
   it("testing deleting a project Environment", async () => {
@@ -514,7 +512,6 @@ describe("vTypeCheck VS Code Extension", () => {
     console.log("Checking if Env node is in Tree");
     const testsuiteNode = await findTreeNodeAtLevel(3, "BAR");
     expect(testsuiteNode).toBeDefined();
-    // Check for VSCODE info message?
   });
 
   it("testing building a single project environment", async () => {
@@ -553,7 +550,6 @@ describe("vTypeCheck VS Code Extension", () => {
     console.log("Checking if Env node is in Tree");
     const testsuiteNode = await findTreeNodeAtLevel(3, "BAR");
     expect(testsuiteNode).toBeDefined();
-    // Check for VSCODE info message?
   });
 
   it("testing remove environment from testsuite", async () => {
@@ -582,7 +578,53 @@ describe("vTypeCheck VS Code Extension", () => {
     console.log("Checking if Env node is not in Tree");
     const testsuiteNode = await findTreeNodeAtLevel(3, "FREE-ENV");
     expect(testsuiteNode).toBeUndefined();
-    // Check for VSCODE info message?
+  });
+
+  it("testing deleting an environment from project", async () => {
+    await updateTestID();
+    await bottomBar.toggle(true);
+    const outputView = await bottomBar.openOutputView();
+    await outputView.clearText();
+
+    const notificationsCenter = await workbench.openNotificationsCenter();
+    await notificationsCenter.clearAllNotifications();
+    await executeContextMenuAction(
+      3,
+      "QUACK",
+      true,
+      "Delete Environment from Project"
+    );
+
+    const notifications = await $("aria/Notifications");
+    await notifications.click();
+    const vcastNotificationSourceElement = await $(
+      "aria/VectorCAST Test Explorer (Extension)"
+    );
+    const vcastNotification = await vcastNotificationSourceElement.$("..");
+    await (await vcastNotification.$("aria/Delete")).click();
+
+    console.log("Checking for Output logs");
+    await browser.waitUntil(
+      async () =>
+        (await outputView.getText())
+          .toString()
+          .includes(
+            `manage: '-pTest.vcm -eQUACK --delete --force' returned exit code: 0`
+          ),
+      { timeout: TIMEOUT }
+    );
+
+    await browser.waitUntil(
+      async () =>
+        (await outputView.getText())
+          .toString()
+          .includes(`Processing environment data for:`),
+      { timeout: TIMEOUT }
+    );
+
+    console.log("Checking if Env node is not in Tree");
+    const testsuiteNode = await findTreeNodeAtLevel(3, "QUACK");
+    expect(testsuiteNode).toBeUndefined();
   });
 
   it("testing creating an Env from Source Files", async () => {
@@ -620,7 +662,7 @@ describe("vTypeCheck VS Code Extension", () => {
     // Open the webview
     await webview.open();
 
-    const button = await $(`aria/importOk`);
+    const button = await $(`aria/Import OK`);
     await button.click();
 
     console.log("Checking for Output logs");