[jbosstools-commits] JBoss Tools SVN: r28549 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types and 3 other directories.

Author: vpakan(a)redhat.com Date: 2011-01-24 09:42:50 -0500 (Mon, 24 Jan 2011) New Revision: 28549 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.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/TextSelectionTest.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/pagedesign/IncludedCssFilesJSPTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java Log: Fixes for JBDS 4.0.0.CR1 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2011-01-24 14:39:35 UTC (rev 28548) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2011-01-24 14:42:50 UTC (rev 28549) @@ -513,7 +513,7 @@ try { bot.shell(title).activate(); - bot.button(cancel ? IDELabel.Button.CANCEL : IDELabel.Button.OK) + bot.button(cancel ? IDELabel.Button.NO : IDELabel.Button.YES) .click(); log.info("Report usage window closed"); } catch (WidgetNotFoundException wnfe) { 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-01-24 14:39:35 UTC (rev 28548) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-01-24 14:42:50 UTC (rev 28549) @@ -380,7 +380,8 @@ public static final String JBOSS_TOOLS_WEB_EDITORS = "Editors"; public static final String JBOSS_TOOLS_WEB_EDITORS_VPE = "Visual Page Editor"; public static final String JBOSS_TOOLS_WEB_EDITORS_VPE_VISUAL_TEMPLATES = "Visual Templates"; - public static final String JBOSS_TOOLS_EL_VARIABLES = "El Variables"; + public static final String JBOSS_TOOLS_EXPRESSION_LANGUAGE = "Expression Language"; + public static final String JBOSS_TOOLS_VARIABLES = "Variables"; } public static class JBossServerRuntimeDialog { Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-01-24 14:39:35 UTC (rev 28548) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-01-24 14:42:50 UTC (rev 28549) @@ -138,10 +138,10 @@ jspEditor.save(); bot.sleep(Timing.time3S()); assertVisualEditorContainsNodeWithValue(webBrowser, - "©2007 Exposure. All Rights Reserved.•Design by ", + "©2007 Exposure. All Rights Reserved.•Design by", TextSelectionTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, - "•Icons by ", + "•Icons by", TextSelectionTest.TEST_PAGE_NAME); jspEditor.deselectAndSetCursorPosition(0, 0); webBrowser.setFocus(); 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 2011-01-24 14:39:35 UTC (rev 28548) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2011-01-24 14:42:50 UTC (rev 28549) @@ -59,14 +59,14 @@ jspGreetingPageEditor.save(); bot.sleep(Timing.time2S()); assertVisualEditorContainsNodeWithValue(new SWTBotWebBrowser(EditingELValueTest.GREETING_PAGE_NAME,botExt), - " Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"", + "Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"", EditingELValueTest.GREETING_PAGE_NAME); jspInputNamePageEditor.setText(jspInputNamePageEditor.getText() .replaceFirst("/templates/common.xhtml", "#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml")); jspInputNamePageEditor.save(); bot.sleep(Timing.time2S()); assertVisualEditorContainsNodeWithValue(new SWTBotWebBrowser(EditingELValueTest.INPUT_NAME_PAGE_NAME,botExt), - " Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"", + "Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"", EditingELValueTest.INPUT_NAME_PAGE_NAME); // Opens Page Design Options Dialog bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java 2011-01-24 14:39:35 UTC (rev 28548) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java 2011-01-24 14:42:50 UTC (rev 28549) @@ -100,7 +100,7 @@ bot.sleep(Timing.time3S()); SWTBotWebBrowser webBrowser = new SWTBotWebBrowser(IncludedCssFilesJSPTest.JSP_FILE_NAME, new SWTBotExt()); assertVisualEditorContainsNodeWithValue(webBrowser, - "h1 { color: Red}.post-info { color: blue;}.post-info a { color: orange;}", + ".post-info { color: blue;}.post-info a { color: orange;}", IncludedCssFilesJSPTest.JSP_FILE_NAME); assertVisualEditorContains(webBrowser, "P", Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java 2011-01-24 14:39:35 UTC (rev 28548) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/GlobalELVariablesTest.java 2011-01-24 14:42:50 UTC (rev 28549) @@ -36,7 +36,8 @@ preferenceTree .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS) .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB) - .select(IDELabel.PreferencesDialog.JBOSS_TOOLS_EL_VARIABLES); + .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_EXPRESSION_LANGUAGE) + .select(IDELabel.PreferencesDialog.JBOSS_TOOLS_VARIABLES); bot.button(IDELabel.Button.ADD_WITHOUT_DOTS).click(); bot.shell(IDELabel.Shell.ADD_EL_REFERENCE).activate(); bot.textWithLabel(IDELabel.AddELReferenceDialog.EL_NAME).setText(GlobalELVariablesTest.elName); @@ -90,7 +91,8 @@ SWTBotTree preferenceTree = this.bot.tree(); preferenceTree.expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS) .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB) - .select(IDELabel.PreferencesDialog.JBOSS_TOOLS_EL_VARIABLES); + .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_EXPRESSION_LANGUAGE) + .select(IDELabel.PreferencesDialog.JBOSS_TOOLS_VARIABLES);; SWTBotTableItem tiEL = new SWTBotTableExt(bot.table()).getTableItem(new String[] {"Global", GlobalELVariablesTest.elName,