Author: apodhrad Date: 2012-08-29 03:54:35 -0400 (Wed, 29 Aug 2012) New Revision: 43283 Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/swtbot.properties Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/properties/install-jbpm3.xml trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java Log: jBPM changed to version 3.2.9 since it is easy to install into AS 5.1.0 Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml 2012-08-29 07:52:14 UTC (rev 43282) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml 2012-08-29 07:54:35 UTC (rev 43283) @@ -33,6 +33,11 @@ <artifactId>org.jboss.tools.jbpm3.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> </dependencies> </configuration> </plugin> @@ -41,15 +46,27 @@ <artifactId>maven-download-plugin</artifactId> <executions> <execution> + <id>install-as-5.1.0</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://repository.jboss.org/sourceforge/jboss-5.1.0.GA.zip</url... + <md5>78322c75ca0c13002a04418b4a8bc920</md5> + <unpack>true</unpack> + </configuration> + </execution> + <execution> <id>download-jbpm</id> <phase>pre-integration-test</phase> <goals> <goal>wget</goal> </goals> <configuration> - <url>http://sourceforge.net/projects/jbpm/files/jBPM%203/jbpm-jpdl-3.3.... + <url>https://repository.jboss.org/nexus/content/groups/public/org/jbpm/... <unpack>false</unpack> - <md5>22ac4a30fdf191b715b41fd151125c23</md5> + <md5>e2d8624bd181235a34b5f97fb088c589</md5> </configuration> </execution> </executions> @@ -66,11 +83,11 @@ </goals> <configuration> <tasks> - <java jar="${requirementsDirectory}/jbpm-installer-3.3.1.GA.jar" + <java + jar="${requirementsDirectory}/jbpm-distribution-3.2.9-installer.jar" dir="${requirementsDirectory}" fork="true"> <arg value="../../resources/properties/install-jbpm3.xml" /> </java> - <echo file="swtbot.properties" append="false">JBPM=3.3.1,${requirementsDirectory}/jbpm-3.3.1.GA</echo> </tasks> </configuration> </execution> Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/properties/install-jbpm3.xml =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/properties/install-jbpm3.xml 2012-08-29 07:52:14 UTC (rev 43282) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/resources/properties/install-jbpm3.xml 2012-08-29 07:54:35 UTC (rev 43283) @@ -1,27 +1,33 @@ <AutomatedInstallation langpack="eng"> - <com.izforge.izpack.panels.HelloPanel/> - <com.izforge.izpack.panels.TargetPanel> - <installpath>./jbpm-3.3.1.GA</installpath> + <com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/> + <com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)"> + <installpath>./jbpm-3.2.9</installpath> </com.izforge.izpack.panels.TargetPanel> - <com.izforge.izpack.panels.TreePacksPanel> + <com.izforge.izpack.panels.TreePacksPanel id="UNKNOWN (com.izforge.izpack.panels.TreePacksPanel)"> <pack name="jBPM3 Standalone" index="0" selected="true"/> - <pack name="jBPM3 JBoss Integration" index="1" selected="false"/> - <pack name="JSF-Console" index="2" selected="false"/> - <pack name="GWT-Console" index="3" selected="false"/> - <pack name="Optional Components" index="4" selected="false"/> - <pack name="Download JBoss-5.0.0" index="5" selected="false"/> - <pack name="Download Eclipse-3.4.0" index="6" selected="false"/> + <pack name="jBPM3 JBoss Integration" index="1" selected="true"/> + <pack name="JSF-Console" index="2" selected="true"/> + <pack name="Optional Components" index="3" selected="false"/> + <pack name="Download JBoss-5.0.1" index="4" selected="false"/> + <pack name="Download Eclipse-3.4.2" index="5" selected="false"/> </com.izforge.izpack.panels.TreePacksPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput/> + <com.izforge.izpack.panels.UserInputPanel id="UNKNOWN (com.izforge.izpack.panels.UserInputPanel)"> + <userInput> + <entry key="jbossTargetServer" value="default"/> + <entry key="jbossSelection" value="jboss510"/> + </userInput> </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput/> + <com.izforge.izpack.panels.UserInputPanel id="UNKNOWN (com.izforge.izpack.panels.UserInputPanel)"> + <userInput> + <entry key="jbossInstallPath" value="./jboss-5.1.0.GA"/> + </userInput> </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.UserInputPanel> - <userInput/> + <com.izforge.izpack.panels.UserInputPanel id="UNKNOWN (com.izforge.izpack.panels.UserInputPanel)"> + <userInput> + <entry key="dbSelection" value="hsqldb"/> + </userInput> </com.izforge.izpack.panels.UserInputPanel> - <com.izforge.izpack.panels.SummaryPanel/> - <com.izforge.izpack.panels.InstallPanel/> - <com.izforge.izpack.panels.FinishPanel/> + <com.izforge.izpack.panels.SummaryPanel id="UNKNOWN (com.izforge.izpack.panels.SummaryPanel)"/> + <com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/> + <com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/> </AutomatedInstallation> Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java 2012-08-29 07:52:14 UTC (rev 43282) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/src/org/jboss/tools/jbpm/ui/bot/test/JBPMDeployTest.java 2012-08-29 07:54:35 UTC (rev 43283) @@ -26,7 +26,7 @@ import org.jboss.tools.ui.bot.ext.widgets.SWTBotMultiPageEditor; import org.junit.Test; -@Require( clearProjects=false, jbpm=@JBPM(), server=(a)Server(type=ServerType.SOA,state=ServerState.Present)) +@Require( clearProjects=false, jbpm=@JBPM(), server=(a)Server(type=ServerType.ALL,state=ServerState.Running)) public class JBPMDeployTest extends JBPMTest { @Test @@ -52,9 +52,6 @@ gefBot.textWithLabel("Username:").setText("admin"); gefBot.textWithLabel("Password:").setText("admin"); - String serverName = TestConfigurator.currentConfig.getServer().type+"-"+TestConfigurator.currentConfig.getServer().version; - servers.startServer(serverName); - item.setFocus(); bot.menu("jBPM").menu("Ping Server").click(); Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/swtbot.properties =================================================================== --- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/swtbot.properties (rev 0) +++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/swtbot.properties 2012-08-29 07:54:35 UTC (rev 43283) @@ -0,0 +1,8 @@ +# SWTBotTest properties +# all properties are optional, all defined paths should exist +# <java version>,<jre/jdk home> +#JAVA= +#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home> +# note : when server is type of SOA, version is version of SOA (not the bundled EAP) +SERVER=AS,5.1,default,./target/requirements/jboss-5.1.0.GA +JBPM=3.2.9,./target/requirements/jbpm-3.2.9 \ No newline at end of file