Author: vpakan(a)redhat.com Date: 2012-04-25 05:12:06 -0400 (Wed, 25 Apr 2012) New Revision: 40475 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java Log: Fix mistyping error in property name for RichFaces UI jar location and use JBoss AS 7 for VPE SWTBot tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2012-04-25 09:08:53 UTC (rev 40474) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2012-04-25 09:12:06 UTC (rev 40475) @@ -14,8 +14,8 @@ <properties> <jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jboss-as.home> <xulrunner.plugin.name>org.mozilla.xulrunner.gtk.linux.x86_1.9.2.16b</xulrunner.plugin.name> - <org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location> - <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location}</systemProperties> + <org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location> + <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties> <test.suite.class>org.jboss.tools.jsf.ui.bot.test.JSFAllBotTests</test.suite.class> </properties> <build> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2012-04-25 09:08:53 UTC (rev 40474) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2012-04-25 09:12:06 UTC (rev 40475) @@ -1,59 +1,68 @@ <?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> - <parent> - <groupId>org.jboss.tools.vpe</groupId> - <artifactId>tests</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools.vpe.tests</groupId> - <artifactId>org.jboss.tools.vpe.ui.bot.test</artifactId> - - <packaging>eclipse-test-plugin</packaging> - <properties> - <jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss-as.home> - <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home}</systemProperties> - <test.suite.class>org.jboss.tools.vpe.ui.bot.test.VPEAllBotTests</test.suite.class> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <configuration> - <testSuite>org.jboss.tools.vpe.ui.bot.test</testSuite> - <testClass>${test.suite.class}</testClass> - <useUIThread>false</useUIThread> - <skip>${swtbot.test.skip}</skip> - <dependencies combine.children="append"> - <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.jboss.tools.vpe.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.eclipse.jst.enterprise_ui.feature.feature.group</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.jst.web_core.feature.feature.group</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build> +<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> + <parent> + <groupId>org.jboss.tools.vpe</groupId> + <artifactId>tests</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.vpe.tests</groupId> + <artifactId>org.jboss.tools.vpe.ui.bot.test</artifactId> + + <packaging>eclipse-test-plugin</packaging> + <properties> + <jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jboss-as.home> + <xulrunner.plugin.name>org.mozilla.xulrunner.gtk.linux.x86_1.9.2.16b</xulrunner.plugin.name> + <org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location> + <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties> + <test.suite.class>org.jboss.tools.vpe.ui.bot.test.VPEAllBotTests</test.suite.class> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <configuration> + <testSuite>org.jboss.tools.vpe.ui.bot.test</testSuite> + <testClass>${test.suite.class}</testClass> + <useUIThread>false</useUIThread> + <skip>${swtbot.test.skip}</skip> + <product>org.eclipse.platform.ide</product> + <dependencies combine.children="append"> + <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.jboss.tools.vpe.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.eclipse.jst.enterprise_ui.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.jst.web_core.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> + </dependencies> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties 2012-04-25 09:08:53 UTC (rev 40474) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties 2012-04-25 09:12:06 UTC (rev 40475) @@ -1 +1 @@ -requirements=jbossas-5.1.0.GA +requirements=jbossas-7.0.2.Final,richfaces-4.2.1.Final Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2012-04-25 09:08:53 UTC (rev 40474) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2012-04-25 09:12:06 UTC (rev 40475) @@ -1,8 +1 @@ -JSFProjectName=JBIDETestProject RichFacesUiJarLocation=/opt/jboss-eap-5.1/seam/lib/richfaces-ui.jar -FaceletsProjectName=FaceletsTestProject -Apachev6.0=D\:/Java/apache-tomcat-6.0.18 -JBossEap5.x=/opt/jbdevstudio4.1.1.GA/jboss-eap/jboss-as -JSF2ProjectName=JSF2TestProject -JBossASForJSF2=/opt/jboss-6.0.0.Final -JBossASForJSF2Version=6.0 \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties 2012-04-25 09:08:53 UTC (rev 40474) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties 2012-04-25 09:12:06 UTC (rev 40475) @@ -5,7 +5,7 @@ # JAVA=1.6,${JAVA_HOME} #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=EAP,5.x,default,${jbosstools.test.jboss-as.home} +SERVER=AS,7.0,default,${jbosstools.test.jboss-as.home} #<seam version>,<seam runtime home> #SEAM=2.2,/opt/jbdevstudio4.1.1.GA/jboss-eap/seam #<esb versoin>,<esb runtime home> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-04-25 09:08:53 UTC (rev 40474) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-04-25 09:12:06 UTC (rev 40475) @@ -100,7 +100,7 @@ } // Get richfaces-ui.jar location // System property has priority - String richFacesUiLocation = System.getProperty("org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location",""); + String richFacesUiLocation = System.getProperty("org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location",""); // Read property from Properties File if (richFacesUiLocation.length() == 0){ if (projectProperties.containsKey("RichFacesUiJarLocation")){