Updates 1

Author: mezarin

tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/MagicWidgetFinder.java

@@ -44,6 +44,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Item;
 import org.eclipse.swt.widgets.Label;
@@ -222,18 +223,32 @@ public static void context(Object widget, Object... args) {
 
         Throwable thrown = null;
         SWTBotMenu currMenu = null;
+        boolean firstAttempt = true;
         while (System.nanoTime() < expireTimeInNanos && currMenu == null) {
 
             AbstractSWTBot<?> obj = null;
             if (widget instanceof TreeItem) {
-
                 obj = new SWTBotTreeItem((TreeItem) widget);
             } else if (widget instanceof TableItem) {
                 obj = new SWTBotTableItem((TableItem) widget);
             } else {
                 throw new RuntimeException("Unable to identify context object type: " + widget.getClass().getName());
             }
 
+            if (!firstAttempt) {
+                // On retry: dismiss any stale context menu that may still be open, then
+                // re-select/focus the widget so Eclipse can repopulate dynamic contributions
+                // (e.g. "Run As" / "Debug As") before we open the menu again.
+                dismissOpenContextMenu();
+                if (widget instanceof TreeItem) {
+                    SWTBotTreeItem ti = (SWTBotTreeItem) obj;
+                    ti.select();
+                    ti.setFocus();
+                }
+                pause(2000);
+            }
+            firstAttempt = false;
+
             try {
                 for (int x = 0; x < args.length; x++) {
                     if (x == 0) {
@@ -252,8 +267,7 @@ public static void context(Object widget, Object... args) {
             } catch (Throwable t) {
                 thrown = t;
                 currMenu = null;
-                System.out.println("waiting for context menu.");
-                pause(2000);
+                System.out.println("waiting for context menu: " + t.getMessage());
             }
         } // end-while
 
@@ -266,6 +280,36 @@ public static void context(Object widget, Object... args) {
         }
     }
 
+    /**
+     * Dismisses any currently open context menu by sending an Escape key on the
+     * active display.
+     */
+    private static void dismissOpenContextMenu() {
+        try {
+            Display.getDefault().syncExec(new Runnable() {
+                @Override
+                public void run() {
+                    // Post an Escape key event to close any open popup/context menu.
+                    Event escDown = new Event();
+                    escDown.type = SWT.KeyDown;
+                    escDown.keyCode = SWT.ESC;
+                    Display.getDefault().post(escDown);
+
+                    Event escUp = new Event();
+                    escUp.type = SWT.KeyUp;
+                    escUp.keyCode = SWT.ESC;
+                    Display.getDefault().post(escUp);
+                }
+            });
+            // Give the UI thread time to process the Escape and close the menu.
+            pause(300);
+        } catch (Throwable t) {
+            // Non-fatal: if we cannot dismiss the menu, the next contextMenu() call
+            // will still attempt to open a fresh one.
+            System.out.println("Could not dismiss open context menu: " + t.getMessage());
+        }
+    }
+
     public static Object get(Object w) {
         return get(w, Option.getGlobalOptions());
 

tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/SWTBotPluginOperations.java

@@ -139,11 +139,14 @@ public static SWTBotMenu getDebuggerConnectMenuForDebugObject(Object debugObject
 
         SWTBotTreeItem obj = new SWTBotTreeItem((TreeItem) debugObject);
 
-        // Ensure the tree item is properly selected and focused before accessing context menu.
-        // This is critical for headless CI environments where context menus can hang.
+        // Select and focus the item so the workbench selection service has it as the
+        // active selection. LibertyDebugReconnectHandler.isEnabled() reads the selection
+        // service, not the object passed here, so the selection must be current before
+        // the context menu is opened.
+        // Note: do NOT wait for isEnabled() here — callers may legitimately be checking
+        // that the menu is *disabled*, and waiting for enabled would mask that state.
         obj.select();
         obj.setFocus();
-        SWTBotTestCondition.waitFor(obj::isEnabled, SWTBotTestCondition.MIN_WAIT_MS);
 
         return obj.contextMenu("Connect Liberty Debugger");
     }
@@ -216,8 +219,8 @@ public static void terminateLaunch() {
                 SWTBotTestCondition.waitFor(() -> !isShellVisible("Terminate and Remove"), SWTBotTestCondition.MIN_WAIT_MS);
             }
 
-            // Validate that the search object is gone.
-            boolean stillPresent = isObjectInDebugView("[Liberty]");
+            boolean stillPresent = !SWTBotTestCondition.waitFor(
+                                                                 () -> !isObjectInDebugView(searchObjectName), SWTBotTestCondition.MIN_WAIT_MS);
             org.junit.jupiter.api.Assertions.assertFalse(stillPresent,
                                                          "Liberty launch was not removed from the Debug view after termination.");
         } else {
@@ -976,6 +979,8 @@ public static Object getAppInPackageExplorerTree(String appName) {
         // Wait until the tree item is enabled before returning.
         SWTBotTreeItem botItem = new SWTBotTreeItem((TreeItem) project);
         SWTBotTestCondition.waitFor(botItem::isEnabled, SWTBotTestCondition.SHORT_WAIT_MS);
+        botItem.select();
+        botItem.setFocus();
 
         return project;
     }

tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/SWTBotTestCondition.java

@@ -40,7 +40,7 @@ public class SWTBotTestCondition {
     public static final int SHORT_WAIT_MS = 15000;
     public static final int MID_WAIT_MS = 30000;
     public static final int LARGE_WAIT_MS = 60000;
-    public static final int SERVER_WAIT_MS = 120000;
+    public static final int SERVER_WAIT_MS = 180000;
 
     /**
      * Polls the input condition every {@value #POLL_INTERVAL_MS} ms until it returns