Author: jjankovi Date: 2011-08-09 07:36:01 -0400 (Tue, 09 Aug 2011) New Revision: 33715 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project 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/wizard/CdiATWizardTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.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/.project =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project 2011-08-09 10:43:35 UTC (rev 33714) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/.project 2011-08-09 11:36:01 UTC (rev 33715) @@ -20,9 +20,26 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.cdi.core.cdibuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.cdi.core.cdinature</nature> </natures> </projectDescription> 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-09 10:43:35 UTC (rev 33714) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-09 11:36:01 UTC (rev 33715) @@ -11,6 +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.wizard.CdiATWizardTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; @@ -38,7 +39,9 @@ */ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ - CdiATWizardTest.class, - BeansEditorTest.class}) + //CdiATWizardTest.class, + //BeansEditorTest.class, + QuickFixTest.class + }) public class CDIAllBotTests { } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-08-09 10:43:35 UTC (rev 33714) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CdiATWizardTest.java 2011-08-09 11:36:01 UTC (rev 33715) @@ -326,12 +326,12 @@ public void testBeansXml() { CDIWizard w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run(); w.setSourceFolder(PROJECT_NAME + "/WebContent/WEB-INF"); - assertFalse(w.canFinish()); + assertTrue(w.canFinish()); w.setSourceFolder(PROJECT_NAME + "/src/cdi"); assertTrue(w.canFinish()); w.finish(); w = new NewCDIFileWizard(CDIWizardType.BEANS_XML).run(); - assertFalse(w.canFinish()); + assertTrue(w.canFinish()); w.cancel(); } Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project 2011-08-09 10:43:35 UTC (rev 33714) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/.project 2011-08-09 11:36:01 UTC (rev 33715) @@ -31,4 +31,11 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> + <linkedResources> + <link> + <name>lib-org.jboss.tools.jst.web.kb_3.3.0.v20110807-2237-H432-M3</name> + <type>2</type> + <location>/home/jjankovi/Dokumenty/JBDS/JBDS_5.0.0.M3/studio/plugins/org.jboss.tools.jst.web.kb_3.3.0.v20110807-2237-H432-M3</location> + </link> + </linkedResources> </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-09 10:43:35 UTC (rev 33714) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-09 11:36:01 UTC (rev 33715) @@ -23,10 +23,13 @@ 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.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.entity.JavaProjectEntity; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction; import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction; import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.SampleWSWizard; @@ -64,7 +67,7 @@ protected String getWsName() { return null; } - + @Test public void testSampleSoapWS() { IFile dd = getDD(getWsProjectName()); @@ -79,6 +82,7 @@ checkSOAPService(getWsProjectName(), "GreetService", "greeter", "Greeter", "Tester"); } + @Test public void testSampleRestWS() { if ("JBOSS_AS".equals(configuredState.getServer().type)) { @@ -94,7 +98,33 @@ createSampleRESTWS(project, "RESTSample", "rest.sample", "Sample", "RESTApp"); checkRESTService(project, "RESTSample", "rest.sample", "Sample", "Hello World!", "RESTApp"); } - + + + + /* + * Adding Rest support through context menu is available from JBT 3.3.0 M2 + */ + @Test + public void testImportRestSupport() { + String projectName = "RestLessProject"; + 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); + new TreeItemAction(ti, "Configure","Add JAX-RS 1.1 support...").run(); + bot.sleep(500); + util.waitForNonIgnoredJobs(); + try { + ti.getNode("RESTful Web Services"); + }catch (WidgetNotFoundException exc) { + fail("REST support was not configured properly"); + } + } + private void createDD(String project) { SWTBotTree tree = projectExplorer.bot().tree(); SWTBotTreeItem ti = tree.expandNode(project);