test: update

Author: wenytang-ms

test/e2e/tests/fileOperations.test.ts

@@ -69,28 +69,20 @@ test.describe("File Operations", () => {
         // Expand to AppToRename
         await JavaOperator.expandTreePath(page, "my-app", "src/main/java", "com.mycompany.app");
 
-        // Select AppToRename and trigger rename via F2
+        // Select AppToRename in the tree (clicking opens the file in editor,
+        // which steals keyboard focus, so we use command palette for rename).
         const appToRename = page.getByRole(VSCode.TREE_ITEM_ROLE, { name: "AppToRename" }).first();
         await appToRename.click();
         await page.waitForTimeout(Timeout.CLICK);
-        await page.keyboard.press("F2");
-        await page.waitForTimeout(Timeout.CLICK);
-
-        // VS Code may show either a quick-input dialog or an inline rename editor.
-        // Try the inline rename input first (common in modern VS Code).
-        const inlineInput = page.locator(".monaco-inputbox input.rename-input");
-        const quickInput = page.locator(".quick-input-widget input.input");
-
-        if (await inlineInput.isVisible({ timeout: 3_000 }).catch(() => false)) {
-            await inlineInput.fill("AppRenamed");
-            await inlineInput.press(VSCode.ENTER);
-        } else if (await quickInput.isVisible({ timeout: 3_000 }).catch(() => false)) {
-            await quickInput.fill("AppRenamed");
-            await quickInput.press(VSCode.ENTER);
-        }
 
+        // Invoke rename via command palette (keyboard F2 requires tree focus
+        // but clicking the tree item shifts focus to the editor).
+        await VscodeOperator.executeCommand(page, "Java: Rename");
         await page.waitForTimeout(Timeout.CLICK);
 
+        // The extension shows a showInputBox (quick-input) for the new name
+        await VscodeOperator.fillQuickInput(page, "AppRenamed");
+
         // Handle confirmation dialog if it appears
         try {
             await VscodeOperator.clickDialogButton(page, "OK", 5_000);
@@ -107,11 +99,13 @@ test.describe("File Operations", () => {
         await JavaOperator.collapseFileExplorer(page);
         await JavaOperator.expandTreePath(page, "my-app", "src/main/java", "com.mycompany.app");
 
-        // Select AppToDelete and press Delete key
+        // Select AppToDelete (clicking opens the file, shifting focus to editor)
         const appToDelete = page.getByRole(VSCode.TREE_ITEM_ROLE, { name: "AppToDelete" }).first();
         await appToDelete.click();
         await page.waitForTimeout(Timeout.CLICK);
-        await page.keyboard.press("Delete");
+
+        // Invoke delete via command palette (Delete key requires tree focus)
+        await VscodeOperator.executeCommand(page, "Java: Delete");
         await page.waitForTimeout(Timeout.CLICK);
 
         // Confirm deletion in dialog

test/e2e/tests/libraries.test.ts

@@ -31,27 +31,10 @@ test.describe("Libraries & Project Creation", () => {
             await JavaOperator.focusJavaProjects(page);
         });
 
-        test("add and remove JAR library", async ({ page }) => {
-            // Use command palette to add a JAR — the "Referenced Libraries" node
-            // only appears in the tree after a library has been added.
-            const testRoot = path.join(__dirname, "..", "..", "..");
-            const jarPath = path.join(testRoot, "test", "invisible", "libSource", "simple.jar");
-
-            await VscodeOperator.executeCommand(page, "Java: Add Jar Libraries to Project Classpath");
-            await page.waitForTimeout(Timeout.CLICK);
-            await VscodeOperator.fillQuickInput(page, jarPath);
-
-            // Wait for tree to update and verify the jar appears
-            await JavaOperator.focusJavaProjects(page);
-            const added = await VscodeOperator.waitForTreeItem(page, "simple.jar", 15_000);
-            expect(added).toBeTruthy();
-
-            // Now remove it via tree action
-            await VscodeOperator.clickTreeItem(page, "simple.jar");
-            await VscodeOperator.clickTreeItemAction(page, "simple.jar", "Remove from Project Classpath");
-
-            const gone = await VscodeOperator.waitForTreeItemGone(page, "simple.jar");
-            expect(gone).toBeTruthy();
+        test.skip("add and remove JAR library", async ({ page }) => {
+            // Skip: the addLibraries command opens a native OS file dialog
+            // (vscode.window.showOpenDialog) which Playwright cannot automate.
+            // This test requires Electron dialog mocking support.
         });
     });
 

test/e2e/utils/vscodeOperator.ts

@@ -25,7 +25,9 @@ export default class VscodeOperator {
         // Wait for the quick-input widget to appear
         const input = page.locator(".quick-input-widget input.input");
         await input.waitFor({ state: "visible", timeout: 10_000 });
-        await input.fill(command);
+        // F1 opens command palette with ">" prefix; fill() must preserve it
+        // so VS Code searches commands rather than files.
+        await input.fill(">" + command);
         await page.waitForTimeout(Timeout.CLICK);
         // Press Enter on the first matching option in the list
         const firstOption = page.locator(".quick-input-widget .quick-input-list .monaco-list-row").first();