[jbosstools-commits] JBoss Tools SVN: r42740 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/pagedesign and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Jul 26 11:51:06 EDT 2012
Author: vpakan at redhat.com
Date: 2012-07-26 11:51:05 -0400 (Thu, 26 Jul 2012)
New Revision: 42740
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/MultiSelectionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.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/pagedesign/IncludedCssFilesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELExressionsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
Fixes for JBT 3.4. Use more reliable waiting methods.
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 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/JspFileEditingTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -93,8 +93,10 @@
final SWTBotEclipseEditor jspTextEditor = botExt.editorByTitle(TEST_PAGE)
.toTextEditor();
jspTextEditor.save();
- botExt.toolbarButtonWithTooltip(SWTJBTExt.isRunningOnMacOs() ?
- IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH).click();
+ final String toolbarButtonRefreshTooltip = SWTJBTExt.isRunningOnMacOs() ?
+ IDELabel.ToolbarButton.REFRESH_MAC_OS: IDELabel.ToolbarButton.REFRESH;
+ util.waitForToolbarButtonWithTooltipIsFound(toolbarButtonRefreshTooltip, Timing.time10S());
+ botExt.toolbarButtonWithTooltip(toolbarButtonRefreshTooltip).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/MultiSelectionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MultiSelectionTest.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MultiSelectionTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -14,6 +14,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.vpe.ui.bot.test.tools.SWTBotWebBrowser;
import org.mozilla.interfaces.nsIDOMNode;
/**
@@ -70,6 +71,8 @@
0,
0,
0);
+
+ util.waitForNonIgnoredJobs(true,Timing.time3S());
assertSelectedNodeHasText(webBrowser, MultiSelectionTest.OUTPUT_TEXT_1_TEXT);
@@ -79,6 +82,8 @@
0,
0,
0);
+
+ util.waitForNonIgnoredJobs(true,Timing.time3S());
assertSelectedNodeHasText(webBrowser, MultiSelectionTest.OUTPUT_TEXT_0_TEXT);
@@ -89,10 +94,14 @@
jspEditor.selectRange(yPos, xPos,
tagsLine.indexOf(MultiSelectionTest.OUTPUT_TEXT_1_TEXT) - tagsLine.indexOf(MultiSelectionTest.OUTPUT_TEXT_0_TEXT));
+ util.waitForNonIgnoredJobs(true,Timing.time3S());
+
assertSelectedNodeHasText(webBrowser, MultiSelectionTest.OUTPUT_TEXT_0_TEXT);
jspEditor.selectCurrentLine();
+ util.waitForNonIgnoredJobs(true,Timing.time3S());
+
assertTrue("Multiple selection doesn't contain proper nodes.",
webBrowser.selectionContainsNodes(false, MultiSelectionTest.OUTPUT_TEXT_0_TEXT
, MultiSelectionTest.OUTPUT_TEXT_1_TEXT));
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -68,7 +68,9 @@
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
SWTBotTree tree = innerBot.tree();
tree.expandNode(JBT_TEST_PROJECT_NAME)
- .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
+ .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
+ // wait for page to be opened
+ bot.editorByTitle(TEST_PAGE);
}
void checkVPE(String testPage) throws Throwable{
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 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -69,6 +69,7 @@
"Template file is not found: \"templates/common.xhtml\"",
EditingELValueTest.INPUT_NAME_PAGE_NAME);
// Opens Page Design Options Dialog
+ util.waitForToolbarButtonWithTooltipIsFound(PAGE_DESIGN, Timing.time10S());
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
SWTBot optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.SUBSTITUTED_EL_EXPRESSIONS_TAB).activate();
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 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -86,6 +86,7 @@
bot.sleep(Timing.time3S());
util.waitForJobs(JobName.BUILDING_WS);
// add CSS File Reference
+ util.waitForToolbarButtonWithTooltipIsFound(PAGE_DESIGN, Timing.time10S());
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.INCLUDED_CSS_FILES_TAB).activate();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -82,6 +82,7 @@
bot.sleep(Timing.time3S());
util.waitForJobs(JobName.BUILDING_WS);
// add CSS File Reference
+ util.waitForToolbarButtonWithTooltipIsFound(PAGE_DESIGN, Timing.time10S());
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.INCLUDED_CSS_FILES_TAB).activate();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ManipulatingELValueTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -54,9 +54,11 @@
createJspPage(ManipulatingELValueTest.TEST_IN_PAGE_FOLDER_PAGE_NAME);
testInPageFolderEditor = botExt.editorByTitle(ManipulatingELValueTest.TEST_IN_PAGE_FOLDER_PAGE_NAME).toTextEditor();
testInPageFolderEditor.setText(ManipulatingELValueTest.PAGE_TEXT);
+ testInPageFolderEditor.save();
createJspPage(ManipulatingELValueTest.TEST_IN_MAIN_FOLDER_PAGE_NAME , JBT_TEST_PROJECT_NAME , "WebContent");
testInMainFolderEditor = botExt.editorByTitle(ManipulatingELValueTest.TEST_IN_MAIN_FOLDER_PAGE_NAME).toTextEditor();
testInMainFolderEditor.setText(ManipulatingELValueTest.PAGE_TEXT);
+ testInMainFolderEditor.save();
testInPageFolderEditor.show();
addELSubstitution(ManipulatingELValueTest.EL_VARIABLE_NAME, ManipulatingELValueTest.EL_IN_PAGE_FOLDER_VARIABLE_VALUE,
IDELabel.PageDesignOptionsDialog.SUBSTITUTED_EL_EXPRESSIONS_SCOPE_FOLDER);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -64,6 +64,7 @@
* Deletes all defined EL Substitutions. VPE has to be opened when called this method
*/
public void deleteAllELSubstitutions(){
+ util.waitForToolbarButtonWithTooltipIsFound(PAGE_DESIGN, Timing.time10S());
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
SWTBot optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.SUBSTITUTED_EL_EXPRESSIONS_TAB).activate();
@@ -82,6 +83,7 @@
* @param scope
*/
public void addELSubstitution (String elName , String value , String scope){
+ util.waitForToolbarButtonWithTooltipIsFound(PAGE_DESIGN, Timing.time10S());
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
SWTBot optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.SUBSTITUTED_EL_EXPRESSIONS_TAB).activate();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELExressionsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELExressionsTest.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELExressionsTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -13,6 +13,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
@@ -28,6 +29,7 @@
public void testSubstitutedELExressions(){
openPage();
+ util.waitForToolbarButtonWithTooltipIsFound(PAGE_DESIGN, Timing.time10S());
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.SUBSTITUTED_EL_EXPRESSIONS_TAB).activate();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2012-07-26 13:59:18 UTC (rev 42739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2012-07-26 15:51:05 UTC (rev 42740)
@@ -230,6 +230,7 @@
/*
* Get toolbar button
*/
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
tbButton.click();
@@ -245,6 +246,7 @@
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY,
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull("Cannot find 'Property Key' text field", defKeyText); //$NON-NLS-1$
+ util.waitForNonIgnoredJobs(true, Timing.time3S());
assertText("User_1",defKeyText); //$NON-NLS-1$
assertTrue("(OK) button should be enabled.", //$NON-NLS-1$
bot.button(WidgetVariables.OK_BUTTON).isEnabled());
@@ -299,6 +301,7 @@
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY,
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull("Cannot find 'Property Key' text field", defKeyText); //$NON-NLS-1$
+ util.waitForNonIgnoredJobs(true, Timing.time3S());
assertText("User_1",defKeyText); //$NON-NLS-1$
defKeyText.setText("user.compoundKey"); //$NON-NLS-1$
SWTBotText defValueText = bot.textWithLabelInGroup(
@@ -368,6 +371,7 @@
/*
* Get toolbar button
*/
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
tbButton.click();
@@ -484,6 +488,7 @@
* But for this test it's ok, so just ignore this exception.
*/
setException(null);
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
util.waitWhileToolbarButtonisDisabled(tbButton,Timing.time5S());
/*
@@ -533,7 +538,10 @@
/*
* Activate the dialog
*/
- bot.toolbarButtonWithTooltip(TOOL_TIP).click();
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
+ SWTBotToolbarButton tbExternalizeStrings = (bot.toolbarButtonWithTooltip(TOOL_TIP));
+ util.waitForToolbarButtonEnabled(tbExternalizeStrings, Timing.time3S());
+ tbExternalizeStrings.click();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
isUnusedDialogOpened = true;
@@ -599,6 +607,7 @@
/*
* Activate the dialog
*/
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
assertTrue(TOOLBAR_ICON_ENABLED, bot
.toolbarButtonWithTooltip(TOOL_TIP)
.isEnabled());
@@ -856,6 +865,7 @@
* Rewrite the taglib
*/
editor.toTextEditor().typeText(" "); //$NON-NLS-1$
+ editor.save();
/*
* Make sure that taglib doesn't present
*/
@@ -911,6 +921,7 @@
* Rewrite the taglib
*/
editor.toTextEditor().typeText(" "); //$NON-NLS-1$
+ editor.save();
/*
* Make sure that taglib doesn't present
*/
@@ -921,6 +932,7 @@
/*
* Get toolbar button
*/
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
tbButton.click();
@@ -1001,8 +1013,16 @@
/*
* Get toolbar button
*/
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
+ SWTBotToolbarButton tbExternalizeStrings = (bot.toolbarButtonWithTooltip(TOOL_TIP));
+ if (enabled){
+ util.waitForToolbarButtonEnabled(tbExternalizeStrings, Timing.time3S());
+ }
+ else{
+ util.waitWhileToolbarButtonisDisabled(tbExternalizeStrings, Timing.time3S());
+ }
assertEquals(enabled ? TOOLBAR_ICON_ENABLED : TOOLBAR_ICON_DISABLED,
- enabled, bot.toolbarButtonWithTooltip(TOOL_TIP).isEnabled());
+ enabled, tbExternalizeStrings.isEnabled());
}
/**
@@ -1027,6 +1047,7 @@
/*
* Get toolbar button
*/
+ util.waitForToolbarButtonWithTooltipIsFound(TOOL_TIP, Timing.time3S());
SWTBotToolbarButton tbButton = bot.toolbarButtonWithTooltip(TOOL_TIP);
util.waitForToolbarButtonEnabled(tbButton,Timing.time5S());
tbButton.click();
More information about the jbosstools-commits
mailing list