Author: vpakan(a)redhat.com Date: 2011-12-20 06:57:57 -0500 (Tue, 20 Dec 2011) New Revision: 37459 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.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/tags/EditorTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.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/AbstractFacesConfigEditingTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java 2011-12-20 10:37:08 UTC (rev 37458) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AbstractFacesConfigEditingTest.java 2011-12-20 11:57:57 UTC (rev 37459) @@ -132,7 +132,7 @@ facesConfigEditorExt.save(); bot.sleep(Timing.time1S()); if (getCheckForExistingManagedBeanClass()){ - assertFacesConfigXmlHasErrors(botExt); + assertFacesConfigXmlHasValidationProblems(botExt); } editorBot.textWithLabel(IDELabel.FacesConfigEditor.MANAGED_BEAN_CLASS_LABEL) .setText(managedBeanClass); @@ -283,12 +283,17 @@ * Asserts if faces-config.xml has errors * @param botExt */ - protected static void assertFacesConfigXmlHasErrors (SWTBotExt botExt){ + protected static void assertFacesConfigXmlHasValidationProblems (SWTBotExt botExt){ - SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null); - boolean areThereErrors = ((errors != null) && (errors.length > 0)); - assertTrue("There are missing errors in Problems view for " + AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME + " file.", - areThereErrors); + SWTBotTreeItem[] problems = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null); + boolean areThereProblems = ((problems != null) && (problems.length > 0)); + if (!areThereProblems){ + problems = ProblemsView.getFilteredWarningsTreeItems(botExt, "references to non-existent class", null, + AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null); + areThereProblems = ((problems != null) && (problems.length > 0)); + } + assertTrue("There are missing problems in Problems view for " + AbstractFacesConfigEditingTest.FACES_CONFIG_FILE_NAME + " file.", + areThereProblems); } /** * Check editing of particular tree node within Face Config Editor Tree @@ -330,7 +335,7 @@ facesConfigEditorExt.save(); bot.sleep(Timing.time1S()); if (checkForValdiationErrors){ - assertFacesConfigXmlHasErrors(botExt); + assertFacesConfigXmlHasValidationProblems(botExt); } final String selectedNode = tree.selection().get(0,0); assertTrue ("Selected node has to have label '" + typeTextValue +"'\n" + 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-20 10:37:08 UTC (rev 37458) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-20 11:57:57 UTC (rev 37459) @@ -320,9 +320,9 @@ 0, 0); editor.insertText("\n"); - String textToInsert = "<h:outputText value=\"#{msg["; + String textToInsert = "<h:outputText value=\"#{msg"; final SWTBotShell[] shellsBefore = bot.shells(); - editor.typeText(textToInsert); + editor.typeText(textToInsert + "["); bot.sleep(Timing.time2S()); // Check Content Assist invoked by typing ContentAssistBot contentAssist = editor.contentAssist(); @@ -342,12 +342,12 @@ contentAssist.checkContentAssist(useCodeAssist, true); final String textToInsertAtEnd = "/>"; editor.insertText(editor.cursorPosition().line, - editor.cursorPosition().column + 3, + editor.cursorPosition().column + 2, textToInsertAtEnd); editor.save(); bot.sleep(Timing.time1S()); Assertions.assertSourceEditorContains(editor.getText(), - textToInsert + "'" + useCodeAssist + "']}" + textToInsertAtEnd, + textToInsert + useCodeAssist + "}" + textToInsertAtEnd, FACELETS_TEST_PAGE); } /** 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 2011-12-20 10:37:08 UTC (rev 37458) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2011-12-20 11:57:57 UTC (rev 37459) @@ -15,6 +15,7 @@ import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; 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.KeyboardHelper; import org.jboss.tools.ui.bot.ext.parts.SWTBotTableExt; @@ -92,7 +93,8 @@ final SWTBotEclipseEditor jspTextEditor = botExt.editorByTitle(TEST_PAGE) .toTextEditor(); jspTextEditor.save(); - botExt.toolbarButtonWithTooltip(IDELabel.Button.REFRESH).click(); + botExt.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ? + IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click(); botExt.sleep(Timing.time1S()); String editorText = jspTextEditor.getText(); String testText = "<h:outputText value=\"" + outputTextValue + "\">"; Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java 2011-12-20 10:37:08 UTC (rev 37458) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java 2011-12-20 11:57:57 UTC (rev 37459) @@ -42,9 +42,9 @@ @Override protected void verifyTag() { assertVisualEditorContains(getVisualEditor(), - "DIV", + "TEXTAREA", new String[]{"class"}, - new String[]{"mceIframeContainer"}, + new String[]{"jbds_rf_editor_content_textarea_internal_css_class"}, getTestPageFileName()); // check tag selection getVisualEditor().selectDomNode(getVisualEditor().getDomNodeByTagName("DIV",4), 0); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-12-20 10:37:08 UTC (rev 37458) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-12-20 11:57:57 UTC (rev 37459) @@ -57,16 +57,16 @@ @Override protected void verifyTag() { assertVisualEditorContainsNodeWithValue(getVisualEditor(), - "Copy all", + "⇒ Copy all", getTestPageFileName()); assertVisualEditorContainsNodeWithValue(getVisualEditor(), - "Copy", + "→ Copy", getTestPageFileName()); assertVisualEditorContainsNodeWithValue(getVisualEditor(), - "Remove All", + "⇐ Remove All", getTestPageFileName()); assertVisualEditorContainsNodeWithValue(getVisualEditor(), - "Remove", + "← Remove", getTestPageFileName()); assertVisualEditorContains(getVisualEditor(), "TABLE",