Author: jjankovi Date: 2012-02-01 03:38:15 -0500 (Wed, 01 Feb 2012) New Revision: 38360 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java Log: CreateDD moved from SampleWSBase to ProjectHelper Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2012-02-01 07:11:41 UTC (rev 38359) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2012-02-01 08:38:15 UTC (rev 38360) @@ -23,12 +23,9 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ws.ui.bot.test.WSTestBase; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSimpleWSWizardAction; -import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.SampleWSWizard; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.SimpleWSWizard; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Type; @@ -44,17 +41,6 @@ protected static final String SOAP_REQUEST = getSoapRequest("<ns1:sayHello xmlns:ns1=\"http://{0}/\"><arg0>{1}</arg0></ns1:sayHello>"); protected static final String SERVER_URL = "localhost:8080"; - protected void createDD(String project) { - SWTBotTree tree = projectExplorer.bot().tree(); - SWTBotTreeItem ti = tree.expandNode(project); - bot.sleep(1500); - ti = ti.getNode("Deployment Descriptor: " + project); - new TreeItemAction(ti, "Generate Deployment Descriptor Stub").run(); - bot.sleep(1500); - util.waitForNonIgnoredJobs(); - bot.sleep(1500); - } - protected IProject getProject(String project) { return ResourcesPlugin.getWorkspace().getRoot().getProject(project); } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360) @@ -30,7 +30,7 @@ public void testSampleRestWS() { IFile dd = getDD(getWsProjectName()); if (!dd.exists()) { - createDD(getWsProjectName()); + projectHelper.createDD(getWsProjectName()); } assertTrue(dd.exists()); createSampleRESTWS(getWsProjectName(), "RESTSample", "rest.sample", "Sample", "RESTApp"); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360) @@ -30,7 +30,7 @@ public void testSampleSoapWS() { IFile dd = getDD(getWsProjectName()); if (!dd.exists()) { - createDD(getWsProjectName()); + projectHelper.createDD(getWsProjectName()); } assertTrue(dd.exists()); createSampleSOAPWS(getWsProjectName(), "HelloService", "sample", "SampleService"); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360) @@ -31,7 +31,7 @@ public void testSimpleRestWS() { IFile dd = getDD(getWsProjectName()); if (!dd.exists()) { - createDD(getWsProjectName()); + projectHelper.createDD(getWsProjectName()); } assertTrue(dd.exists()); createSimpleRESTWS(getWsProjectName(), "RESTSample", "rest.sample", "Sample", "RESTApp"); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360) @@ -31,7 +31,7 @@ public void testSimpleSoapWS() { IFile dd = getDD(getWsProjectName()); if (!dd.exists()) { - createDD(getWsProjectName()); + projectHelper.createDD(getWsProjectName()); } assertTrue(dd.exists()); createSimpleSOAPWS(getWsProjectName(), "HelloService", "sample", "SampleService"); Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-02-01 07:11:41 UTC (rev 38359) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-02-01 08:38:15 UTC (rev 38360) @@ -14,11 +14,14 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JavaEEEnterpriseApplicationProject; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.WebServicesWSDL; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction; +import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.DynamicWebProjectWizard; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard; @@ -94,4 +97,19 @@ projectExplorer.selectProject(name); } + /** + * Method generates Deployment Descriptor for entered project + * @param project + */ + public void createDD(String project) { + SWTBotTree tree = projectExplorer.bot().tree(); + SWTBotTreeItem ti = tree.expandNode(project); + bot.sleep(1500); + ti = ti.getNode("Deployment Descriptor: " + project); + new TreeItemAction(ti, "Generate Deployment Descriptor Stub").run(); + bot.sleep(1500); + util.waitForNonIgnoredJobs(); + bot.sleep(1500); + } + }