Author: vpakan(a)redhat.com Date: 2010-12-03 11:50:07 -0500 (Fri, 03 Dec 2010) New Revision: 27152 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 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/wizard/NewXHTMLPageWizardTest.java Log: Fixes for JBDS 4.0.0.Beta2 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2010-12-03 16:48:50 UTC (rev 27151) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2010-12-03 16:50:07 UTC (rev 27152) @@ -91,6 +91,8 @@ "", SWTBotWebBrowser.ZOOM_MENU_LABEL, "", + SWTBotWebBrowser.PREFERENCES_MENU_LABEL, + "", SWTBotWebBrowser.PASTE_MENU_LABEL}); } @@ -111,9 +113,12 @@ SWTBotWebBrowser.INSERT_AFTER_MENU_LABEL, SWTBotWebBrowser.INSERT_INTO_MENU_LABEL, SWTBotWebBrowser.REPLACE_WITH_MENU_LABEL, + SWTBotWebBrowser.EXTERNALIZE_STRING_MENU_LABEL, "", SWTBotWebBrowser.ZOOM_MENU_LABEL, "", + SWTBotWebBrowser.PREFERENCES_MENU_LABEL, + "", SWTBotWebBrowser.CUT_MENU_LABEL, SWTBotWebBrowser.COPY_MENU_LABEL, SWTBotWebBrowser.PASTE_MENU_LABEL}); @@ -135,9 +140,12 @@ SWTBotWebBrowser.INSERT_INTO_MENU_LABEL, SWTBotWebBrowser.REPLACE_WITH_MENU_LABEL, SWTBotWebBrowser.STRIP_TAG_MENU_LABEL, + SWTBotWebBrowser.EXTERNALIZE_STRING_MENU_LABEL, "", SWTBotWebBrowser.ZOOM_MENU_LABEL, "", + SWTBotWebBrowser.PREFERENCES_MENU_LABEL, + "", SWTBotWebBrowser.CUT_MENU_LABEL, SWTBotWebBrowser.COPY_MENU_LABEL, SWTBotWebBrowser.PASTE_MENU_LABEL}); 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 2010-12-03 16:48:50 UTC (rev 27151) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-12-03 16:50:07 UTC (rev 27152) @@ -87,6 +87,8 @@ public static final String PASTE_MENU_LABEL = "Paste"; public static final String SETUP_VISUAL_TEMPLATE_FOR_MENU_LABEL = "Setup Visual Template for "; public static final String SELECT_THIS_TAG_MENU_LABEL = "Select This Tag"; + public static final String PREFERENCES_MENU_LABEL = "Preferences.."; + public static final String EXTERNALIZE_STRING_MENU_LABEL = "Externalize strings..."; public static final String JSF_MENU_LABEL = "JSF"; public static final String JBOSS_MENU_LABEL = "JBoss"; Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-12-03 16:48:50 UTC (rev 27151) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-12-03 16:50:07 UTC (rev 27152) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.bot.test.wizard; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; @@ -58,6 +59,7 @@ bot.checkBox(IDELabel.NewXHTMLFileDialog.USE_XHTML_TEMPLATE_CHECK_BOX).select(); bot.table().select(IDELabel.NewXHTMLFileDialog.TEMPLATE_FACELET_FORM_XHTML_NAME); bot.button(IDELabel.Button.FINISH).click(); + bot.sleep(Timing.time2S()); assertEquals("Active Editor Title should be" ,"test.xhtml", this.bot.activeEditor().getTitle()); //$NON-NLS-1$ //$NON-NLS-2$ }