Author: jjankovi Date: 2011-08-10 02:46:57 -0400 (Wed, 10 Aug 2011) New Revision: 33754 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java Log: Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-10 04:37:20 UTC (rev 33753) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-10 06:46:57 UTC (rev 33754) @@ -11,7 +11,7 @@ package org.jboss.tools.cdi.bot.test; import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest; -//import org.jboss.tools.cdi.bot.test.fix.QuickFixTest; +import org.jboss.tools.cdi.bot.test.fix.QuickFixTest; import org.jboss.tools.cdi.bot.test.wizard.CdiATWizardTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; @@ -39,9 +39,9 @@ */ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ - //CdiATWizardTest.class, - //BeansEditorTest.class, -// QuickFixTest.class + CdiATWizardTest.class, + BeansEditorTest.class, + QuickFixTest.class }) public class CDIAllBotTests { } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project 2011-08-10 04:37:20 UTC (rev 33753) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.project 2011-08-10 06:46:57 UTC (rev 33754) @@ -6,6 +6,11 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -36,5 +41,6 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> </natures> </projectDescription> Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-10 04:37:20 UTC (rev 33753) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-10 06:46:57 UTC (rev 33754) @@ -24,6 +24,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; @@ -110,11 +111,11 @@ JavaProjectEntity javaProject = new JavaProjectEntity(); javaProject.setProjectName(projectName); eclipse.createJavaProject(javaProject); - SWTBotTree tree = projectExplorer.bot().tree(); assertTrue("Project " + projectName + " was not created properly", SWTEclipseExt.treeContainsItemWithLabel(tree, projectName)); - SWTBotTreeItem ti = tree.expandNode(projectName); + SWTBotTreeItem ti = tree.expandNode(projectName); + new TreeItemAction(ti, "Configure","Add JAX-RS 1.1 support...").run(); bot.sleep(500); util.waitForNonIgnoredJobs(); @@ -136,10 +137,13 @@ bot.sleep(1500); } + // createSampleSOAPWS(getWsProjectName(), "HelloService", "sample", "SampleService"); + //createSampleService(Type.SOAP, project, name, pkg, cls, null); private void createSampleSOAPWS(String project, String name, String pkg, String cls) { createSampleService(Type.SOAP, project, name, pkg, cls, null); } + //checkSOAPService(getWsProjectName(), "HelloService", "sample", "SampleService", "You"); private void checkSOAPService(String project, String svcName, String svcPkg, String svcClass, String msgContent) { checkService(Type.SOAP, project, svcName, svcPkg, svcClass, msgContent, null); } @@ -152,6 +156,10 @@ createSampleService(Type.REST, project, name, pkg, cls, appCls); } + + + // createSampleSOAPWS(getWsProjectName(), "HelloService", "sample", "SampleService"); + //createSampleService(Type.SOAP, project, name, pkg, cls, null); private void createSampleService(Type type, String project, String name, String pkg, String cls, String appCls) { SampleWSWizard w = new NewSampleWSWizardAction(type).run(); w.setProjectName(project).setServiceName(name);