Skip to content

fix(test.ui): open the view menu before searching DynamicViewMenu items #1557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joaodinissf merged 1 commit into from
Sep 30, 2026
Merged

fix(test.ui): open the view menu before searching DynamicViewMenu items #1557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions ...valoq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/util/DynamicViewMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.ui.IViewReference;
import org.eclipse.ui.IViewSite;


Expand All @@ -31,8 +31,8 @@
*/
public class DynamicViewMenu {

/** The reference to the view. */
private final IViewReference viewReference;
/** The view whose menu is searched. */
private final SWTBotView view;

/**
* Creates an instance of {@link DynamicViewMenu}.
Expand All @@ -52,7 +52,7 @@ public static DynamicViewMenu create(final SWTWorkbenchBot bot) {
* the bot to work with
*/
public DynamicViewMenu(final SWTWorkbenchBot bot) {
this.viewReference = bot.activeView().getViewReference();
this.view = bot.activeView();
}

/**
Expand All @@ -62,30 +62,33 @@ public DynamicViewMenu(final SWTWorkbenchBot bot) {
* the menu path
* @throws IllegalStateException
* if the menu manager is not a MenuManager
* @throws WidgetNotFoundException
* if the menu item cannot be found
*/
public void click(final String... menuPath) {
final IViewSite viewSite = (IViewSite) viewReference.getPart(false).getSite();
final IViewSite viewSite = (IViewSite) view.getViewReference().getPart(false).getSite();
final IMenuManager m = viewSite.getActionBars().getMenuManager();

if (!(m instanceof MenuManager)) {
throw new IllegalStateException("cannot work with " + m); //$NON-NLS-1$
}

// Since Eclipse 4.41 the Markers views only get their menu contributions once the view menu is opened.
view.viewMenu();

MenuItem theItem = UIThreadRunnable.syncExec(() -> {
MenuManager mgr = (MenuManager) m;
mgr.createMenuBar((Decorations) viewSite.getShell());
m.updateAll(true);
MenuItem[] initialItems = ((MenuManager) m).getMenu().getItems();
MenuItem item = findItem(initialItems, menuPath);

if (item == null || !item.getText().equals(menuPath[menuPath.length - 1])) {
throw new WidgetNotFoundException("Could not find menu " + Arrays.toString(menuPath)); //$NON-NLS-1$
}

return item;

return item != null && item.getText().equals(menuPath[menuPath.length - 1]) ? item : null;
});

// thrown outside syncExec, which would otherwise mask it as an IndexOutOfBoundsException
if (theItem == null) {
throw new WidgetNotFoundException("Could not find menu " + Arrays.toString(menuPath)); //$NON-NLS-1$
}
new SWTBotMenu(theItem).click();
}

Expand Down