Author: vpakan(a)redhat.com Date: 2012-10-12 10:03:58 -0400 (Fri, 12 Oct 2012) New Revision: 44483 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.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/smoke/CodeCompletionTest.java Log: Fixes for JBT 4.0.0.Alpha2 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java 2012-10-12 14:03:18 UTC (rev 44482) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEStableSubsetBotTests.java 2012-10-12 14:03:58 UTC (rev 44483) @@ -39,7 +39,6 @@ import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest; import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.CalendarTagTest; -import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.JSFTagsTest; import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test; @@ -118,7 +117,6 @@ TextSelectionTest.class, CoreHTMLTagsTest.class, JSFTagsTest.class, - ColumnsTagTest.class, CalendarTagTest.class, OpenOnTest.class, XhtmlFilePerformanceTest.class, 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 2012-10-12 14:03:18 UTC (rev 44482) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2012-10-12 14:03:58 UTC (rev 44483) @@ -14,6 +14,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.TimeoutException; import org.jboss.tools.ui.bot.ext.SWTBotExt; +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.ui.bot.test.WidgetVariables; @@ -66,6 +67,7 @@ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ bot.shell("Confirm Delete").activate(); //$NON-NLS-1$ bot.button(IDELabel.Button.OK).click(); //$NON-NLS-1$ + util.waitForNonIgnoredJobs(Timing.time3S()); bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.comboBoxWithLabel(SELECT_DEFAULT_TAB).setSelection(IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL); //$NON-NLS-1$ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2012-10-12 14:03:18 UTC (rev 44482) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/CodeCompletionTest.java 2012-10-12 14:03:58 UTC (rev 44483) @@ -78,6 +78,7 @@ // close Content Assist window which is automatically opened after previous // Content Assist choice were applied KeyboardHelper.pressKeyCode(editor.bot().getDisplay(), KeyEvent.VK_ESCAPE); + bot.sleep(Timing.time3S()); editor.save(); String expectedInsertedText = textForSelection + "<" + contentAssistToUse + " action=\"\" value=\"\" />"; if (!editor.getText().contains(expectedInsertedText)){