[jbosstools-commits] JBoss Tools SVN: r19428 - in trunk: jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 2 other directories.

Author: vpakan(a)redhat.com Date: 2009-12-17 11:57:00 -0500 (Thu, 17 Dec 2009) New Revision: 19428 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.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/SWTUtilExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 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/ViewType.java Log: Some logic moved to common org.jboss.tools.iu.bot.ext plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2009-12-17 16:53:58 UTC (rev 19427) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -19,7 +19,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; -import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.helper.WidgetFinderHelper; @@ -37,7 +37,7 @@ private MenuItem miRunOnServer = null; public void testAddRemoveJSFCapabilities() { - boolean jbdsIsRunning = SWTEclipseExt.isJBDSRun(bot); + boolean jbdsIsRunning = SWTJBTExt.isJBDSRun(bot); removeJSFCapabilities(jbdsIsRunning); addJSFCapabilities(); // Test add/remove JSF capabilities after project is closed and reopened @@ -47,7 +47,6 @@ // Test import of deleted JSF project deleteJsfProject(); importJsfProject(); - } /** * Import existing JSF Project to Workspace @@ -84,13 +83,7 @@ String asStartingJob = IDELabel.ServerJobName.STARTING_JBOSS_EAP; String asStoppingJob = IDELabel.ServerJobName.STOPPING_JBOSS_EAP; // Check if there is defined Application Server if not create one - boolean isServerDefined = false; - try{ - bot.label(IDELabel.ImportJSFProjectDialog.CHOICE_LIST_IS_EMPTY); - } catch (WidgetNotFoundException wnfe){ - isServerDefined = true; - } - if (!isServerDefined){ + if (!SWTJBTExt.isServerDefinedInWebWizardPage(bot)){ // Specify Application Server for Deployment bot.button(WidgetVariables.NEW_BUTTON, 1).click(); bot.shell("New Server").activate(); @@ -109,16 +102,7 @@ waitForBlockingJobsAcomplished(BUILDING_WS); // Start Application Server - openServerView(); - SWTBot servers = bot.viewByTitle(WidgetVariables.SERVERS) - .bot(); - SWTBotTree serverTree = servers.tree(); - - ContextMenuHelper.prepareTreeItemForContextMenu(serverTree); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, - "Start", false)).click(); - waitForBlockingJobsAcomplished(45*1000L,asStartingJob); + SWTJBTExt.startApplicationServer(bot, 0); // Run it on server openPackageExplorer(); SWTBot packageExplorer = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) @@ -174,20 +158,8 @@ assertTrue("Displayed HTML page has wrong content", browserText.indexOf("<TITLE>Input User Name Page</TITLE>") > - 1); // Stop Application Server and remove Application Server from Server View - openServerView(); - - ContextMenuHelper.prepareTreeItemForContextMenu(serverTree); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, - "Stop", false)).click(); - - waitForBlockingJobsAcomplished(10*1000L , asStoppingJob); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, - "Delete", false)).click(); - bot.shell("Delete Server").activate(); - bot.button(WidgetVariables.OK_BUTTON).click(); - + SWTJBTExt.stopApplicationServer(bot, 0); + SWTJBTExt.deleteApplicationServer(bot, 0); setException(null); } else{ 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 2009-12-17 16:53:58 UTC (rev 19427) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -23,7 +23,6 @@ import org.eclipse.swtbot.eclipse.finder.waits.Conditions; 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.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.hamcrest.Matcher; @@ -35,19 +34,31 @@ import org.jboss.tools.ui.bot.ext.types.ViewType; /** - * Provieds Eclipse common operation based on SWTBot element operations + * Provides Eclipse common operation based on SWTBot element operations * @author jpeterka * */ public class SWTEclipseExt { - SWTWorkbenchBot bot; - SWTUtilExt util; - Logger log = Logger.getLogger(SWTEclipseExt.class); + private SWTWorkbenchBot bot; + private SWTUtilExt swtUtilExt; + private Logger log = Logger.getLogger(SWTEclipseExt.class); - public SWTEclipseExt(SWTWorkbenchBot bot) { + public SWTWorkbenchBot getBot() { + return bot; + } + + public SWTUtilExt getSwtUtilExt() { + return swtUtilExt; + } + + public Logger getLog() { + return log; + } + + public SWTEclipseExt(SWTWorkbenchBot bot) { this.bot = bot; - util = new SWTUtilExt(bot); + swtUtilExt = new SWTUtilExt(bot); } // ------------------------------------------------------------ @@ -124,7 +135,7 @@ // Wait for shell closing JavaProjectWizard waitForClosedShell(IDELabel.Shell.NEW_JAVA_PROJECT); - util.waitForNonIgnoredJobs(); + swtUtilExt.waitForNonIgnoredJobs(); } // ------------------------------------------------------------ @@ -143,7 +154,7 @@ bot.button(IDELabel.Button.FINISH).click(); waitForClosedShell(IDELabel.Shell.NEW_JAVA_CLASS); - util.waitForNonIgnoredJobs(); + swtUtilExt.waitForNonIgnoredJobs(); } /** @@ -270,8 +281,8 @@ * @param path */ public void assertSameContent(String pluginId, String projectName, String... path) { - File file = util.getResourceFile(pluginId, path); - String resourceContent = util.readTextFile(file); + File file = swtUtilExt.getResourceFile(pluginId, path); + String resourceContent = swtUtilExt.readTextFile(file); openAsText(projectName, path); SWTBotEclipseEditor editor = bot.editorByTitle(path[path.length - 1]).toTextEditor(); @@ -307,36 +318,11 @@ SWTBotEclipseEditor editor; editor = bot.editorByTitle(path[path.length - 1]).toTextEditor(); editor.selectRange(0, 0, editor.getLineCount()); - File file = util.getResourceFile(pluginId, path); - String content = util.readTextFile(file); + File file = swtUtilExt.getResourceFile(pluginId, path); + String content = swtUtilExt.readTextFile(file); editor.setText(content); if (save) editor.save(); } - /** - * Check if JBoss Developer Studio Is Running - * Dynamic version of isJBDSRun Method - * @return - */ - public boolean isJBDSRun (){ - return SWTEclipseExt.isJBDSRun(bot); - } - /** - * Check if JBoss Developer Studio Is Running - * @param bot - * @return - */ - public static boolean isJBDSRun (SWTWorkbenchBot bot){ - boolean jbdsIsRunning = false; - try{ - bot.menu(IDELabel.Menu.HELP).menu(IDELabel.Menu.ABOUT_JBOSS_DEVELOPER_STUDIO); - jbdsIsRunning = true; - }catch (WidgetNotFoundException wnfe){ - // do nothing - } - - return jbdsIsRunning; - - } } Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -0,0 +1,153 @@ + /******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ui.bot.ext; + +import org.apache.log4j.Logger; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.types.ViewType; +/** + * Provides JBoss Tools common operations based on SWTBot element operations + * @author Vladimir Pakan + * + */ +public class SWTJBTExt { + + SWTWorkbenchBot bot; + Logger log = Logger.getLogger(SWTJBTExt.class); + + public SWTJBTExt(SWTWorkbenchBot bot) { + this.bot = bot; + } + + /** + * Check if JBoss Developer Studio Is Running + * Dynamic version of isJBDSRun Method + * @return + */ + public boolean isJBDSRun (){ + return SWTJBTExt.isJBDSRun(bot); + } + /** + * Check if JBoss Developer Studio Is Running + * @param bot + * @return + */ + public static boolean isJBDSRun (SWTWorkbenchBot bot){ + boolean jbdsIsRunning = false; + try{ + bot.menu(IDELabel.Menu.HELP).menu(IDELabel.Menu.ABOUT_JBOSS_DEVELOPER_STUDIO); + jbdsIsRunning = true; + }catch (WidgetNotFoundException wnfe){ + // do nothing + } + + return jbdsIsRunning; + + } + /** + * Returns true when in Web Page of Wizard is defined at least one Server Runtime Instance + * @param bot + * @return + */ + public static boolean isServerDefinedInWebWizardPage(SWTWorkbenchBot bot){ + boolean isServerDefined = false; + try{ + bot.label(IDELabel.ImportJSFProjectDialog.CHOICE_LIST_IS_EMPTY); + } catch (WidgetNotFoundException wnfe){ + isServerDefined = true; + } + return isServerDefined; + } + /** + * Return true when in Web Page of Wizard is defined at least one Server Runtime Instance + * Dynamic version of isServerDefinedInWebWizardPage + * @return + */ + public boolean isServerDefinedInWebWizardPage(){ + return SWTJBTExt.isServerDefinedInWebWizardPage(bot); + } + /** + * Starts Application Server in Server View on position specified by index + * Dynamic version of startApplicationServer + * @param index - zero based Position of Server within Server Tree + */ + public void startApplicationServer(int index){ + SWTJBTExt.startApplicationServer(bot, index); + } + /** + * Starts Application Server in Server View on position specified by index + * @param bot + * @param index - zero based Position of Server within Server Tree + */ + public static void startApplicationServer(SWTWorkbenchBot bot , int index){ + SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.START,45*1000L); + } + /** + * Stops Application Server in Server View on position specified by index + * Dynamic version of stopApplicationServer + * @param index - zero based Position of Server within Server Tree + */ + public void stopApplicationServer(int index){ + SWTJBTExt.stopApplicationServer(bot, index); + } + /** + * Stops Application Server in Server View on position specified by index + * @param bot + * @param index - zero based Position of Server within Server Tree + */ + public static void stopApplicationServer(SWTWorkbenchBot bot , int index){ + SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.STOP,10*1000L); + } + /** + * Choose Server Popup Menu with specified label on Server with position specified by index + * @param bot + * @param index + * @param menuLabel + * @param timeOut + */ + public static void chooseServerPopupMenu(SWTWorkbenchBot bot , int index, String menuLabel, long timeOut){ + SWTEclipseExt swtEclipseExt = new SWTEclipseExt(bot); + SWTBot servers = swtEclipseExt.showView(ViewType.SERVERS); + SWTBotTree serverTree = servers.tree(); + + ContextMenuHelper.prepareTreeItemForContextMenu(serverTree, index); + + new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, + menuLabel, false)).click(); + swtEclipseExt.getSwtUtilExt().waitForAll(timeOut); + + } + /** + * Deletes Application Server in Server View on position specified by index + * Dynamic version of deleteApplicationServer + * @param index - zero based Position of Server within Server Tree + */ + public void deleteApplicationServer(int index){ + SWTJBTExt.deleteApplicationServer(bot, index); + } + /** + * Deletes Application Server in Server View on position specified by index + * @param bot + * @param index - zero based Position of Server within Server Tree + */ + public static void deleteApplicationServer(SWTWorkbenchBot bot , int index){ + SWTJBTExt.chooseServerPopupMenu(bot,index, IDELabel.Menu.DELETE,10*1000L); + bot.shell(IDELabel.Shell.DELETE_SERVER).activate(); + bot.button(IDELabel.Button.OK).click(); + } +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2009-12-17 16:53:58 UTC (rev 19427) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -63,23 +63,37 @@ /** * Wait for all running jobs not named in JobList.ignoredJobs + * @param timeOut */ - public void waitForNonIgnoredJobs() { - waitForAllExcept(JobLists.ignoredJobs); + public void waitForNonIgnoredJobs(long timeOut) { + waitForAllExcept(timeOut,JobLists.ignoredJobs); } + /** + * Wait for all running jobs not named in JobList.ignoredJobs + */ + public void waitForNonIgnoredJobs() { + waitForAllExcept(TIMEOUT,JobLists.ignoredJobs); + } /** * Wait for all running jobs */ - public void waitForAll() { - waitForAllExcept(new String[0]); + public void waitForAll(long timeOut) { + waitForAllExcept(timeOut,new String[0]); } - + /** + * Wait for all running jobs + * @param timeOut + */ + public void waitForAll() { + waitForAllExcept(TIMEOUT,new String[0]); + } /** * Wait for all running jobs except named jobs + * @param timeOut * @param jobNames */ - public void waitForAllExcept(String... jobNames) { + public void waitForAllExcept(long timeOut,String... jobNames) { // Find all jobs Job[] jobs = Job.getJobManager().find(null); @@ -101,7 +115,7 @@ names[i] = listNames.get(i); } - waitForJobs(names); + waitForJobs(timeOut,names); } /** @@ -142,8 +156,9 @@ } long waitTime = System.currentTimeMillis() - startTime; - if ((System.currentTimeMillis() - startTime) > TIMEOUT) { - log.info("Waiting for job " + jobName + " TIMEOUT"); + if ((System.currentTimeMillis() - startTime) > timeOut) { + log.info("Waiting for job " + jobName + " timeOut " + + timeOut + "s"); break; } log.info("Job \"" + jobName + "\" is running for " + waitTime Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2009-12-17 16:53:58 UTC (rev 19427) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -152,4 +152,18 @@ } } + /** + * Executes proper steps to be able call getContextMenu on Tree Item within tree on specified position + * @param tree + * @param index - zero based index of Tree Item to be selected + */ + public static void prepareTreeItemForContextMenu(SWTBotTree tree, int index){ + + tree.setFocus(); + SWTBotTreeItem[] treeItems = tree.getAllItems(); + if (treeItems.length > 0){ + ContextMenuHelper.prepareTreeItemForContextMenu(tree,treeItems[index]); + } + + } } 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 2009-12-17 16:53:58 UTC (rev 19427) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -52,6 +52,8 @@ public static final String DELETE = "Delete"; public static final String JBDS_REMOVE_JSF_CAPABILITIES = "Remove Red Hat Capabilities"; public static final String JBT_REMOVE_JSF_CAPABILITIES = "Remove JSF Capabilities"; + public static final String START = "Start"; + public static final String STOP = "Stop"; } @@ -83,6 +85,7 @@ public static final String NEW_XHTML_FILE = "New File XHTML"; public static final String IMPORT_JSF_PROJECT = "Import JSF Project"; public static final String IMPORT = "Import"; + public static final String DELETE_SERVER = "Delete Server"; } public class EntityGroup { @@ -121,12 +124,14 @@ public static final String PROJECT_EXPLORER = "Project Explorer"; public static final String PACKAGE_EXPLORER = "Package Explorer"; public static final String DATA_SOURCE_EXPLORER = "Data Source Explorer"; + public static final String SERVERS = "Servers"; } public class ViewGroup { public static final String GENERAL = "General"; public static final String JAVA = "Java"; public static final String DATA_MANAGEMENT = "Data Management"; + public static final String SERVER = "Server"; } public class SelectPerspectiveDialog { @@ -228,7 +233,7 @@ public static final class ServerJobName { - public static final String STARTING_JBOSS_EAP_43_RUNTIME = "Starting JBoss EAP 4.3 Runtime Serve"; + public static final String STARTING_JBOSS_EAP_43_RUNTIME = "Starting JBoss EAP 4.3 Runtime Server"; public static final String STOPPING_JBOSS_EAP_43_RUNTIME = "Stoppig JBoss EAP 4.3 Runtime Server"; public static final String STARTING_JBOSS_EAP = "Starting jboss-eap"; public static final String STOPPING_JBOSS_EAP = "Stopping jboss-eap"; Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/ViewType.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/ViewType.java 2009-12-17 16:53:58 UTC (rev 19427) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/ViewType.java 2009-12-17 16:57:00 UTC (rev 19428) @@ -18,7 +18,7 @@ * */ public enum ViewType { - PACKAGE_EXPLORER, PROJECT_EXPLORER, WELCOME, DATA_SOURCE_EXPLORER; + PACKAGE_EXPLORER, PROJECT_EXPLORER, WELCOME, DATA_SOURCE_EXPLORER,SERVERS; public String getGroupLabel() { @@ -27,6 +27,7 @@ case PROJECT_EXPLORER: viewLabel = IDELabel.ViewGroup.GENERAL; break; case PACKAGE_EXPLORER: viewLabel = IDELabel.ViewGroup.JAVA; break; case DATA_SOURCE_EXPLORER: viewLabel = IDELabel.ViewGroup.DATA_MANAGEMENT; break; + case SERVERS: viewLabel = IDELabel.ViewGroup.SERVER; break; default: fail("Unknown View Type"); } return viewLabel; @@ -38,6 +39,7 @@ case PROJECT_EXPLORER: viewLabel = IDELabel.View.PROJECT_EXPLORER; break; case PACKAGE_EXPLORER: viewLabel = IDELabel.View.PACKAGE_EXPLORER; break; case DATA_SOURCE_EXPLORER: viewLabel = IDELabel.View.DATA_SOURCE_EXPLORER; break; + case SERVERS: viewLabel = IDELabel.View.SERVERS; break; default: fail("Unknown View Type"); } return viewLabel;