Author: manaRH Date: 2009-07-13 14:16:28 -0400 (Mon, 13 Jul 2009) New Revision: 11283 Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml Removed: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces.xml Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java Log: back ported seam-gen ftest changes Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2009-07-13 16:40:44 UTC (rev 11282) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2009-07-13 18:16:28 UTC (rev 11283) @@ -67,6 +67,10 @@ # seam-gen specific properties #seamgen.delete.project=true +# If set to true, the container is launched automatically prior to testsuite execution and shut down after it finishes +# The container has to be run manually otherwise +seamgen.control.container=false + # workspace for new projects workspace.home= Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-07-13 16:40:44 UTC (rev 11282) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/build.xml 2009-07-13 18:16:28 UTC (rev 11283) @@ -46,8 +46,8 @@ <path refid="classpath.build" /> <path location="${classes.dir}" /> <fileset dir="${seam.dir}/lib/gen" includes="*.jar" /> - <fileset file="${java.home}/../lib/tools.jar"/> - <fileset file="${driver.jar}"/> + <fileset file="${java.home}/../lib/tools.jar" /> + <fileset file="${driver.jar}" /> <!-- TODO why do we need this? --> <fileset dir="${seam.dir}/lib" includes="*.jar" /> </path> @@ -79,9 +79,28 @@ </copy> </target> - <target name="seam-gen.richfaces.testsuite" depends="build" description="Run Richfaces testsuite"> - <run.selenium.test suite="richfaces" /> + <target name="seam-gen.richfaces.testsuite" description="Run Richfaces testsuite"> + <antcall target="seam-gen.richfaces.testsuite.exploded" /> + <antcall target="seam-gen.richfaces.testsuite.deployed" /> </target> + + <target name="seam-gen.richfaces.testsuite.exploded" depends="build"> + <run.selenium.test suite="richfaces-exploded" /> + </target> + + <target name="seam-gen.richfaces.testsuite.deployed" depends="build"> + <run.selenium.test suite="richfaces-deployed" /> + </target> + <target name="seam-gen.icefaces.testsuite" description="Run Icefaces testsuite"> + <antcall target="seam-gen.icefaces.testsuite.exploded" /> + <antcall target="seam-gen.icefaces.testsuite.deployed" /> + </target> + <target name="seam-gen.icefaces.testsuite.exploded" depends="build"> + <run.selenium.test suite="icefaces-exploded" /> + </target> + <target name="seam-gen.icefaces.testsuite.deployed" depends="build"> + <run.selenium.test suite="icefaces-deploy" /> + </target> <target name="seam-gen.smoke.testsuite" depends="build" description="Run smoke testsuite"> <run.selenium.test suite="smoke" /> Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml (rev 0) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-deployed.xml 2009-07-13 18:16:28 UTC (rev 11283) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> + <listeners> + <listener + class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> + </listeners> + <parameter name="suffix" value="001" /> + <parameter name="explode" value="false" /> + <test name="RichFaces Ear Test"> + <parameter name="type" value="ear" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> + <test name="RichFaces War Test"> + <parameter name="type" value="war" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> +</suite> Added: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml (rev 0) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces-exploded.xml 2009-07-13 18:16:28 UTC (rev 11283) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="seam-gen RichFaces suite" parallel="false" verbose="2"> + <listeners> + <listener + class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> + </listeners> + <parameter name="suffix" value="001" /> + <test name="RichFaces exploded Ear Test"> + <parameter name="type" value="ear" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class + name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> + <test name="RichFaces exploded War Test"> + <parameter name="type" value="war" /> + <classes> + <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> + <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> + <class + name="org.jboss.seam.test.functional.seamgen.HotDeploymentNewFormTest" /> + <class + name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> + <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> + <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> + <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> + <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> + </classes> + </test> +</suite> Deleted: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces.xml 2009-07-13 16:40:44 UTC (rev 11282) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/richfaces.xml 2009-07-13 18:16:28 UTC (rev 11283) @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="seam-gen RichFaces suite" parallel="false" verbose="3"> - <listeners> - <listener - class-name="org.jboss.seam.test.functional.seamgen.utils.SeleniumTestListener" /> - </listeners> - <parameter name="suffix" value="001" /> - <test name="RichFaces exploded Ear Test"> - <parameter name="type" value="ear" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class - name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> - <test name="RichFaces exploded War Test"> - <parameter name="type" value="war" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class - name="org.jboss.seam.test.functional.seamgen.HotDeploymentNewFormTest" /> - <class - name="org.jboss.seam.test.functional.seamgen.HotDeploymentStaticTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> - <test name="RichFaces Ear Test"> - <parameter name="type" value="ear" /> - <parameter name="explode" value="false" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> - <test name="RichFaces War Test"> - <parameter name="type" value="war" /> - <parameter name="explode" value="false" /> - <classes> - <class name="org.jboss.seam.test.functional.seamgen.NewProjectTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewActionTest" /> - <class name="org.jboss.seam.test.functional.seamgen.NewFormTest" /> - <class name="org.jboss.seam.test.functional.seamgen.PersonTest" /> - <class name="org.jboss.seam.test.functional.seamgen.VehicleTest" /> - <class name="org.jboss.seam.test.functional.seamgen.UserTest" /> - <class name="org.jboss.seam.test.functional.seamgen.RoleTest" /> - </classes> - </test> -</suite> Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-07-13 16:40:44 UTC (rev 11282) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-07-13 18:16:28 UTC (rev 11283) @@ -77,6 +77,8 @@ protected static boolean DELETE_PROJECT; + protected static boolean CONTROL_CONTAINER; + protected static String TEST_SEAMGEN_PROPERTIES_FILE; // Selenium related constants @@ -123,7 +125,9 @@ loadFtestProperties(); createOutputDir(); startSeleniumServer(); - container = startContainer(CONTAINER, CONTAINER_LOCATION); + if (CONTROL_CONTAINER) { + container = startContainer(CONTAINER, CONTAINER_LOCATION); + } } @AfterSuite @@ -177,7 +181,8 @@ CONTAINER_LOCATION = ftestProperties.getProperty(CONTAINER + ".home"); DEPLOY_TIMEOUT = Integer.parseInt(ftestProperties.getProperty(CONTAINER + ".deploy.waittime")) * 1000; // miliseconds DELETE_PROJECT = Boolean.valueOf(ftestProperties.getProperty("seamgen.delete.project", "false")); - + CONTROL_CONTAINER = Boolean.valueOf(ftestProperties.getProperty("seamgen.control.container", "false")); + // load selenium constants SELENIUM_HOST = ftestProperties.getProperty("selenium.host"); SELENIUM_BROWSER = ftestProperties.getProperty("selenium.browser"); Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2009-07-13 16:40:44 UTC (rev 11282) +++ branches/enterprise/JBPAPP_5_0/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java 2009-07-13 18:16:28 UTC (rev 11283) @@ -96,7 +96,7 @@ public void generateEntities() { - getAntCall().executeTarget("generate-entities"); + getAntCall().executeTarget("generate"); } /**