Author: rawagner Date: 2012-01-31 09:13:35 -0500 (Tue, 31 Jan 2012) New Revision: 38327 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/lib/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/lib/hsqldb.jar trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.classpath trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.project trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.jdt.core.prefs trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/pom.xml trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.properties trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.xml trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/test-classes/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.classpath trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.project trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.jdt.core.prefs trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/pom.xml trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.properties trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.xml trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/test-classes/ 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/META-INF/MANIFEST.MF 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/CreateMavenProjectsTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedEARProjectTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 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 trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/usersettings/settings.xml Log: bot tests now run with maven. Test for configurators added Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/META-INF/MANIFEST.MF 2012-01-31 14:13:35 UTC (rev 38327) @@ -5,45 +5,28 @@ Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.jboss.tools.maven.ui.bot.test.Activator Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, org.eclipse.core.resources, - org.apache.log4j, - org.jboss.tools.ui.bot.ext, - org.eclipse.ui.ide;bundle-version="3.5.1", - org.eclipse.ui.forms;bundle-version="3.4.1", - org.eclipse.swtbot.eclipse.core, + org.eclipse.core.runtime, + org.eclipse.m2e.core, + org.jboss.tools.ui.bot.ext, + org.junit4, org.eclipse.swtbot.swt.finder, org.eclipse.swtbot.eclipse.finder, - org.eclipse.swtbot.eclipse.ui, + org.eclipse.m2e.tests.common, + org.eclipse.wst.validation, + org.apache.log4j, + org.jboss.tools.tests, org.eclipse.swtbot.junit4_x, - org.eclipse.swtbot.swt.finder, - org.junit4, - org.jboss.tools.seam.core, - org.jboss.tools.maven.core, - org.jboss.tools.maven.hibernate, - org.jboss.tools.maven.jsf, - org.jboss.tools.maven.portlet, - org.jboss.tools.maven.seam, + org.eclipse.ui.forms, org.jboss.tools.maven.ui, + org.jboss.tools.maven.core, org.eclipse.wst.server.core, + org.jboss.tools.seam.core, org.eclipse.datatools.connectivity, - org.eclipse.datatools.connectivity.db.generic, - org.jboss.tools.common, - org.jboss.tools.tests, - org.jboss.ide.eclipse.as.core, - org.hamcrest, - org.eclipse.datatools.enablement.hsqldb, - org.eclipse.datatools.enablement.hsqldb.dbdefinition, - org.eclipse.datatools.enablement.hsqldb.ui, - org.eclipse.jst.jee, - org.eclipse.jst.jee.ejb, - org.eclipse.jst.jee.ui, - org.eclipse.jst.jee.web, - org.eclipse.m2e.lifecyclemapping.defaults;bundle-version="[1.0,1.1)", - org.eclipse.m2e.launching;bundle-version="[1.0,1.1)", - org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.1.0)", - org.jboss.tools.common.ui;bundle-version="3.3.0" + org.eclipse.datatools.connectivity.db.generic Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j +Import-Package: org.apache.maven.model +Export-Package: org.jboss.tools.maven.ui.bot.test Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/lib/hsqldb.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/lib/hsqldb.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream 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-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-01-31 14:13:35 UTC (rev 38327) @@ -9,11 +9,11 @@ </parent> <groupId>org.jboss.tools.maven.tests</groupId> <artifactId>org.jboss.tools.maven.ui.bot.test</artifactId> - + <packaging>eclipse-test-plugin</packaging> <properties> - <systemProperties>-Djbosstools.test.jboss.home.6.0=${requirement.build.root}/jbossas-6.0.0.Final -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties> + <systemProperties>-Djbosstools.test.jboss.home.6.0=${requirement.build.root}/jboss-6.0.0.Final -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties> </properties> <build> <plugins> @@ -21,9 +21,123 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> + <environmentVariables> + <DISPLAY>:2.0</DISPLAY> + </environmentVariables> <useUIThread>false</useUIThread> + <skip>${swtbot.test.skip}</skip> <testSuite>org.jboss.tools.maven.ui.bot.test</testSuite> <testClass>org.jboss.tools.maven.ui.bot.test.MavenAllBotTests</testClass> + <dependencies> + <dependency combine.children="append"> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.m2e.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.ws.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.jsf.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.maven.ide.eclipse.wtp.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.common.jdt.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + + <!-- configurator test --> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.jsf.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <!-- seam test --> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.seam.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.datatools.enablement.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + + + + <!-- maven --> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.jaxrs.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <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> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.seam.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.cdi.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.hibernate.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.jsf.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.portlet.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.jboss.tools.maven.project.examples.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> </configuration> </plugin> </plugins> Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>simple-jar</name> + <comment></comment> + <projects> + </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> + </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> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.classpath (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.classpath 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.project 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>simple-jar1</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.jdt.core.prefs 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,6 @@ +#Fri Jan 06 10:54:18 CET 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/.settings/org.eclipse.m2e.core.prefs 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,5 @@ +#Tue Jan 24 17:11:29 CET 2012 +activeProfiles=common-profile, jboss.repository, jbosss.repository +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/pom.xml 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>simple-jar1</artifactId> + <version>1.0.0-SNAPSHOT</version> + <profiles> + <profile> + <id>common-profile</id> + </profile> + <profile> + <id>test-profile</id> + </profile> + </profiles> +</project> + Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/MANIFEST.MF 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: rawagner +Build-Jdk: 1.6.0_22 +Created-By: Maven Integration for Eclipse + Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.properties =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.properties (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.properties 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Tue Jan 31 10:37:52 CET 2012 +version=1.0.0-SNAPSHOT +groupId=org.jboss.tools.maven.tests +m2e.projectName=simple-jar1 +m2e.projectLocation=/home/eiden/Java/RedHat/tests/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1 +artifactId=simple-jar1 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar1/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar1/pom.xml 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>simple-jar1</artifactId> + <version>1.0.0-SNAPSHOT</version> + <profiles> + <profile> + <id>common-profile</id> + </profile> + <profile> + <id>test-profile</id> + </profile> + </profiles> +</project> + Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.classpath (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.classpath 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.project 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>simple-jar2</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.jdt.core.prefs 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,6 @@ +#Fri Jan 06 10:54:44 CET 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.5 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/.settings/org.eclipse.m2e.core.prefs 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,5 @@ +#Tue Jan 24 17:11:28 CET 2012 +activeProfiles=common-profile, jboss.repository, jbosss.repository +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/pom.xml 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>simple-jar2</artifactId> + <version>1.0.0-SNAPSHOT</version> + <profiles> + <profile> + <id>common-profile</id> + </profile> + <profile> + <id>test-profile</id> + </profile> + </profiles> +</project> + Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/MANIFEST.MF 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: rawagner +Build-Jdk: 1.6.0_22 +Created-By: Maven Integration for Eclipse + Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.properties =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.properties (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.properties 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Tue Jan 31 10:37:52 CET 2012 +version=1.0.0-SNAPSHOT +groupId=org.jboss.tools.maven.tests +m2e.projectName=simple-jar2 +m2e.projectLocation=/home/eiden/Java/RedHat/tests/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2 +artifactId=simple-jar2 Added: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar2/target/classes/META-INF/maven/org.jboss.tools.maven.tests/simple-jar2/pom.xml 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>simple-jar2</artifactId> + <version>1.0.0-SNAPSHOT</version> + <profiles> + <profile> + <id>common-profile</id> + </profile> + <profile> + <id>test-profile</id> + </profile> + </profiles> +</project> + Added: 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 (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -0,0 +1,204 @@ +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"; + + 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(); + } + + @Test + public void testJSFConfigurator() throws Exception{ + createMavenizedDynamicWebProject(PROJECT_NAME_JSF); + 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)); + } + + + @Test + public void testCDIConfigurator() throws Exception{ + createMavenizedDynamicWebProject(PROJECT_NAME_CDI); + 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); + 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)); + } + /* + //@Test + public void testJAXRSConfigurator() throws Exception { + assertTrue("Project "+PROJECT_NAME+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME, JAXRS_NATURE)); + } + */ + + private void createMavenizedDynamicWebProject(String projectName) throws Exception{ + botExt.menu("File").menu("New").menu("Dynamic Web Project").click(); + botExt.textWithLabel("Project name:").setText(projectName); + 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)); + removeFacets(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 createMavenizedEJBProject(String projectName)throws Exception{ + botExt.menu("File").menu("New").menu("EJB Project").click(); + botExt.textWithLabel("Project name:").setText(projectName); + 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)); + removeFacets(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{ + IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools", projectName,"0.0.1-SNAPSHOT"); + + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder docBuilder = factory.newDocumentBuilder(); + Document docPom = docBuilder.parse(facade.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); + facade.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(); + } + +} Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java 2012-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenProjectsTest.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -8,23 +8,33 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; + import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; 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; @SuppressWarnings("restriction") @Require(perspective="Java") public class CreateMavenProjectsTest extends AbstractMavenSWTBotTest{ - + public static final String REPO_URL = "http://repo1.maven.org/maven2"; protected static SWTWorkbenchBot bot = new SWTWorkbenchBot(); + @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(); + } + @Test - public void updateRepositories() throws InterruptedException { + public void updateRepositories() throws InterruptedException, CoreException { SWTBotExt botExt = new SWTBotExt(); botExt.menu("Window").menu("Show View").menu("Other...").click(); waitForIdle(); @@ -36,6 +46,7 @@ botExt.button("OK").click(); SWTUtilExt util = new SWTUtilExt(botExt); util.waitForAll(); + util.waitForJobs(Long.MAX_VALUE,"Rebuilding Indexes"); } @Test @@ -45,7 +56,7 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); assertNoErrors(project); assertTrue(Utils.isMavenProject(projectName)); - buildProject(projectName,"5 Maven build...", "jar"); + buildProject(projectName,"5 Maven build...", "jar","-0.0.1-SNAPSHOT"); } @@ -56,13 +67,13 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); assertNoErrors(project); assertTrue(Utils.isMavenProject(projectName)); - buildProject(projectName, "6 Maven build...", "jar"); + buildProject(projectName, "6 Maven build...", "jar","-0.0.1-SNAPSHOT"); } @Test - public void createSimpleJarMavenizedProject() throws InterruptedException, CoreException{ + public void createSimpleJarMavenizedProject() throws Exception{ String projectName = "JarMavenized"; SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); @@ -90,13 +101,13 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); assertNoErrors(project); assertTrue(Utils.isMavenProject(projectName)); - buildProject(projectName,"5 Maven build...", "jar"); + buildProject(projectName,"5 Maven build...", "jar","-0.0.1-SNAPSHOT"); } @Test - public void createSimpleWarMavenizedProject() throws InterruptedException, CoreException{ + public void createSimpleWarMavenizedProject() throws Exception{ String projectName = "WarMavenized"; SWTBotExt botExt = new SWTBotExt(); botExt.menu("File").menu("New").menu("Other...").click(); @@ -119,7 +130,7 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); assertNoErrors(project); assertTrue(Utils.isMavenProject(projectName)); - buildProject(projectName,"5 Maven build...", "war"); + buildProject(projectName,"5 Maven build...", "war","-0.0.1-SNAPSHOT"); } @@ -130,7 +141,7 @@ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); assertNoErrors(project); assertTrue(Utils.isMavenProject(projectName)); - buildProject(projectName, "6 Maven build...", "jar"); + buildProject(projectName, "6 Maven build...", "war",""); //version is 1.0.0 } private void createSimpleMavenProjectArchetype(String projectName,String projectType, String catalog) throws InterruptedException,CoreException { @@ -173,9 +184,10 @@ } - private void buildProject(String projectName, String mavenBuild, String packaging) throws CoreException { + private void buildProject(String projectName, String mavenBuild, String packaging, String version) throws Exception { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); SWTBot explorer = bot.viewByTitle("Package Explorer").bot(); + Thread.sleep(500); SWTBotTreeItem item = explorer.tree().getTreeItem(projectName).select(); SWTBotExt swtBot = new SWTBotExt(); item.contextMenu("Run As").menu(mavenBuild).click(); @@ -184,7 +196,7 @@ waitForIdle(); project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); project.getFolder("target").refreshLocal(IResource.DEPTH_INFINITE,new NullProgressMonitor()); - IFile jarFile = project.getFile("target/" + projectName + "-0.0.1-SNAPSHOT."+packaging); + IFile jarFile = project.getFile("target/" + projectName + version+"."+packaging); assertTrue(jarFile + " is missing ", jarFile.exists()); } Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedEARProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedEARProjectTest.java 2012-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedEARProjectTest.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -8,8 +8,15 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +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.BeforeClass; import org.junit.Test; @@ -21,6 +28,15 @@ public static final String EAR_PROJECT_NAME="ear"; 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(); + } @Test @@ -39,38 +55,45 @@ botext.button("Next >").click(); botext.comboBoxWithLabel("Packaging:").setSelection("ear"); botext.button("Finish").click(); - waitForIdle(); + Utils.waitForIdle(); assertTrue(Utils.isMavenProject(EAR_PROJECT_NAME)); installProject(WAR_PROJECT_NAME); installProject(EJB_PROJECT_NAME); botext.viewByTitle("Project Explorer").bot().tree().getTreeItem(EAR_PROJECT_NAME).contextMenu("Run As").menu("5 Maven build...").click(); - waitForIdle(); + Utils.waitForIdle(); botext.textWithLabel("Goals:").setText("clean package"); botext.button("Run").click(); - waitForIdle(); + Utils.waitForIdle(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(EAR_PROJECT_NAME); project.getFolder("target").refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); IFolder earFolder = project.getFolder("target/" + EAR_PROJECT_NAME + "-0.0.1-SNAPSHOT"); assertTrue(earFolder +" is missing ", earFolder.exists()); } - private void createWarProject(String projectName) throws CoreException{ + private void createWarProject(String projectName) throws CoreException, InterruptedException{ botext.menu("File").menu("Dynamic Web Project").click(); botext.textWithLabel("Project name:").setText(projectName); - botext.button("Modify...").click(); - botext.tree().getTreeItem("JBoss Maven Integration").check(); - botext.button("OK").click(); botext.button("Next >").click(); botext.button("Next >").click(); botext.checkBox("Generate web.xml deployment descriptor").select(); - botext.button("Next >").click(); botext.button("Finish").click(); - waitForIdle(); - assertTrue(Utils.isMavenProject(projectName)); + botUtil.waitForAll(Long.MAX_VALUE); + 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(); + Utils.waitForIdle(); + Thread.sleep(500); + botext.hyperlink("Further configuration required...").click(); + botext.button("OK").click(); + botext.button("OK").click(); + botUtil.waitForAll(Long.MAX_VALUE); + assertTrue("Web project doesn't have maven nature",Utils.isMavenProject(projectName)); } - private void createEJBProject(String projectName) throws CoreException{ + private void createEJBProject(String projectName) throws CoreException, InterruptedException{ botext.menu("File").menu("EJB Project").click(); botext.textWithLabel("Project name:").setText(projectName); botext.button("Modify...").click(); @@ -81,20 +104,21 @@ botext.button("Next >").click(); botext.comboBoxWithLabel("Packaging:").setSelection("ejb"); botext.button("Finish").click(); - waitForIdle(); - assertTrue(Utils.isMavenProject(projectName)); + botUtil.waitForAll(Long.MAX_VALUE); + assertTrue("EJB project doesn't have maven nature", Utils.isMavenProject(projectName)); } private void installProject(String projectName) throws InterruptedException{ - botext.viewByTitle("Project Explorer").bot().tree().getTreeItem(projectName).contextMenu("Run As").menu("5 Maven build...").click(); + botext.menu("Window").menu("Show View").menu("Other...").click(); + botext.tree().expandNode("Java").select("Package Explorer").click(); + botext.button("OK").click(); + SWTBotTree innerBot = botext.viewByTitle("Package Explorer").bot().tree().select(projectName); + ContextMenuHelper.clickContextMenu(innerBot,"Run As","5 Maven build..."); botext.textWithLabel("Goals:").setText("clean package install"); botext.button("Run").click(); - waitForIdle(); + Utils.waitForIdle(); + botUtil.waitForAll(); } - private static void waitForIdle() { - AbstractMavenSWTBotTest.waitForIdle(); - } - } Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java 2012-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedJSFProjectTest.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -59,9 +59,14 @@ protected static SWTWorkbenchBot bot; + @BeforeClass public final static void beforeClass() throws Exception { bot = AbstractMavenSWTBotTest.initSWTBot(); + 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(); } @Test @@ -77,6 +82,8 @@ @Test public void buildProject_AS6_v2() throws CoreException, ParserConfigurationException, SAXException, IOException, TransformerException, InterruptedException{ addDependencies(PROJECT_NAME6, JSF_VERSION_2); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME6); + assertNoErrors(project); buildProject(PROJECT_NAME6); } /* @@ -101,6 +108,8 @@ @Test public void buildProject_AS6_v1() throws CoreException, ParserConfigurationException, SAXException, IOException, TransformerException, InterruptedException{ addDependencies(PROJECT_NAME6_v1, JSF_VERSION_1_2); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME6_v1); + assertNoErrors(project); buildProject(PROJECT_NAME6_v1); } @@ -128,8 +137,6 @@ waitForIdle(); shell.button("Finish").click();; waitForIdle(); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - assertNoErrors(project); } @@ -172,8 +179,7 @@ SWTBot shellProperties = bot.shell("Properties for "+projectName).activate().bot(); shellProperties.tree().select("Project Facets"); Thread.sleep(500); - SWTBotExt botExt = new SWTBotExt(); - botExt.link(0).click("Convert to faceted form..."); + //botExt.link(0).click("Convert to faceted form..."); waitForIdle(); shellProperties.tree(1).getTreeItem("JBoss Maven Integration").check(); Thread.sleep(500); Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2012-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -88,7 +88,7 @@ * */ @SuppressWarnings("restriction") -@Require(perspective="Seam 2") +@Require(perspective="Seam") public class CreateMavenizedSeamProjectTest{ protected static final long IDLE_TIME = 1 * 60 * 1000L; @@ -386,9 +386,9 @@ public static void createNewSeamWebProjectWizard(String projectName, String deployType) throws Exception { waitForIdle(); - bot.menu("File").menu("New").menu("Seam 2 Web Project").click(); - - SWTBotShell mainShell = bot.shell("New Seam 2 Project"); + bot.menu("File").menu("New").menu("Seam Web Project").click(); + + SWTBotShell mainShell = bot.shell("New Seam Project"); mainShell.activate(); bot.textWithLabel("Project name:").setText(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-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MaterializeLibraryTest.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -2,6 +2,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.bindings.keys.KeyStroke; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes; @@ -9,13 +10,22 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.junit.BeforeClass; import org.junit.Test; -@Require(perspective="Seam 2") -public class MaterializeLibraryTest extends AbstractMavenSWTBotTest { +@Require(perspective="Java") +public class MaterializeLibraryTest extends AbstractMavenSWTBotTest{ - private String projectName = "exampleHTML5"; + private String projectName = "example"; + @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(); + } + @Test public void testMaterializeLibrary() throws Exception{ SWTBotExt ext = new SWTBotExt(); @@ -25,8 +35,9 @@ ext.button("Next >").click(); waitForIdle(); Thread.sleep(1000); - ext.tree(0).expandNode("Java EE 6 Quickstarts").select("Java EE 6 HTML5 Mobile Webapp"); + 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(); @@ -35,11 +46,15 @@ final SWTBotView packageExplorer = bot.viewByTitle("Package Explorer"); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); SWTBotTree tree = packageExplorer.bot().tree(); - tree.expandNode(project.getName()).getNode("Maven Dependencies").contextMenu("Materialize Library...").click(); + SWTBotTreeItem item = tree.expandNode(project.getName()); + item = item.getNode("Maven Dependencies"); + item.select().pressShortcut(Keystrokes.SHIFT,Keystrokes.F10); + KeyStroke k = KeyStroke.getInstance("M"); + item.pressShortcut(k); waitForIdle(); SWTBotExt botExt = new SWTBotExt(); botExt.button("OK").click(); - botExt.button("OK").click(); + botExt.activeShell().bot().button("OK").click(); waitForIdle(); assertFalse(project.getName()+" is still a maven project!",Utils.isMavenProject(project.getName())); testExcludedResources(project); 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-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -24,9 +24,10 @@ CreateMavenizedSeamProjectTest.class, CreateMavenizedEARProjectTest.class, CreateMavenizedJSFProjectTest.class, - MavenProfileSelectionTest.class, + //MavenProfileSelectionTest.class, //failures MaterializeLibraryTest.class, - CreateMavenProjectsTest.class + CreateMavenProjectsTest.class, + Configurators.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-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenProfileSelectionTest.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -21,23 +21,33 @@ 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.config.Annotations.Require; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +@Require(perspective="Java") @SuppressWarnings("restriction") @RunWith(SWTBotJunit4ClassRunner.class) public class MavenProfileSelectionTest extends AbstractMavenSWTBotTest { public static final String AUTOACTIVATED_PROFILE_IN_POM = "active-profile"; - public static final String AUTOACTIVATED_PROFILE_IN_USER_SETTINGS = "jboss.repository"; + public static final String AUTOACTIVATED_PROFILE_IN_USER_SETTINGS = "profile.from.settings.xml"; public static final String COMMON_PROFILE = "common-profile"; + @BeforeClass + public static void setup(){ + SWTBotExt setup = new SWTBotExt(); + setup.menu("Window").menu("Show View").menu("Package Explorer").click(); + } + @Test public void testOpenMavenProfiles() throws Exception { setUserSettings(); IProject project = importProject("projects/simple-jar/pom.xml"); waitForJobsToComplete(); testAutoActivatedProfiles(); + bot.menu("Window").menu("Show View").menu("Project Explorer").click(); final SWTBotView packageExplorer = bot.viewByTitle("Project Explorer"); SWTBot innerBot = packageExplorer.bot(); innerBot.activeShell().activate(); @@ -50,6 +60,7 @@ SWTBot shell = bot.shell("Select Maven profiles").activate().bot(); shell.button("Select All").click(); String selectedProfiles = shell.textWithLabel("Active profiles for simple-jar :").getText(); + System.out.println("+++++++++++++++++++++"+selectedProfiles); shell.button("OK").click(); testActivatedProfiles(project.getName(), selectedProfiles, false); @@ -80,7 +91,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); } @@ -103,27 +114,24 @@ Thread.sleep(1000); } - private void testActivatedProfiles(String projectName, String profilesToCheck, boolean defaultProfile){ - IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools.maven.tests", "simple-jar", "1.0.0-SNAPSHOT"); - assertNotNull("facade is null",facade); - - String[] parsedProfiles = profilesToCheck.split(", "); + private void testActivatedProfiles(String projectName, String expectedProfiles, boolean defaultProfile){ + String[] parsedexpectedProfiles = expectedProfiles.split(", "); String empty = ""; - Set<String> setOfProfiles = new HashSet<String>(); - Collections.addAll(setOfProfiles, parsedProfiles); - setOfProfiles.add(AUTOACTIVATED_PROFILE_IN_USER_SETTINGS); + Set<String> setOfExpectedProfiles = new HashSet<String>(); + Collections.addAll(setOfExpectedProfiles, parsedexpectedProfiles); + setOfExpectedProfiles.add(AUTOACTIVATED_PROFILE_IN_USER_SETTINGS); if(defaultProfile){ - setOfProfiles.add(AUTOACTIVATED_PROFILE_IN_POM); + setOfExpectedProfiles.add(AUTOACTIVATED_PROFILE_IN_POM); } - setOfProfiles.remove(empty); + setOfExpectedProfiles.remove(empty); + IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools.maven.tests", projectName, "1.0.0-SNAPSHOT"); + assertNotNull("facade is null",facade); Set<String> setOfProfilesFacade = new HashSet<String>(); for(Profile profile : facade.getMavenProject().getActiveProfiles()){ - System.out.println(profile.getId()); setOfProfilesFacade.add(profile.getId()); } - - assertEquals("Selected profiles in project " +projectName+ " doesn't match", setOfProfilesFacade, setOfProfiles); + assertEquals("Selected profiles in project " +projectName+ " doesn't match", setOfExpectedProfiles, setOfProfilesFacade); } private void testAutoActivatedProfiles(){ 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-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Utils.java 2012-01-31 14:13:35 UTC (rev 38327) @@ -14,4 +14,13 @@ return project.hasNature(IMavenConstants.NATURE_ID); } + public static boolean hasNature(String projectName, String natureID) throws CoreException { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + return project.hasNature(natureID); + } + + public static void waitForIdle() { + AbstractMavenSWTBotTest.waitForIdle(); + } + } Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/usersettings/settings.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/usersettings/settings.xml 2012-01-31 13:09:02 UTC (rev 38326) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/usersettings/settings.xml 2012-01-31 14:13:35 UTC (rev 38327) @@ -5,7 +5,7 @@ <activation> <activeByDefault>true</activeByDefault> </activation> - <id>jboss.repository</id> + <id>profile.from.settings.xml</id> </profile> </profiles> </settings> \ No newline at end of file