Author: vpakan(a)redhat.com Date: 2010-05-11 04:09:39 -0400 (Tue, 11 May 2010) New Revision: 22003 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: Added small fixes to Drools SWTBot Tests. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -98,7 +98,8 @@ } catch (WidgetNotFoundException wnfe){ // Do nothing ignore this error } - eclipse.openPerspective(PerspectiveType.JAVA); + eclipse.openPerspective(PerspectiveType.JAVA); + eclipse.maximizeActiveShell(); } @AfterClass Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -20,6 +20,7 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; 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.SWTBotEditorExt; import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.JobName; @@ -112,6 +113,8 @@ SWTBotEclipseEditor drlDroolsEditor = packageExplorer.openFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME).toTextEditor(); + SWTBotEditorExt ruleEditor = bot.swtBotEditorExtByTitle(DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME); + ruleEditor.selectPage(IDELabel.DroolsEditor.TEXT_EDITOR_TAB); // update drl file drlDroolsEditor.insertText(3,0,"\nexpander " + dslFileName + @@ -121,7 +124,9 @@ drlDroolsEditor.insertText(lineNumber,0,">"); } drlDroolsEditor.selectLine(18); + bot.sleep(Timing.time1S()); KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + bot.sleep(Timing.time1S()); drlDroolsEditor.insertText(18, 0, " Message m of type Message.GOODBYE contains myMessage"); drlDroolsEditor.save(); util.waitForJobs(Timing.time10S(), JobName.BUILDING_WS); Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -98,7 +98,8 @@ DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); console.clearConsole(); eclipse.debugTreeItemAsDroolsApplication(tiDroolsTest); - eclipse.closeConfirmPerspectiveSwitchShellIfOpened(true); + bot.sleep(Timing.time3S()); + eclipse.closeConfirmPerspectiveSwitchShellIfOpened(false); String consoleText = console.getConsoleText(3*1000L,3*1000L,true); assertTrue("Drools Rule was not debuged properly.\nConsole content should have been empty but is:\n" + consoleText, consoleText.length() == 0); Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -34,6 +34,7 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -99,7 +100,11 @@ // Test if Rule Flow RF File is opened in editor assertTrue("Rule Flow RF File is not opened properly. File " + ruleFlowFileName + " is not opened in editor", SWTEclipseExt.existEditorWithLabel(bot,ruleFlowFileName)); - + // Maximize editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); SWTGefBot gefBot = new SWTGefBot(); SWTBotGefEditor gefEditor = gefBot.gefEditor(ruleFlowFileName); final Control editorControl = (Control)gefEditor.getWidget(); @@ -137,11 +142,17 @@ // Delete each component gefEditor.activateTool("Select"); for (int toolIndex = 0;toolIndex < tools.length;toolIndex++){ - gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + 5, - yspacing * (toolIndex / 3) + yoffset + 5); + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + 10, + yspacing * (toolIndex / 3) + yoffset + 10); KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); } + // Restore maximized editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); gefEditor.save(); + gefEditor.close(); checkEmptyRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileName); } /** Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -770,10 +770,11 @@ /** * Hide Warning Message if displayed static version */ - public static void hideWarningIfDisplayed(SWTBotExt bot) { + public static void hideWarningIfDisplayed(SWTBot bot) { try { - bot.shell(IDELabel.Shell.WARNING).activate(); - bot.button(IDELabel.Button.OK).click(); + SWTBot warningBot = bot.shell(IDELabel.Shell.WARNING).activate().bot(); + warningBot.sleep(Timing.time3S()); + warningBot.button(IDELabel.Button.OK).click(); } catch (WidgetNotFoundException wnfe) { // do nothing } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -246,6 +246,7 @@ SWTBotShell activeShell = bot.activeShell(); String activeShellStr = bot.activeShell().getText(); bot.button(finishButtonText).click(); + SWTEclipseExt.hideWarningIfDisplayed(bot); long time = System.currentTimeMillis(); while (true) { log.info("Waiting until shell '" + activeShellStr + "' closes"); Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -72,6 +72,8 @@ public static final String GUVNOR_ADD = "Add..."; public static final String GUVNOR_DELETE = "Delete..."; public static final String GUVNOR_DISCONNECT = "Disconnect"; + public static final String NAVIGATION = "Navigation"; + public static final String MAXIMIZE_ACTIVE_VIEW_OR_EDITOR = "Maximize Active View or Editor"; } public class Button {