sidebar polling, workspace close, and timeouts

src/test/Gradle9TestDevModeActions.ts

@@ -187,7 +187,7 @@ describe('Gradle 9-specific devmode action tests', () => {
      * Closing the workspace ensures the next test file starts with a clean slate.
      */
     after(async function() {
-        this.timeout(10000);
+        this.timeout(45000);
         await utils.closeWorkspace();
     });
 });

src/test/GradleTestDevModeActions.ts

@@ -183,7 +183,7 @@ describe('Gradle-specific devmode action tests', () => {
      * Closing the workspace ensures the next test file starts with a clean slate.
      */
     after(async function() {
-        this.timeout(10000);
+        this.timeout(60000);
         await utils.closeWorkspace();
     });
 });

src/test/MavenTestDevModeActions.ts

@@ -200,7 +200,7 @@ describe('Maven-specific devmode action tests', () => {
      * The following after hook closes the workspace so the next test file starts with a clean slate.
      */
     after(async function() {
-        this.timeout(10000);
+        this.timeout(45000);
         await utils.closeWorkspace();
     });
 });

src/test/resources/settings.json

@@ -4,6 +4,7 @@
   "files.simpleDialog.enable": true,
   "git.autoRepositoryDetection": false,
   "github.copilot.enable": false,
+  "security.workspace.trust.enabled": false,
   "terminal.integrated.sendKeybindingsToShell": true,
   "typescript.updateImportsOnFileMove.enabled": "always",
   "window.dialogStyle": "custom",

src/test/shared/configFileTestSuite.ts

@@ -66,7 +66,7 @@ export function runConfigFileTestSuite(config: ConfigFileTestConfig): void {
         let wait: any;
 
         before(async function () {
-            this.timeout(60000);
+            this.timeout(120000);
             logger.info(`Setting up Maven ${config.tabTitle} tests`);
 
             await VSBrowser.instance.openResources(config.getProjectPath());
@@ -89,7 +89,7 @@ export function runConfigFileTestSuite(config: ConfigFileTestConfig): void {
         });
 
         after(async function () {
-            this.timeout(10000);
+            this.timeout(45000);
             try {
                 if (editor) {
                     const currentText = await editor.getEditor().getText();
@@ -111,17 +111,18 @@ export function runConfigFileTestSuite(config: ConfigFileTestConfig): void {
             } catch (error) {
                 logger.error('Failed to close editors in after hook', error);
             }
+            await utils.closeWorkspace();
             utils.copyScreenshotsToProjectFolder('maven');
         });
 
         it('Liberty Language Server should initialize', async function () {
-            this.timeout(60000);
+            this.timeout(300000);
             logger.testStart('Liberty Language Server should initialize');
             try {
                 await utils.waitForLanguageServerInit(
                     'Language Support for Liberty',
                     'Initialized Liberty Language server',
-                    60
+                    240
                 );
                 logger.testComplete('Liberty Language Server initialized successfully');
             } catch (error) {

src/test/shared/devModeTestSuite.ts

@@ -24,16 +24,33 @@ export function runDevModeTestSuite(config: DevModeConfig): void {
     describe(`Devmode action tests for ${config.buildTool} Project`, () => {
 
         before(async function() {
-            this.timeout(30000);
+            this.timeout(480000);
 
             await VSBrowser.instance.openResources(config.getProjectPath());
             await VSBrowser.instance.waitForWorkbench();
-
+
+            // Wait for the Liberty LS to initialize before any test runs.
+            // registerTreeDataProvider is only called after startLangServer
+            // resolves — without this, waitForDashboardToLoad polls an empty
+            // tree for minutes on cold mac-previous runners.
+            // Non-fatal: if the LS doesn't init in time we proceed anyway and
+            // let waitForDashboardToLoad handle the remaining wait — this avoids
+            // skipping the entire suite when the before() hook itself times out.
+            try {
+                await utils.waitForLanguageServerInit(
+                    'Language Support for Liberty',
+                    'Initialized Liberty Language server',
+                    420
+                );
+            } catch {
+                logger.info('Liberty LS did not init within before() budget — proceeding anyway');
+            }
+
             dashboard = new DashboardPage();
         });
 
         afterEach(async function() {
-        this.timeout(10000); // Increase timeout for cleanup operations
+        this.timeout(30000);
         // Close any open editors after each test
         if (this.currentTest?.state === 'failed') {
             await VSBrowser.instance.driver.takeScreenshot();
@@ -73,16 +90,20 @@ export function runDevModeTestSuite(config: DevModeConfig): void {
             logger.testStart('Liberty Tools shows items - Maven');
             try {
                 logger.step(1, 'Getting dashboard section');
-                const section = await dashboard.getSection(); 
+                const section = await dashboard.getSection();
                 logger.stepSuccess(1, 'Dashboard section retrieved');
 
                 logger.step(2, 'Waiting for Liberty Tools to load');
                 await utils.waitForDashboardToLoad(section);
                 logger.stepSuccess(2, 'Liberty Tools loaded successfully');
 
+                // waitForDashboardToLoad already confirmed items exist on a fresh
+                // section reference.  Re-fetch here so getVisibleItems() doesn't
+                // operate on the original stale reference from before the wait.
                 logger.step(3, 'Getting visible items from section');
+                const freshSection = await dashboard.getSection();
                 const menu = await utils.waitForCondition(async () => {
-                    const items = await section.getVisibleItems();
+                    const items = await freshSection.getVisibleItems();
                     if (items && items.length > 0) {
                         return items;
                     }
@@ -92,7 +113,7 @@ export function runDevModeTestSuite(config: DevModeConfig): void {
                 expect(menu).not.empty;
 
                 logger.step(4, `Finding Maven project item: ${config.projectConstant}`);
-                const item = await dashboard.getProjectItem(config.projectConstant); 
+                const item = await dashboard.getProjectItem(config.projectConstant);
                 logger.stepSuccess(4, 'Maven project item found');
                 expect(item).not.undefined;
 
@@ -101,7 +122,7 @@ export function runDevModeTestSuite(config: DevModeConfig): void {
                 logger.testFailed(`Liberty Tools shows items - ${config.buildTool}`, error);
                 throw error;
             }
-        }).timeout(275000);
+        }).timeout(480000);
 
         it(`Start ${config.buildTool} project from Liberty Tools`, async () => {
                 logger.testStart('Start Maven project from Liberty Tools');
@@ -293,9 +314,17 @@ export function runDevModeTestSuite(config: DevModeConfig): void {
             }).timeout(350000);
 
             /**
-             * The following after hook copies the screenshot from the temporary folder in which it is saved to a known permanent location in the project folder.
+             * The following after hook restores the Explorer view (in case the
+             * attach-debugger test left VS Code in the Debug perspective — on mac
+             * Previous this does not auto-restore) then copies screenshots.
              */
-            after(() => {
+            after(async function() {
+                this.timeout(30000);
+                try {
+                    const { Workbench } = require('vscode-extension-tester');
+                    await new Workbench().executeCommand('workbench.view.explorer');
+                    await utils.getWaitHelper().sleep(1000);
+                } catch { /* non-fatal */ }
                 utils.copyScreenshotsToProjectFolder(config.buildTool);
             });
 

src/test/shared/hoverTestSuite.ts

@@ -26,7 +26,7 @@ export function runHoverTestSuite(config: HoverConfig){
         let serverXml: EditorPage;
 
         before(async function() {
-            this.timeout(60000);
+            this.timeout(120000);
 
             logger.info(`Setting up ${config.buildTool === 'maven' ? 'Maven' : 'Gradle'} LSP Hover tests`);
 
@@ -59,27 +59,26 @@ export function runHoverTestSuite(config: HoverConfig){
         });
 
         after(async function() {
-            this.timeout(10000); // Increase timeout for cleanup operations
-            // Close editor after all tests complete
+            this.timeout(45000);
             try {
                 await new EditorView().closeAllEditors();
                 logger.info('Closed all editors after test suite');
             } catch (error) {
                 logger.error('Failed to close editors in after hook', error);
             }
-
+            await utils.closeWorkspace();
             utils.copyScreenshotsToProjectFolder(config.buildTool);
         });
 
         it('Liberty Language Server should initialize', async function() {
-            this.timeout(60000);
+            this.timeout(300000);
             logger.testStart('Liberty Language Server should initialize');
 
             try {
                 await utils.waitForLanguageServerInit(
                     'Language Support for Liberty',
                     'Initialized Liberty Language server',
-                    60
+                    240
                 );
                 logger.testComplete('Liberty Language Server initialized successfully');
             } catch (error) {
@@ -139,14 +138,14 @@ export function runHoverTestSuite(config: HoverConfig){
             });
 
             it('LSP4Jakarta Language Server should initialize', async function() {
-                this.timeout(60000);
+                this.timeout(300000);
                 logger.testStart('LSP4Jakarta Language Server should initialize');
 
                 try {
                     await utils.waitForLanguageServerInit(
                         'Language Support for Jakarta EE',
                         'Initializing Jakarta EE server',
-                        60
+                        240
                     );
                     logger.testComplete('LSP4Jakarta Language Server initialized successfully');
                 } catch (error) {

src/test/shared/restSnippetSuite.ts

@@ -34,7 +34,7 @@ export function runRestSnippetSuite(config: RestSnippetConfig) {
                     );
 
         before(async function() {
-            this.timeout(60000);
+            this.timeout(120000);
             logger.info('Setting up rest_class snippet test');
 
             driver = VSBrowser.instance.driver;
@@ -58,45 +58,42 @@ export function runRestSnippetSuite(config: RestSnippetConfig) {
         });
 
         after(async function() {
-            this.timeout(15000);
+            this.timeout(60000);
             try {
                 if (editorPage) {
-                    // Select all text first, then clear
                     const currentText = await editorPage.getEditor().getText();
                     try {
                         await editorPage.getEditor().selectText(currentText);
                         await wait.sleep(300);
                     } catch (selectError) {
                         // selectText may fail but setText still works
                     }
-
-                    await editorUtils.clearEditor(editorPage.getEditor())
+                    await editorUtils.clearEditor(editorPage.getEditor());
                     logger.info('Reset TestRest.java to empty after test');
                 }
             } catch (error) {
                 logger.error('Failed to reset TestRest.java', error);
             }
-
             try {
                 await new EditorView().closeAllEditors();
                 await wait.sleep(500);
                 logger.info('Closed all editors after test suite');
             } catch (error) {
                 logger.error('Failed to close editors in after hook', error);
             }
-
+            await utils.closeWorkspace();
             utils.copyScreenshotsToProjectFolder(config.buildTool);
         });
 
         it('LSP4Jakarta Language Server should initialize', async function() {
-                this.timeout(60000);
+                this.timeout(300000);
                 logger.testStart('LSP4Jakarta Language Server should initialize');
 
                 try {
                     await utils.waitForLanguageServerInit(
                         'Language Support for Jakarta EE',
                         'Initializing Jakarta EE server',
-                        60
+                        240
                     );
                     logger.testComplete('LSP4Jakarta Language Server initialized successfully');
                 } catch (error) {