Author: vpakan(a)redhat.com Date: 2011-08-30 10:49:41 -0400 (Tue, 30 Aug 2011) New Revision: 34389 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java Log: Changes for MacOS Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-08-30 13:39:13 UTC (rev 34388) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-08-30 14:49:41 UTC (rev 34389) @@ -15,6 +15,7 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; +import java.awt.event.KeyEvent; import java.util.Arrays; import java.util.List; import java.util.Vector; @@ -148,15 +149,18 @@ */ private static void hide(final Menu menu , boolean hideRecursively) { if (menu != null){ - menu.notifyListeners(SWT.Hide, new Event()); + // Hide recursively + if (hideRecursively) { + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_ESCAPE); + } + else{ + menu.notifyListeners(SWT.Hide, new Event()); + } try { - Thread.sleep(50); + Thread.sleep(100); } catch (InterruptedException e) { e.printStackTrace(); - } - if (menu.getParentMenu() != null && hideRecursively) { - hide(menu.getParentMenu(),hideRecursively); - } + } } } /** @@ -629,4 +633,4 @@ return result; } -} +} \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-08-30 13:39:13 UTC (rev 34388) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-08-30 14:49:41 UTC (rev 34389) @@ -45,6 +45,7 @@ import org.jboss.tools.jst.jsp.jspeditor.PalettePageImpl; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.helper.ReflectionsHelper; @@ -644,20 +645,28 @@ getMozillaEventAdapter().handleEvent(domEvent); } }); - bot.sleep(Timing.time2S()); + bot.sleep(Timing.time2S()); // Get Top Menu return UIThreadRunnable.syncExec(new WidgetResult<Menu>() { - public Menu run() { + public Menu run() { Menu result = null; - Composite parent = mozillaEditor.getControl().getParent(); - while (!(parent instanceof Decorations)){ - parent = parent.getParent(); + Object menusHolder = null; + if (SWTJBTExt.isRunningOnMacOs()){ + menusHolder = mozillaEditor.getControl().getDisplay(); } - try { - Menu[] menus = ReflectionsHelper.getPrivateFieldValue(Decorations.class, - "menus", - parent, - Menu[].class); + else{ + Composite parent = (Composite)mozillaEditor.getControl().getParent(); + while (!(parent instanceof Decorations)){ + parent = parent.getParent(); + } + menusHolder = parent; + } + + try { + Menu[] menus = ReflectionsHelper.getPrivateFieldValue(menusHolder.getClass(), + "menus", + menusHolder, + Menu[].class); if (menus != null){ MenuItem topMenuItem = null; int index = menus.length - 1;