Author: vpakan(a)redhat.com Date: 2011-12-15 12:45:46 -0500 (Thu, 15 Dec 2011) New Revision: 37357 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.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/tags/CoreHTMLTagsTest.java Log: Fixes for JBT 3.3.0.M5 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-12-15 15:40:55 UTC (rev 37356) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-12-15 17:45:46 UTC (rev 37357) @@ -199,11 +199,7 @@ IDELabel.Menu.PACKAGE_EXPLORER_CONFIGURE, false)).menu( IDELabel.Menu.ADD_JSF_CAPABILITIES).click(); } - - bot.shell("Add JSF Capabilities").activate(); - bot.button(WidgetVariables.NEXT_BUTTON).click(); - bot.button(WidgetVariables.FINISH_BUTTON).click(); - + delay(); assertTrue("JSF Capabilities were not added to project " Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-15 15:40:55 UTC (rev 37356) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-15 17:45:46 UTC (rev 37357) @@ -327,18 +327,18 @@ // Check Content Assist invoked by typing ContentAssistBot contentAssist = editor.contentAssist(); final List<String> caProposals = contentAssist.getProposalList(shellsBefore, bot.shells(), true); - String useCodeAssist = "greeting"; + String useCodeAssist = "['greeting']"; assertTrue("Content assist has to contain item " + useCodeAssist + " but it does not.", caProposals.contains(useCodeAssist)); - useCodeAssist = "prompt"; + useCodeAssist = "['prompt']"; assertTrue("Content assist has to contain item " + useCodeAssist + " but it does not.", caProposals.contains(useCodeAssist)); // Check Content Assist invoked by Ctrl-Space - useCodeAssist = "greeting"; + useCodeAssist = "['greeting']"; contentAssist.checkContentAssist(useCodeAssist, false); - useCodeAssist = "prompt"; + useCodeAssist = "['prompt']"; contentAssist.checkContentAssist(useCodeAssist, true); final String textToInsertAtEnd = "/>"; editor.insertText(editor.cursorPosition().line, Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-12-15 15:40:55 UTC (rev 37356) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-12-15 17:45:46 UTC (rev 37357) @@ -704,7 +704,8 @@ public static class ToolbarButton{ - public static final String REFRESH = "Refresh"; + public static final String REFRESH = "Refresh (F5)"; + public static final String REFRESH_MAC_OS = "Refresh (⌘R)"; } 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 2011-12-15 15:40:55 UTC (rev 37356) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/XhtmlFilePerformanceTest.java 2011-12-15 17:45:46 UTC (rev 37357) @@ -17,6 +17,7 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.FileHelper; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; @@ -59,7 +60,8 @@ xhtmlTextEditor.insertText(9, 5, "<h1>" + insertText + "<h1/>"); xhtmlTextEditor.save(); bot.sleep(Timing.time2S()); - bot.toolbarButtonWithTooltip(IDELabel.Button.REFRESH).click(); + bot.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ? + IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click(); SWTBotEditorExt multiPageEditor = swtBotExt.swtBotEditorExtByTitle(XhtmlFilePerformanceTest.TEST_PAGE_NAME); multiPageEditor.selectPage(IDELabel.VisualPageEditor.PREVIEW_TAB_LABEL); SWTBotWebBrowser swtBotWebBrowserExt = new SWTBotWebBrowser(XhtmlFilePerformanceTest.TEST_PAGE_NAME, swtBotExt); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java 2011-12-15 15:40:55 UTC (rev 37356) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CoreHTMLTagsTest.java 2011-12-15 17:45:46 UTC (rev 37357) @@ -12,6 +12,7 @@ package org.jboss.tools.vpe.ui.bot.test.editor.tags; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -60,7 +61,8 @@ new String[]{"color: red; text-align: center; background-color: green;"}, CoreHTMLTagsTest.TEST_PAGE_NAME); // check after refresh - bot.toolbarButtonWithTooltip(IDELabel.ToolbarButton.REFRESH).click(); + bot.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ? + IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click(); assertVisualEditorContains(webBrowser, "BODY", new String[]{"style"},