[jbosstools-commits] JBoss Tools SVN: r26245 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/preferences and 1 other directory.

Author: vpakan(a)redhat.com Date: 2010-11-04 05:53:59 -0400 (Thu, 04 Nov 2010) New Revision: 26245 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java Log: Added PromptForTagAttributesDuringTagInsertTest test. Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-11-04 09:27:53 UTC (rev 26244) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-11-04 09:53:59 UTC (rev 26245) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.ui.bot.test.editor.preferences.AlwaysHideSelectionBarWithoutPromptTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.BorderForUnknownTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ChangeEditorTabForTheFirstOpenPageTest; +import org.jboss.tools.vpe.ui.bot.test.editor.preferences.PromptForTagAttributesDuringTagInsertTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowNonVisualTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowResourceBundlesUsageasELexpressionsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest; @@ -72,6 +73,7 @@ suite.addTestSuite(InsertActionsTest.class); suite.addTestSuite(EditingActionsTest.class); suite.addTestSuite(TextEditingActionsTest.class); + suite.addTestSuite(PromptForTagAttributesDuringTagInsertTest.class); return new TestSetup(suite); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-11-04 09:27:53 UTC (rev 26244) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-11-04 09:53:59 UTC (rev 26245) @@ -414,7 +414,10 @@ */ protected abstract boolean isUnuseDialogOpened(); - + /** + * Opens page pageName + * @param pageName + */ protected void openPage(String pageName){ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); @@ -422,7 +425,9 @@ .expandNode("WebContent").expandNode("pages").getNode(pageName).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ bot.sleep(Timing.time3S()); } - + /** + * Opens Test Page + */ protected void openPage(){ openPage(TEST_PAGE); } @@ -446,4 +451,16 @@ bot.sleep(Timing.time2S()); } } + /** + * Deletes page pageName + * @param pageName + */ + protected void deletePage(String pageName){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$ + .expandNode("pages").getNode("testPage.jsp").select(); //$NON-NLS-1$//$NON-NLS-2$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.shell("Confirm Delete").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ + } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-11-04 09:27:53 UTC (rev 26244) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-11-04 09:53:59 UTC (rev 26245) @@ -64,7 +64,7 @@ } private void selectSelection(){ - bot.toolbarToggleButton(SHOW_SELECTION_BAR).click(); + bot.toolbarToggleButtonWithTooltip(TOGGLE_SELECTION_BAR_TOOLTIP).click(); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2010-11-04 09:27:53 UTC (rev 26244) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2010-11-04 09:53:59 UTC (rev 26245) @@ -15,7 +15,7 @@ public abstract class PreferencesTestCase extends VPEAutoTestCase{ - protected static final String SHOW_SELECTION_BAR = "Show Selection Bar"; //$NON-NLS-1$ + protected static final String TOGGLE_SELECTION_BAR_TOOLTIP = "Toggle Selection Bar (Ctrl+6)"; //$NON-NLS-1$ protected static final String SHOW_NON_VISUAL_TAGS = "Show non-visual tags"; //$NON-NLS-1$ protected static final String SHOW_BORDER_FOR_UNKNOWN_TAGS = "Show border for unknown tags"; //$NON-NLS-1$ protected static final String SHOW_RESOURCE_BUNDLES = "Show resource bundles usage as EL expressions"; //$NON-NLS-1$ @@ -75,7 +75,7 @@ } void setPreferencesToDefault(boolean fromEditor) throws WidgetNotFoundException{ - SWTBotToolbarToggleButton tbShowSelectionBar = bot.toolbarToggleButton(SHOW_SELECTION_BAR); + SWTBotToolbarToggleButton tbShowSelectionBar = bot.toolbarToggleButtonWithTooltip(TOGGLE_SELECTION_BAR_TOOLTIP); if (!tbShowSelectionBar.isChecked()){ tbShowSelectionBar.click(); } Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java 2010-11-04 09:53:59 UTC (rev 26245) @@ -0,0 +1,82 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.preferences; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser; +/** + * Prompt for Tag Attributes during Tag Insert test + * @author vlado pakan + * + */ +public class PromptForTagAttributesDuringTagInsertTest extends PreferencesTestCase{ + + private static final String TEST_PAGE_NAME = "PromptForTagAttributes.jsp"; + private SWTBotEclipseEditor jspEditor; + private SWTBotWebBrowser webBrowser; + private SWTBotExt botExt = null; + + public PromptForTagAttributesDuringTagInsertTest() { + super(); + botExt = new SWTBotExt(); + } + @Override + protected void setUp() throws Exception { + super.setUp(); + eclipse.maximizeActiveShell(); + createJspPage(PromptForTagAttributesDuringTagInsertTest.TEST_PAGE_NAME); + jspEditor = botExt.editorByTitle(PromptForTagAttributesDuringTagInsertTest.TEST_PAGE_NAME).toTextEditor(); + webBrowser = new SWTBotWebBrowser(PromptForTagAttributesDuringTagInsertTest.TEST_PAGE_NAME,botExt); + } + /** + * Prompt for Tag Attributes during Tag Insert test + */ + public void testPromptForTagAttributesDuringTagInsert(){ + jspEditor.setText(""); + jspEditor.save(); + bot.sleep(Timing.time2S()); + // Check Ask for Tag Attributes during Insert + bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); + bot.shell(PREF_FILTER_SHELL_TITLE).activate(); + SWTBotCheckBox chbAskForAttributes = bot.checkBox(ASK_FOR_ATTRIBUTES); + if (!chbAskForAttributes.isChecked()) { + chbAskForAttributes.click(); + } + bot.button("OK").click(); + + webBrowser.activatePaletteTool("outputText"); + SWTBot dialogBot = null; + try{ + dialogBot = botExt.shell(IDELabel.Shell.INSERT_TAG).activate().bot(); + dialogBot.button(IDELabel.Button.FINISH).click(); + } catch (WidgetNotFoundException wnfe){ + // do nothing + } + assertNotNull("Dialog asking for Tag Attributes during Insert was not opened but it has to.",dialogBot); + // Uncheck Ask for Tag Attributes during Insert + bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); + bot.shell(PREF_FILTER_SHELL_TITLE).activate(); + chbAskForAttributes = bot.checkBox(ASK_FOR_ATTRIBUTES); + chbAskForAttributes.click(); + bot.button("OK").click(); + webBrowser.activatePaletteTool("outputText"); + dialogBot = null; + try{ + dialogBot = botExt.shell(IDELabel.Shell.INSERT_TAG).activate().bot(); + dialogBot.button(IDELabel.Button.FINISH).click(); + } catch (WidgetNotFoundException wnfe){ + // do nothing + } + assertNull("Dialog asking for Tag Attributes during Insert was opened but it must not to be.",dialogBot); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PromptForTagAttributesDuringTagInsertTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-11-04 09:27:53 UTC (rev 26244) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-11-04 09:53:59 UTC (rev 26245) @@ -33,7 +33,7 @@ } private void selectSelection(){ - bot.toolbarToggleButton(SHOW_SELECTION_BAR).click(); + bot.toolbarToggleButtonWithTooltip(TOGGLE_SELECTION_BAR_TOOLTIP).click(); } private void checkIsHide(){