Author: rawagner Date: 2012-02-15 08:59:43 -0500 (Wed, 15 Feb 2012) New Revision: 38751 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/ConfiguratorsTest.java Removed: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MaterializeLibraryTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Utils.java Log: Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-15 11:31:38 UTC (rev 38750) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-15 13:59:43 UTC (rev 38751) @@ -65,9 +65,10 @@ <!-- configurator test --> <dependency> <type>p2-installable-unit</type> - <artifactId>org.jboss.tools.jsf.feature.feature.group</artifactId> + <artifactId>org.jboss.tools.ws.jaxrs.feature.feature.group</artifactId> <version>0.0.0</version> </dependency> + <!-- seam test --> <dependency> <type>p2-installable-unit</type> @@ -98,7 +99,6 @@ <artifactId>org.jboss.tools.maven.jbosspackaging.feature.feature.group</artifactId> <version>0.0.0</version> </dependency> - <dependency> <type>p2-installable-unit</type> <artifactId>org.jboss.tools.maven.feature.feature.group</artifactId> Deleted: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-02-15 11:31:38 UTC (rev 38750) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-02-15 13:59:43 UTC (rev 38751) @@ -1,301 +0,0 @@ -package org.jboss.tools.maven.ui.bot.test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.StringWriter; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.project.IMavenProjectFacade; -import org.eclipse.m2e.tests.common.WorkspaceHelpers; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; -import org.jboss.tools.ui.bot.ext.SWTBotExt; -import org.jboss.tools.ui.bot.ext.SWTUtilExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -@SuppressWarnings("restriction") -@Require(perspective="Java EE") -public class Configurators { - - public static final String PROJECT_NAME_JSF="testWEB_JSF"; - public static final String PROJECT_NAME_CDI="testWEB_CDI"; - public static final String PROJECT_NAME_CDI_EJB="test_CDI_EJB"; - public static final String JSF_NATURE="org.jboss.tools.jsf.jsfnature"; - public static final String JAXRS_NATURE="org.jboss.tools.ws.jaxrs.nature"; - public static final String CDI_NATURE="org.jboss.tools.cdi.core.cdinature"; - public static final String JBOSS6_AS_HOME=System.getProperty("jbosstools.test.jboss.home.6.0"); - - private SWTBotExt botExt = new SWTBotExt(); - private SWTUtilExt botUtil = new SWTUtilExt(botExt); - - - @BeforeClass - public static void setup(){ - SWTBotExt setup = new SWTBotExt(); - setup.menu("Window").menu("Show View").menu("Other...").click(); - setup.tree().expandNode("Java").select("Package Explorer").click(); - setup.button("OK").click(); - } - - @Before - public void clean() throws InterruptedException, CoreException{ - WorkspaceHelpers.cleanWorkspace(); - } - - //TODO https://issues.jboss.org/browse/JBIDE-10468 - //https://issues.jboss.org/browse/JBIDE-10831 - @Test - public void testJSFConfigurator() throws Exception{ - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false); - addDependencies(PROJECT_NAME_JSF, "com.sun.faces", "mojarra-jsf-api", "2.0.0-b04"); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE)); - clean(); - /* - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false); - addFacesConf(PROJECT_NAME_JSF); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE)); - clean(); - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false); - addServlet(PROJECT_NAME_JSF,"Faces Servlet","javax.faces.webapp.FacesServlet","1"); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE)); - IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools", PROJECT_NAME_JSF,"0.0.1-SNAPSHOT"); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have faces-config.xml file",facade.getProject().getFile("faces-config.xml") != null); - clean(); - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, true); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE)); - */ - - - } - - - @Test - public void testCDIConfigurator() throws Exception{ - createMavenizedDynamicWebProject(PROJECT_NAME_CDI, false); - addDependencies(PROJECT_NAME_CDI, "javax.enterprise", "cdi-api","1.1.EDR1.2"); - assertTrue("Project "+PROJECT_NAME_CDI+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI, CDI_NATURE)); - createMavenizedEJBProject(PROJECT_NAME_CDI_EJB, false); - addDependencies(PROJECT_NAME_CDI_EJB, "javax.enterprise", "cdi-api","1.1.EDR1.2"); - assertTrue("Project "+PROJECT_NAME_CDI_EJB+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB, CDI_NATURE)); - clean(); - createMavenizedDynamicWebProject(PROJECT_NAME_CDI, true); - assertTrue("Project "+PROJECT_NAME_CDI+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI, CDI_NATURE)); - createMavenizedEJBProject(PROJECT_NAME_CDI_EJB, true); - assertTrue("Project "+PROJECT_NAME_CDI_EJB+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB, CDI_NATURE)); - } - - @Test - public void testJAXRSConfigurator() throws Exception { - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false); - addDependencies(PROJECT_NAME_JSF, "com.cedarsoft.rest", "jersey", "1.0.0"); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JAXRS_NATURE)); - clean(); - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false); - addDependencies(PROJECT_NAME_JSF, "org.jboss.jbossas", "jboss-as-resteasy", "6.1.0.Final"); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JAXRS_NATURE)); - clean(); - createMavenizedDynamicWebProject(PROJECT_NAME_JSF, true); - assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JAXRS_NATURE)); - } - - - private void createMavenizedDynamicWebProject(String projectName, boolean runtime) throws Exception{ - botExt.menu("File").menu("New").menu("Dynamic Web Project").click(); - botExt.textWithLabel("Project name:").setText(projectName); - if(runtime){ - botExt.button("New Runtime...").click(); - Thread.sleep(500); - botExt.tree().expandNode("JBoss Community").select("JBoss 6.x Runtime"); - botExt.button("Next >").click(); - botExt.textWithLabel("Home Directory").setText(JBOSS6_AS_HOME); - botExt.button("Finish").click(); - } else { - botExt.comboBoxInGroup("Target runtime").setSelection("<None>"); - } - botExt.button("Next >").click(); - botExt.button("Next >").click(); - botExt.checkBox("Generate web.xml deployment descriptor").select(); - botExt.button("Finish").click(); - botUtil.waitForAll(Long.MAX_VALUE); - Utils.waitForIdle(); - SWTBotTreeItem item = botExt.viewByTitle("Package Explorer").bot().tree().getTreeItem(projectName).select(); - item.pressShortcut(Keystrokes.ALT,Keystrokes.LF); - SWTBot shellProperties = botExt.shell("Properties for "+projectName).activate().bot(); - shellProperties.tree().select("Project Facets"); - shellProperties.tree(1).getTreeItem("JBoss Maven Integration").check(); - botUtil.waitForAll(); - Thread.sleep(500); - botExt.hyperlink("Further configuration required...").click(); - botExt.button("OK").click(); - botExt.button("OK").click(); - botUtil.waitForAll(); - assertTrue("Web project doesn't have maven nature",Utils.isMavenProject(projectName)); - updateConf(projectName); - if(runtime){ - assertTrue("Project "+projectName+" doesn't have "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE)); - assertTrue("Project "+projectName+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE)); - assertTrue("Project "+projectName+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE)); - } else { - assertFalse("Project "+projectName+" have "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE)); - assertFalse("Project "+projectName+" have "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE)); - assertFalse("Project "+projectName+" have "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE)); - } - } - - private void createMavenizedEJBProject(String projectName, boolean runtime)throws Exception{ - botExt.menu("File").menu("New").menu("EJB Project").click(); - botExt.textWithLabel("Project name:").setText(projectName); - if(runtime){ - botExt.button("New Runtime...").click(); - Thread.sleep(500); - botExt.tree().expandNode("JBoss Community").select("JBoss 6.x Runtime"); - botExt.button("Next >").click(); - botExt.textWithLabel("Home Directory").setText(JBOSS6_AS_HOME); - botExt.button("Finish").click(); - } else { - botExt.comboBoxInGroup("Target runtime").setSelection("<None>"); - } - botExt.button("Finish").click(); - botUtil.waitForAll(Long.MAX_VALUE); - Utils.waitForIdle(); - SWTBotTreeItem item = botExt.viewByTitle("Package Explorer").bot().tree().getTreeItem(projectName).select(); - item.pressShortcut(Keystrokes.ALT,Keystrokes.LF); - SWTBot shellProperties = botExt.shell("Properties for "+projectName).activate().bot(); - shellProperties.tree().select("Project Facets"); - shellProperties.tree(1).getTreeItem("JBoss Maven Integration").check(); - botUtil.waitForAll(); - Thread.sleep(500); - botExt.hyperlink("Further configuration required...").click(); - botExt.button("OK").click(); - botExt.button("OK").click(); - botUtil.waitForAll(); - assertTrue("EJB project doesn't have maven nature",Utils.isMavenProject(projectName)); - updateConf(projectName); - assertFalse("Project "+projectName+" have "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE)); - assertFalse("Project "+projectName+" have "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE)); - assertFalse("Project "+projectName+" have "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE)); - - } - - private void addDependencies(String projectName, String groupId, String artifactId, String version) throws Exception{ - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder = factory.newDocumentBuilder(); - Document docPom = docBuilder.parse(project.getProject().getFile("pom.xml").getContents()); - Element dependenciesElement = docPom.createElement("dependencies"); - Element dependencyElement = docPom.createElement("dependency"); - Element groupIdElement = docPom.createElement("groupId"); - Element artifactIdElement = docPom.createElement("artifactId"); - Element versionElement = docPom.createElement("version"); - - groupIdElement.setTextContent(groupId); - artifactIdElement.setTextContent(artifactId); - versionElement.setTextContent(version); - - Element root = docPom.getDocumentElement(); - dependencyElement.appendChild(groupIdElement); - dependencyElement.appendChild(artifactIdElement); - dependencyElement.appendChild(versionElement); - dependenciesElement.appendChild(dependencyElement); - root.appendChild(dependenciesElement); - TransformerFactory transfac = TransformerFactory.newInstance(); - Transformer trans = transfac.newTransformer(); - StringWriter xmlAsWriter = new StringWriter(); - StreamResult result = new StreamResult(xmlAsWriter); - DOMSource source = new DOMSource(docPom); - trans.transform(source, result); - project.getProject().getFile("pom.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null); - botUtil.waitForAll(); - updateConf(projectName); - } - - private void removeFacets(String projectName) throws Exception{ - IProject facade = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - assertTrue(facade != null); - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder = factory.newDocumentBuilder(); - Document docPom = docBuilder.parse(facade.getProject().getFile(".project").getContents()); - Element root = docPom.getDocumentElement(); - Node natures = root.getElementsByTagName("natures").item(0); - NodeList natureChilds = natures.getChildNodes(); - for(int i = 0; i<natureChilds.getLength()-1; i++){ - if(natureChilds.item(i).getTextContent().equals(JSF_NATURE) || - natureChilds.item(i).getTextContent().equals(JAXRS_NATURE) || - natureChilds.item(i).getTextContent().equals(CDI_NATURE)) { - natures.removeChild(natureChilds.item(i)); - } - } - updateConf(projectName); - - } - - private void updateConf(String projectName){ - SWTBotTree innerBot = botExt.viewByTitle("Package Explorer").bot().tree().select(projectName); - ContextMenuHelper.clickContextMenu(innerBot, "Maven","Update Project Configuration..."); - botExt.button("OK").click(); - botUtil.waitForAll(); - } - - private void addFacesConf(String projectName){ - SWTBotTree innerBot = botExt.viewByTitle("Package Explorer").bot().tree().select(projectName); - ContextMenuHelper.clickContextMenu(innerBot, "New","Other..."); - botExt.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("Faces Config"); - botExt.button("Next >").click(); - botExt.button("Finish").click(); - updateConf(projectName); - } - - private void addServlet(String projectName, String servletName, String servletClass, String load) throws Exception{ - IProject facade = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder docBuilder = factory.newDocumentBuilder(); - Document docPom = docBuilder.parse(facade.getProject().getFile("web.xml").getContents()); - Element servletElement = docPom.createElement("servlet"); - Element servletNameElement = docPom.createElement("servlet-name"); - Element servletClassElement = docPom.createElement("servlet-class"); - Element loadElement = docPom.createElement("load-on-startup"); - - servletNameElement.setTextContent(servletName); - servletClassElement.setTextContent(servletClass); - loadElement.setTextContent(load); - - Element root = docPom.getDocumentElement(); - servletElement.appendChild(servletNameElement); - servletElement.appendChild(servletClassElement); - servletElement.appendChild(loadElement); - root.appendChild(servletElement); - TransformerFactory transfac = TransformerFactory.newInstance(); - Transformer trans = transfac.newTransformer(); - StringWriter xmlAsWriter = new StringWriter(); - StreamResult result = new StreamResult(xmlAsWriter); - DOMSource source = new DOMSource(docPom); - trans.transform(source, result); - facade.getProject().getFile("web.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null); - botUtil.waitForAll(); - updateConf(projectName); - } -} Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/ConfiguratorsTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/ConfiguratorsTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/ConfiguratorsTest.java 2012-02-15 13:59:43 UTC (rev 38751) @@ -0,0 +1,317 @@ +package org.jboss.tools.maven.ui.bot.test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.StringWriter; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.m2e.tests.common.WorkspaceHelpers; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +@SuppressWarnings("restriction") +@Require(perspective="Java EE") +public class ConfiguratorsTest { + + public static final String PROJECT_NAME_JSF="testWEB_JSF"; + public static final String PROJECT_NAME_JAXRS="testWEB_JAXRS"; + public static final String PROJECT_NAME_CDI="testWEB_CDI"; + public static final String PROJECT_NAME_CDI_EJB="testEJB_CDI"; + public static final String JSF_NATURE="org.jboss.tools.jsf.jsfnature"; + public static final String JAXRS_NATURE="org.jboss.tools.ws.jaxrs.nature"; + public static final String CDI_NATURE="org.jboss.tools.cdi.core.cdinature"; + public static final String JBOSS6_AS_HOME=System.getProperty("jbosstools.test.jboss.home.6.0"); + + + private SWTBotExt botExt = new SWTBotExt(); + private SWTUtilExt botUtil = new SWTUtilExt(botExt); + + + @BeforeClass + public static void setup(){ + SWTBotExt setup = new SWTBotExt(); + setup.menu("Window").menu("Show View").menu("Other...").click(); + setup.tree().expandNode("Java").select("Package Explorer").click(); + setup.button("OK").click(); + } + + @Before + public void clean() throws InterruptedException, CoreException{ + WorkspaceHelpers.cleanWorkspace(); + } + + //https://issues.jboss.org/browse/JBIDE-10468 + //https://issues.jboss.org/browse/JBIDE-10831 + @Test + public void testJSFConfigurator() throws Exception{ + createMavenizedDynamicWebProject(PROJECT_NAME_JSF+"_noRuntime", false); + addDependencies(PROJECT_NAME_JSF+"_noRuntime", "com.sun.faces", "mojarra-jsf-api", "2.0.0-b04"); + assertTrue("Project "+PROJECT_NAME_JSF+"_noRuntime"+" with mojarra dependency doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF+"_noRuntime", JSF_NATURE)); + clean(); + + createMavenizedDynamicWebProject(PROJECT_NAME_JSF+"_noRuntime", false); + addFacesConf(PROJECT_NAME_JSF+"_noRuntime"); + assertTrue("Project "+PROJECT_NAME_JSF+"_noRuntime"+" with faces config doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF+"_noRuntime", JSF_NATURE)); + clean(); + //https://issues.jboss.org/browse/JBIDE-10831 + createMavenizedDynamicWebProject(PROJECT_NAME_JSF+"_noRuntime", false); + addServlet(PROJECT_NAME_JSF+"_noRuntime","Faces Servlet","javax.faces.webapp.FacesServlet","1"); + assertTrue("Project "+PROJECT_NAME_JSF+"_noRuntime"+"with servlet in web.xml doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF+"_noRuntime", JSF_NATURE)); + IProject facade = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME_JSF+"_noRuntime"); + assertTrue("Project "+PROJECT_NAME_JSF+"_noRuntime"+" doesn't have faces-config.xml file",facade.getProject().getFile("faces-config.xml") != null); + + createMavenizedDynamicWebProject(PROJECT_NAME_JSF, true); + assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE)); + + + //https://issues.jboss.org/browse/JBIDE-8755 + createMavenizedDynamicWebProject(PROJECT_NAME_JSF+"_seam", false); + addDependencies(PROJECT_NAME_JSF+"_seam", "org.jboss.seam.faces", "seam-faces", "3.0.0.Alpha3"); + assertTrue("Project "+PROJECT_NAME_JSF+"_seam"+" with seam-faces3 dependency doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF+"_seam", JSF_NATURE)); + + + + } + + + @Test + public void testCDIConfigurator() throws Exception{ + createMavenizedDynamicWebProject(PROJECT_NAME_CDI+"_noRuntime", false); + addDependencies(PROJECT_NAME_CDI+"_noRuntime", "javax.enterprise", "cdi-api","1.1.EDR1.2"); + assertTrue("Project "+PROJECT_NAME_CDI+"_noRuntime"+" with cdi dependency doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI+"_noRuntime", CDI_NATURE)); + + createMavenizedEJBProject(PROJECT_NAME_CDI_EJB+"_noRuntime", false); + addDependencies(PROJECT_NAME_CDI_EJB+"_noRuntime", "javax.enterprise", "cdi-api","1.1.EDR1.2"); + assertTrue("Project "+PROJECT_NAME_CDI_EJB+"_noRuntime"+" with cdi dependency doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB+"_noRuntime", CDI_NATURE)); + + createMavenizedDynamicWebProject(PROJECT_NAME_CDI, true); + assertFalse("Project "+PROJECT_NAME_CDI+" has "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI, CDI_NATURE)); + + createMavenizedEJBProject(PROJECT_NAME_CDI_EJB, true); + assertFalse("Project "+PROJECT_NAME_CDI_EJB+" has "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB, CDI_NATURE)); + + + //https://issues.jboss.org/browse/JBIDE-8755 + createMavenizedDynamicWebProject(PROJECT_NAME_CDI+"_noRuntime_seam", false); + addDependencies(PROJECT_NAME_CDI+"_noRuntime_seam", "org.jboss.seam.faces", "seam-faces", "3.0.0.Alpha3"); + assertTrue("Project "+PROJECT_NAME_CDI+"_noRuntime_seam"+" with seam-faces3 dependency doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI+"_noRuntime_seam", CDI_NATURE)); + + createMavenizedEJBProject(PROJECT_NAME_CDI_EJB+"_noRuntime_seam", false); + addDependencies(PROJECT_NAME_CDI_EJB+"_noRuntime_seam", "org.jboss.seam.faces", "seam-faces", "3.0.0.Alpha3"); + assertTrue("Project "+PROJECT_NAME_CDI_EJB+"_noRuntime_seam"+" with seam-faces3 dependency doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB+"_noRuntime_seam", CDI_NATURE)); + clean(); + + createMavenizedDynamicWebProject(PROJECT_NAME_CDI+"_noRuntime_seam", false); + addDependencies(PROJECT_NAME_CDI+"_noRuntime_seam", "org.jboss.seam.international", "seam-international", "3.0.0.Alpha1"); + assertTrue("Project "+PROJECT_NAME_CDI+"_noRuntime_seam"+" with seam3 dependency doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI+"_noRuntime_seam", CDI_NATURE)); + + createMavenizedEJBProject(PROJECT_NAME_CDI_EJB+"_noRuntime_seam", false); + addDependencies(PROJECT_NAME_CDI_EJB+"_noRuntime_seam", "org.jboss.seam.international", "seam-international", "3.0.0.Alpha1"); + assertTrue("Project "+PROJECT_NAME_CDI_EJB+"_noRuntime_seam"+" with seam3 dependency doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB+"_noRuntime_seam", CDI_NATURE)); + + } + + @Test + public void testJAXRSConfigurator() throws Exception { + createMavenizedDynamicWebProject(PROJECT_NAME_JAXRS+"_noRuntime", false); + addDependencies(PROJECT_NAME_JAXRS+"_noRuntime", "com.cedarsoft.rest", "jersey", "1.0.0"); + assertTrue("Project "+PROJECT_NAME_JAXRS+"_noRuntime"+" with jersey dependency doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JAXRS+"_noRuntime", JAXRS_NATURE)); + clean(); + createMavenizedDynamicWebProject(PROJECT_NAME_JAXRS+"_noRuntime", false); + addDependencies(PROJECT_NAME_JAXRS+"_noRuntime", "org.jboss.jbossas", "jboss-as-resteasy", "6.1.0.Final"); + assertTrue("Project "+PROJECT_NAME_JAXRS+"_noRuntime"+" with resteasy dependency doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JAXRS+"_noRuntime", JAXRS_NATURE)); + + createMavenizedDynamicWebProject(PROJECT_NAME_JAXRS, true); + assertTrue("Project "+PROJECT_NAME_JAXRS+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JAXRS, JAXRS_NATURE)); + } + + + private void createMavenizedDynamicWebProject(String projectName, boolean runtime) throws Exception{ + botExt.menu("File").menu("New").menu("Dynamic Web Project").click(); + botExt.textWithLabel("Project name:").setText(projectName); + if(runtime){ + botExt.button("New Runtime...").click(); + Thread.sleep(500); + botExt.tree().expandNode("JBoss Community").select("JBoss 6.x Runtime"); + botExt.button("Next >").click(); + botExt.textWithLabel("Home Directory").setText(JBOSS6_AS_HOME); + botExt.button("Finish").click(); + } else { + botExt.comboBoxInGroup("Target runtime").setSelection("<None>"); + } + Utils.waitForShell(botUtil, "New Dynamic Web Project"); + botExt.button("Next >").click(); + Utils.waitForShell(botUtil, "New Dynamic Web Project"); + botExt.button("Next >").click(); + Utils.waitForShell(botUtil, "New Dynamic Web Project"); + botExt.checkBox("Generate web.xml deployment descriptor").select(); + botExt.button("Finish").click(); + botUtil.waitForAll(Long.MAX_VALUE); + Utils.waitForIdle(); + SWTBotTreeItem item = botExt.viewByTitle("Package Explorer").bot().tree().getTreeItem(projectName).select(); + item.pressShortcut(Keystrokes.ALT,Keystrokes.LF); + SWTBot shellProperties = botExt.shell("Properties for "+projectName).activate().bot(); + shellProperties.tree().select("Project Facets"); + shellProperties.tree(1).getTreeItem("JBoss Maven Integration").check(); + botUtil.waitForAll(); + Thread.sleep(500); + botExt.hyperlink("Further configuration required...").click(); + botExt.button("OK").click(); + botExt.button("OK").click(); + botUtil.waitForAll(); + assertTrue(projectName+ " doesn't have maven nature",Utils.isMavenProject(projectName)); + updateConf(projectName); + if(runtime){ + assertTrue("Project "+projectName+" doesn't have "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE)); + assertTrue("Project "+projectName+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE)); + assertFalse("Project "+projectName+" has "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE)); + } else { + assertFalse("Project "+projectName+" has "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE)); + assertFalse("Project "+projectName+" has "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE)); + assertFalse("Project "+projectName+" has "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE)); + } + } + + private void createMavenizedEJBProject(String projectName, boolean runtime)throws Exception{ + botExt.menu("File").menu("New").menu("EJB Project").click(); + botExt.textWithLabel("Project name:").setText(projectName); + if(runtime){ + botExt.button("New Runtime...").click(); + Thread.sleep(500); + botExt.tree().expandNode("JBoss Community").select("JBoss 6.x Runtime"); + botExt.button("Next >").click(); + botExt.textWithLabel("Home Directory").setText(JBOSS6_AS_HOME); + botExt.button("Finish").click(); + } else { + botExt.comboBoxInGroup("Target runtime").setSelection("<None>"); + } + Utils.waitForShell(botUtil, "New EJB Project"); + botExt.button("Finish").click(); + botUtil.waitForAll(Long.MAX_VALUE); + Utils.waitForIdle(); + SWTBotTreeItem item = botExt.viewByTitle("Package Explorer").bot().tree().getTreeItem(projectName).select(); + item.pressShortcut(Keystrokes.ALT,Keystrokes.LF); + SWTBot shellProperties = botExt.shell("Properties for "+projectName).activate().bot(); + shellProperties.tree().select("Project Facets"); + shellProperties.tree(1).getTreeItem("JBoss Maven Integration").check(); + botUtil.waitForAll(); + Thread.sleep(500); + botExt.hyperlink("Further configuration required...").click(); + botExt.comboBoxWithLabel("Packaging:").setSelection("ejb"); + botExt.button("OK").click(); + botExt.button("OK").click(); + botUtil.waitForAll(); + assertTrue(projectName+ " doesn't has maven nature",Utils.isMavenProject(projectName)); + updateConf(projectName); + assertFalse("Project "+projectName+" has "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE)); + assertFalse("Project "+projectName+" has "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE)); + assertFalse("Project "+projectName+" has "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE)); + + } + + private void addDependencies(String projectName, String groupId, String artifactId, String version) throws Exception{ + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = factory.newDocumentBuilder(); + Document docPom = docBuilder.parse(project.getProject().getFile("pom.xml").getContents()); + Element dependenciesElement = docPom.createElement("dependencies"); + Element dependencyElement = docPom.createElement("dependency"); + Element groupIdElement = docPom.createElement("groupId"); + Element artifactIdElement = docPom.createElement("artifactId"); + Element versionElement = docPom.createElement("version"); + + groupIdElement.setTextContent(groupId); + artifactIdElement.setTextContent(artifactId); + versionElement.setTextContent(version); + + Element root = docPom.getDocumentElement(); + dependencyElement.appendChild(groupIdElement); + dependencyElement.appendChild(artifactIdElement); + dependencyElement.appendChild(versionElement); + dependenciesElement.appendChild(dependencyElement); + root.appendChild(dependenciesElement); + TransformerFactory transfac = TransformerFactory.newInstance(); + Transformer trans = transfac.newTransformer(); + StringWriter xmlAsWriter = new StringWriter(); + StreamResult result = new StreamResult(xmlAsWriter); + DOMSource source = new DOMSource(docPom); + trans.transform(source, result); + project.getProject().getFile("pom.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null); + botUtil.waitForAll(); + updateConf(projectName); + } + + private void updateConf(String projectName){ + SWTBotTree innerBot = botExt.viewByTitle("Package Explorer").bot().tree().select(projectName); + ContextMenuHelper.clickContextMenu(innerBot, "Maven","Update Project Configuration..."); + botExt.button("OK").click(); + botUtil.waitForAll(Long.MAX_VALUE); + botUtil.waitForNonIgnoredJobs(); + } + + private void addFacesConf(String projectName) throws InterruptedException{ + SWTBotTree innerBot = botExt.viewByTitle("Package Explorer").bot().tree().select(projectName); + ContextMenuHelper.clickContextMenu(innerBot, "New","Other..."); + botExt.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("Faces Config"); + botExt.button("Next >").click(); + botExt.button("Browse...").click(); + botExt.tree().expandNode(projectName).expandNode("WebContent").select("WEB-INF"); + botExt.button("OK").click(); + botExt.button("Finish").click(); + updateConf(projectName); + } + + private void addServlet(String projectName, String servletName, String servletClass, String load) throws Exception{ + IProject facade = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = factory.newDocumentBuilder(); + Document docPom = docBuilder.parse(facade.getProject().getFile("/WebContent/WEB-INF/web.xml").getContents()); + Element servletElement = docPom.createElement("servlet"); + Element servletNameElement = docPom.createElement("servlet-name"); + Element servletClassElement = docPom.createElement("servlet-class"); + Element loadElement = docPom.createElement("load-on-startup"); + + servletNameElement.setTextContent(servletName); + servletClassElement.setTextContent(servletClass); + loadElement.setTextContent(load); + + Element root = docPom.getDocumentElement(); + servletElement.appendChild(servletNameElement); + servletElement.appendChild(servletClassElement); + servletElement.appendChild(loadElement); + root.appendChild(servletElement); + TransformerFactory transfac = TransformerFactory.newInstance(); + Transformer trans = transfac.newTransformer(); + StringWriter xmlAsWriter = new StringWriter(); + StreamResult result = new StreamResult(xmlAsWriter); + DOMSource source = new DOMSource(docPom); + trans.transform(source, result); + facade.getProject().getFile("/WebContent/WEB-INF/web.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null); + botUtil.waitForAll(); + updateConf(projectName); + } +} Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MaterializeLibraryTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MaterializeLibraryTest.java 2012-02-15 11:31:38 UTC (rev 38750) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MaterializeLibraryTest.java 2012-02-15 13:59:43 UTC (rev 38751) @@ -9,6 +9,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.junit.BeforeClass; import org.junit.Test; @@ -18,6 +19,9 @@ private String projectName = "example"; + private SWTBotExt botExt = new SWTBotExt(); + private SWTUtilExt botUtil = new SWTUtilExt(botExt); + @BeforeClass public static void setup(){ SWTBotExt setup = new SWTBotExt(); @@ -28,21 +32,24 @@ @Test public void testMaterializeLibrary() throws Exception{ - SWTBotExt ext = new SWTBotExt(); - ext.menu("New").menu("Example...").click(); - ext.tree().expandNode("JBoss Tools").select("Project Examples"); + botExt.menu("New").menu("Example...").click(); + botExt.tree().expandNode("JBoss Tools").select("Project Examples"); waitForIdle(); - ext.button("Next >").click(); + botExt.button("Next >").click(); waitForIdle(); - Thread.sleep(1000); - ext.tree(0).expandNode("Java EE 6 Quickstarts").select("Spring MVC Project"); - ext.button("Finish").click(); - Thread.sleep(500); - ext.comboBoxWithLabel("Project name").setText(projectName); - ext.comboBoxWithLabel("Package").setText(projectName); - ext.button("Next >").click(); - ext.button("Finish").click(); - waitForIdle(); + while(!botUtil.isShellActive("New Project Example")){ + Thread.sleep(500); + } + botExt.tree().expandNode("Java EE 6 Quickstarts").select("Spring MVC Project"); + botExt.button("Finish").click(); + while(!botUtil.isShellActive("New JBoss Project")){ + Thread.sleep(500); + } + botExt.comboBoxWithLabel("Project name").setText(projectName); + botExt.comboBoxWithLabel("Package").setText(projectName); + botExt.button("Next >").click(); + botExt.button("Finish").click(); + botUtil.waitForAll(Long.MAX_VALUE); final SWTBotView packageExplorer = bot.viewByTitle("Package Explorer"); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); SWTBotTree tree = packageExplorer.bot().tree(); @@ -52,18 +59,17 @@ KeyStroke k = KeyStroke.getInstance("M"); item.pressShortcut(k); waitForIdle(); - SWTBotExt botExt = new SWTBotExt(); botExt.button("OK").click(); - botExt.activeShell().bot().button("OK").click(); + Thread.sleep(500); + botExt.button("OK").click(); waitForIdle(); assertFalse(project.getName()+" is still a maven project!",Utils.isMavenProject(project.getName())); testExcludedResources(project); } - public void testExcludedResources(IProject project) throws Exception{ + private void testExcludedResources(IProject project) throws Exception{ final SWTBotView packageExplorer = bot.viewByTitle("Package Explorer"); packageExplorer.bot().tree().getTreeItem(project.getName()).select().pressShortcut(Keystrokes.ALT,Keystrokes.LF); - SWTBotExt botExt = new SWTBotExt(); botExt.tree().select("Java Build Path"); botExt.tabItem("Source").activate(); for(SWTBotTreeItem item: botExt.tree(1).getAllItems()){ Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2012-02-15 11:31:38 UTC (rev 38750) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2012-02-15 13:59:43 UTC (rev 38751) @@ -26,8 +26,8 @@ CreateMavenizedJSFProjectTest.class, //MavenProfileSelectionTest.class, //failures MaterializeLibraryTest.class, - //CreateMavenProjectsTest.class, - Configurators.class + CreateMavenProjectsTest.class, + ConfiguratorsTest.class }) public class MavenAllBotTests { Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java 2012-02-15 11:31:38 UTC (rev 38750) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java 2012-02-15 13:59:43 UTC (rev 38751) @@ -90,7 +90,7 @@ shell.button("Select All").click(); shell.button("Activate").click(); shell.button("OK").click(); - //testActivatedProfiles(project.getName(), COMMON_PROFILE+", "+AUTOACTIVATED_PROFILE_IN_USER_SETTINGS, false); + testActivatedProfiles(project.getName(), COMMON_PROFILE+", "+AUTOACTIVATED_PROFILE_IN_USER_SETTINGS, false); testActivatedProfiles(project1.getName(), COMMON_PROFILE+", "+AUTOACTIVATED_PROFILE_IN_USER_SETTINGS, false); testActivatedProfiles(project2.getName(), COMMON_PROFILE+", "+AUTOACTIVATED_PROFILE_IN_USER_SETTINGS, false); } Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Utils.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Utils.java 2012-02-15 11:31:38 UTC (rev 38750) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Utils.java 2012-02-15 13:59:43 UTC (rev 38751) @@ -5,10 +5,12 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.m2e.core.internal.IMavenConstants; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; @SuppressWarnings("restriction") public class Utils { + public static boolean isMavenProject(String projectName) throws CoreException { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); return project.hasNature(IMavenConstants.NATURE_ID); @@ -19,8 +21,15 @@ return project.hasNature(natureID); } - public static void waitForIdle() { + public static void waitForIdle() throws InterruptedException { AbstractMavenSWTBotTest.waitForIdle(); } + public static void waitForShell(SWTUtilExt util, String shellName) throws InterruptedException { + Thread.sleep(1000); + while(!util.isShellActive(shellName)){ + Thread.sleep(500); + } + } + }