Author: vpakan(a)redhat.com Date: 2010-12-14 10:25:42 -0500 (Tue, 14 Dec 2010) New Revision: 27449 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.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/ExternalizeStringsDialogTest.java Log: Fixes for JBDS 4.0.0.Beta2 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2010-12-14 15:25:42 UTC (rev 27449) @@ -12,9 +12,11 @@ Hello Demo Application </SPAN> </H1> -<DIV class="__any__tag__caption" style="-moz-user-modify: read-only;" title="tagunknown" > +<DIV style="-moz-user-modify: read-only;" title="tagunknown" > +<DIV class="__any__tag__caption" style="" title="tagunknown" > tagunknown -<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" > +</DIV> +<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" > </BR> </DIV> <UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" > @@ -41,6 +43,6 @@ </TABLE> </DIV> </DIV> -<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.M2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201008232021N-H413-M2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" > +<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012070137R-H33-Beta2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" > </IMG> </BODY> \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2010-12-14 15:25:42 UTC (rev 27449) @@ -12,9 +12,11 @@ Hello Demo Application </SPAN> </H1> -<DIV class="__any__tag__caption" style="border: 1px solid green; -moz-user-modify: read-only;" title="tagunknown" > +<DIV style="border: 1px solid green; -moz-user-modify: read-only;" title="tagunknown" > +<DIV class="__any__tag__caption" style="" title="tagunknown" > tagunknown -<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" > +</DIV> +<BR vpe:pseudo-element="yes" style="font-style: italic; color: green; -moz-user-modify: read-only;" > </BR> </DIV> <UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" > @@ -41,4 +43,6 @@ </TABLE> </DIV> </DIV> +<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio4.0.0.Beta2/studio/eclipse/plugins/org.jboss.tools.vpe_3.2.0.v201012070137R-H33-Beta2/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" > +</IMG> </BODY> \ 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/editor/InsertActionsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -158,7 +158,7 @@ botExt.sleep(Timing.time3S()); nsIDOMNode node = webBrowser.getDomNodeByTagName(nodeText, 0); webBrowser.selectDomNode(node, 0); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); return node; Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -53,16 +53,16 @@ SWTBotWebBrowser swtBotWebBrowser = new SWTBotWebBrowser(TEST_PAGE, botExt); nsIDOMNode node = swtBotWebBrowser.getDomNodeByTagName("INPUT", 1); swtBotWebBrowser.selectDomNode(node, 0); - botExt.sleep(Timing.time1S()); - + botExt.sleep(Timing.time2S()); swtBotWebBrowser.clickContextMenu(node, SWTBotWebBrowser.INSERT_AFTER_MENU_LABEL, SWTBotWebBrowser.JSF_MENU_LABEL, SWTBotWebBrowser.HTML_MENU_LABEL, SWTBotWebBrowser.H_OUTPUT_TEXT_TAG_MENU_LABEL); - + botExt.sleep(Timing.time2S()); final SWTBotEclipseEditor jspTextEditor = botExt.editorByTitle(TEST_PAGE) .toTextEditor(); jspTextEditor.save(); + botExt.sleep(Timing.time2S()); // Check if tag h:outputText was properly added String editorText = jspTextEditor.getText(); assertTrue("File " + TEST_PAGE Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -76,7 +76,7 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ editor.setText(editorText); editor.save(); - bot.sleep(Timing.time2S()); + bot.sleep(Timing.time3S()); } super.tearDown(); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -55,8 +55,10 @@ packageExplorer.openFile(JBT_TEST_PROJECT_NAME,IDELabel.JsfProjectTree.WEB_CONTENT,XhtmlFilePerformanceTest.TEST_PAGE_NAME); final SWTBotEclipseEditor xhtmlTextEditor = bot.editorByTitle(XhtmlFilePerformanceTest.TEST_PAGE_NAME).toTextEditor(); String insertText = "!!!123 Test Title Inserted 321!!!"; + String origText = xhtmlTextEditor.getText(); xhtmlTextEditor.insertText(9, 5, "<h1>" + insertText + "<h1/>"); xhtmlTextEditor.save(); + bot.sleep(Timing.time2S()); bot.toolbarButtonWithTooltip(IDELabel.Button.REFRESH).click(); SWTBotEditorExt multiPageEditor = swtBotExt.swtBotEditorExtByTitle(XhtmlFilePerformanceTest.TEST_PAGE_NAME); multiPageEditor.selectPage(IDELabel.VisualPageEditor.PREVIEW_TAB_LABEL); @@ -69,9 +71,13 @@ // Ignore } multiPageEditor.selectPage(IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL); - assertTrue("Web Browser has to contain text " + insertText + " but it doesn't.",swtBotWebBrowserExt.containsNodeWithValue(swtBotWebBrowserExt.getNsIDOMDocument(), insertText)); + boolean isOK = swtBotWebBrowserExt.containsNodeWithValue(swtBotWebBrowserExt.getNsIDOMDocument(), insertText); + xhtmlTextEditor.setText(origText); + xhtmlTextEditor.save(); xhtmlTextEditor.close(); + assertTrue("Web Browser has to contain text " + insertText + " but it doesn't.",isOK); + } @Override Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -114,7 +114,7 @@ optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot(); optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.SUBSTITUTED_EL_EXPRESSIONS_TAB).activate(); assertTrue ("EL Substitution for EL Name " + EditingELValueTest.EL_VARIABLE_NAME + " is not defined.", - SWTEclipseExt.isItemInTableColumn(optionsDialogBot.table(), EditingELValueTest.EL_VARIABLE_NAME, 0)); + SWTEclipseExt.isItemInTableColumn(optionsDialogBot.table(), EditingELValueTest.EL_VARIABLE_NAME, 1)); optionsDialogBot.button(IDELabel.Button.OK).click(); } @@ -131,16 +131,18 @@ protected void tearDown() throws Exception { if (jspGreetingPageEditor != null){ + jspGreetingPageEditor.show(); + deleteAllELSubstitutions(); jspGreetingPageEditor.setText(greetingPageOrigText); jspGreetingPageEditor.saveAndClose(); } if (jspInputNamePageEditor != null){ + jspInputNamePageEditor.show(); + deleteAllELSubstitutions(); jspInputNamePageEditor.setText(inputNamePageOrigText); jspInputNamePageEditor.saveAndClose(); } - deleteAllELSubstitutions(); - super.tearDown(); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -2,6 +2,7 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.TimeoutException; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -31,11 +32,13 @@ bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); //Check if the tab changed - WidgetNotFoundException exception = null; + Exception exception = null; try { bot.toolbarButtonWithTooltip("Refresh").click(); //$NON-NLS-1$ - } catch (WidgetNotFoundException e) { - exception = e; + } catch (WidgetNotFoundException wnfe) { + exception = wnfe; + } catch (TimeoutException te){ + exception = te; } assertNotNull(exception); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -37,6 +37,15 @@ openPage(); openPalette(); + hideShowPaletteGroup(); + // Put palette changes back + hideShowPaletteGroup(); + + } + /** + * Hide or Show Pallete Group dependent on current Palette Group visibility + */ + private void hideShowPaletteGroup(){ bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.SHOW_HIDE_TOOL_ITEM).click(); SWTBot dialogBot = bot.shell(IDELabel.Shell.SHOW_HIDE_DRAWERS).activate().bot(); SWTBotTreeItem tiTestPaletteGroup = dialogBot.tree().getTreeItem(ManagePaletteGroupsTest.TEST_PALETTE_TREE_GROUP_LABEL); @@ -46,7 +55,7 @@ dialogBot.button("Ok").click(); assertTrue("Palette Group " + ManagePaletteGroupsTest.TEST_PALETTE_GROUP_LABEL + " has to be hidden but is visible.", - !SWTBotWebBrowser.paletteContainsPaletteEntry(botExt, ManagePaletteGroupsTest.TEST_PALETTE_GROUP_LABEL)); + !SWTBotWebBrowser.paletteContainsRootPaletteCotnainer(botExt, ManagePaletteGroupsTest.TEST_PALETTE_GROUP_LABEL)); } else{ // Check Palette Group showing @@ -54,10 +63,8 @@ dialogBot.button("Ok").click(); assertTrue("Palette Group " + ManagePaletteGroupsTest.TEST_PALETTE_GROUP_LABEL + " has to be visible but is hidden.", - SWTBotWebBrowser.paletteContainsPaletteEntry(botExt, ManagePaletteGroupsTest.TEST_PALETTE_GROUP_LABEL)); - } - - + SWTBotWebBrowser.paletteContainsRootPaletteCotnainer(botExt, ManagePaletteGroupsTest.TEST_PALETTE_GROUP_LABEL)); + } } @Override protected void closeUnuseDialogs() { Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -15,6 +15,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; import org.jboss.tools.ui.bot.test.WidgetVariables; import org.jboss.tools.vpe.ui.bot.test.editor.VPEEditorTestCase; @@ -57,7 +58,7 @@ KeyboardHelper.pressKeyCode(bot.getDisplay(), SWT.ARROW_LEFT); - delay(); + bot.sleep(Timing.time2S()); assertTrue("h:messages node is not selected within Outline View", bot.viewByTitle(WidgetVariables.OUTLINE).bot().tree().selection().get(0).get(0).startsWith("h:messages ")); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/RenameFacesConfigFileTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -74,5 +74,9 @@ + OLD_FACES_CONFIG_FILE_NAME + " file was not changed in web.xml file.", fullConfigFileName.endsWith(NEW_FACES_CONFIG_FILE_NAME)); + // put changes back + checkResult = FileRenameHelper.checkFileRenamingWithinWebProjects(bot, NEW_FACES_CONFIG_FILE_NAME, OLD_FACES_CONFIG_FILE_NAME, + new String[]{JBT_TEST_PROJECT_NAME,IDELabel.WebProjectsTree.CONFIGURATION}); + assertNull(checkResult,checkResult); } } \ 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 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -14,6 +14,7 @@ import static org.junit.Assert.assertNotNull; import java.util.Arrays; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -381,8 +382,8 @@ public static void activatePaletteTool (SWTBotExt bot , String toolLabel){ PaletteViewer paletteViewer = SWTBotWebBrowser.getPaletteViewer(bot); - PaletteEntry peJsfHtml = SWTBotWebBrowser.getPaletteEntry(paletteViewer , toolLabel); - paletteViewer.setActiveTool((ToolEntry) peJsfHtml); + PaletteEntry paletteEntry = SWTBotWebBrowser.getPaletteEntry(paletteViewer , toolLabel); + paletteViewer.setActiveTool((ToolEntry) paletteEntry); } /** @@ -558,7 +559,7 @@ } /** - * Returns true if JBoss Tools Palette Contains Palette Entry with label paletteENtryLabel + * Returns true if JBoss Tools Palette Contains Palette Entry with label paletteEntryLabel * @param paletteEntryLabel * @return */ @@ -729,4 +730,23 @@ return result; } + /** + * Returns true if JBoss Tools Palette Contains Root Palette Container with label paletteContainerLabel + * @param paletteContainerLabel + * @return + */ + public static boolean paletteContainsRootPaletteCotnainer (SWTBotExt bot,String paletteContainerLabel){ + boolean result = false; + List<PaletteContainer> paletteContainers = SWTBotWebBrowser.getPaletteRootContainers(bot); + if (paletteContainers != null){ + Iterator<PaletteContainer> pcIterator = paletteContainers.iterator(); + while (pcIterator.hasNext() && !result){ + if (pcIterator.next().getLabel().equals(paletteContainerLabel)){ + result = true; + } + } + } + return result; + } + } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-12-14 15:23:25 UTC (rev 27448) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-12-14 15:25:42 UTC (rev 27449) @@ -23,6 +23,7 @@ import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; import org.jboss.tools.jst.jsp.messages.JstUIMessages; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -390,7 +391,7 @@ /* * Select some text */ - editor.toTextEditor().selectRange(13, 0, 1); + editor.toTextEditor().selectRange(13, 15, 1); /* * There is an exception caused by the fact that * line delimiter was selected. @@ -400,7 +401,7 @@ /* * Check that the toolbar buttion is disabled */ - assertFalse("Toolbar buttion should be disabled", bot //$NON-NLS-1$ + assertFalse("Toolbar button should be disabled", bot //$NON-NLS-1$ .toolbarButtonWithTooltip(TOOL_TIP) .isEnabled()); /* @@ -410,6 +411,7 @@ /* * Send key press event to fire VPE listeners */ + editor.setFocus(); KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT); /* * Activate the dialog @@ -685,6 +687,7 @@ bot.button(WidgetVariables.OK_BUTTON).isEnabled()); bot.button(WidgetVariables.OK_BUTTON).click(); isUnusedDialogOpened = false; + bot.sleep(Timing.time2S()); /* * Check that the text was replaced */