Author: jharting Date: 2009-10-05 08:05:35 -0400 (Mon, 05 Oct 2009) New Revision: 11544 Modified: branches/community/Seam_2_2/src/test/ftest/build.xml branches/community/Seam_2_2/src/test/ftest/examples/build.xml branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java Log: Upgraded to selenium 1.0.1 Modified: branches/community/Seam_2_2/src/test/ftest/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 10:10:27 UTC (rev 11543) +++ branches/community/Seam_2_2/src/test/ftest/build.xml 2009-10-05 12:05:35 UTC (rev 11544) @@ -35,18 +35,18 @@ <!-- TODO : should the libs be in seam/lib and managed with mvn? --> <property name="lib.dir" value="${ftest.dir}/lib" /> <property name="log.dir" value="${ftest.dir}/log" /> - - <!-- Build resources --> + + <!-- Build resources --> <import file="${seam.dir}/build/common.build.xml" /> - + <path id="selenium.server.classpath"> <fileset dir="${lib.dir}"> <include name="selenium-server-standalone.jar" /> </fileset> </path> - + <!-- TODO : should the libs be in seam/lib and managed with mvn? --> - <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/> + <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/> <target name="testall" description="Run functional testsuite based on container property"> <fail unless="container">Please set container property.</fail> @@ -90,7 +90,7 @@ <antcall target="stop.selenium.server" /> <antcall target="stop.container" /> </target> - + <target name="testall.jboss5" description="Run functional testsuite for JBoss 5"> <property name="container" value="jboss5" /> <antcall target="start.container" /> @@ -276,20 +276,11 @@ <undeployexample name="wicket" /> </target> - <!-- Target for declaring needed libraries for tests to run --> - <target name="import.libraries"> - <copyInlineDependencies id="selenium.server" scope="compile" todir="${lib.dir}"> - <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0-beta-2" classifier="standalone"/> - <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2"> - <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/> - </dependency> - </copyInlineDependencies> + <target name="copy.selenium"> + <ant antfile="${ftest.dir}/examples/build.xml" target="copy.selenium" /> </target> - - <target name="start.selenium.server"> - <!-- Added for downloading libraries --> - <antcall target="import.libraries"> </antcall> - + + <target name="start.selenium.server" depends="copy.selenium"> <java classpathref="selenium.server.classpath" classname="org.openqa.selenium.server.SeleniumServer" fork="true" spawn="true"> <arg line="-port ${selenium.server.port}" /> <arg line="${selenium.server.cmd.args}" /> @@ -298,14 +289,14 @@ <waitfor maxwait="30" maxwaitunit="second"> <and> <socket server="${selenium.host}" port="${selenium.server.port}" /> - <!-- this url will 403, so we say that it should start counting errors at 404 to skip --> - <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="404" /> + <!-- this url will start returning 404 once the server is up, we set errorsBeginAt to 405 for the 404 response to be considered correct --> + <http url="http://${selenium.host}:${selenium.server.port}/selenium-server/core/index.html" errorsBeginAt="405" /> </and> </waitfor> </target> <target name="stop.selenium.server"> - <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDown" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" /> + <get taskname="selenium-shutdown" src="http://${selenium.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" dest="${log.dir}/server.shutdown.dest.log" ignoreerrors="true" /> <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" /> </target> @@ -350,7 +341,7 @@ <callExample path="@{path}" target="undeploy.example" /> </sequential> </macrodef> - + <macrodef name="callExample"> <attribute name="path" /> <attribute name="target" /> @@ -369,19 +360,19 @@ <antcall target="start.container" > </antcall> </target> - + <target name="stop.container" if="run.container.per.suite"> <echo>Stopping container</echo> <ant antfile="examples/build.xml" target="stop.container.jboss" inheritall="false"> <property name="container" value="${container}" /> - </ant> + </ant> </target> <target name="start.container" if="run.container.per.suite"> <echo>Starting container</echo> <ant antfile="examples/build.xml" target="start.container.jboss" inheritall="false"> <property name="container" value="${container}" /> - </ant> + </ant> </target> - + </project> Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 10:10:27 UTC (rev 11543) +++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-10-05 12:05:35 UTC (rev 11544) @@ -86,7 +86,7 @@ <target name="build.extras" description="Build example specific files before build"> </target> - <target name="build" depends="build.common, build.extras, copy.htmlunit" description="Compiles the Test"> + <target name="build" depends="build.common, build.extras, copy.htmlunit, copy.selenium" description="Compiles the Test"> <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" /> <copy todir="${classes.dir}"> <fileset dir="${src.dir}"> @@ -234,7 +234,7 @@ </waitfor> </target> - <target name="stop.container.jboss" depends="container.properties" > + <target name="stop.container.jboss" depends="container.properties" > <sequential> <echo message="Shutting down JBoss server"/> <java classname="org.jboss.Shutdown" fork="false" dir="${container.home}/bin"> @@ -278,5 +278,19 @@ <dependency groupId="xml-apis" artifactId="xml-apis" version="1.3.03"/> </copyInlineDependencies> </target> + + <target name="copy.selenium"> + <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}"> + <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.1" classifier="standalone"> + <exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" /> + <exclusion groupId="org.seleniumhq.selenium.server" artifactId="selenium-server-coreless" /> + <exclusion groupId="org.apache.ant" artifactId="ant-trax" /> + <exclusion groupId="org.apache.ant" artifactId="ant-nodeps" /> + </dependency> + <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0.1"> + <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" /> + </dependency> + </copyInlineDependencies> + </target> </project> Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml =================================================================== --- branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-05 10:10:27 UTC (rev 11543) +++ branches/community/Seam_2_2/src/test/ftest/seamgen/build.xml 2009-10-05 12:05:35 UTC (rev 11544) @@ -43,6 +43,10 @@ <!-- common path setup --> <path id="classpath.build"> + <fileset dir="${root.lib.dir}"> + <include name="testng.jar"/> + <include name="gen/ant.jar"/> + </fileset> <fileset dir="${ftest.lib.dir}" includes="**/*.jar" /> </path> @@ -63,19 +67,10 @@ <delete dir="${log.dir}" /> </target> - <!-- Target for declaring needed libraries for tests runs --> - <target name="import.libraries"> - <copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}"> - <dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0-beta-2" classifier="standalone"/> - <dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0-beta-2"> - <exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default"/> - </dependency> - <dependency groupId="org.apache.ant" artifactId="ant" version="1.7.0"/> - <dependency groupId="org.apache.ant" artifactId="ant-launcher" version="1.7.0"/> - <dependency groupId="org.testng" artifactId="testng" version="5.9"/> - </copyInlineDependencies> + <target name="copy.selenium"> + <ant antfile="${ftest.dir}/examples/build.xml" target="copy.selenium" /> </target> - + <target name="build" depends="build.common" description="Compiles the Test"> <mkdir dir="${classes.dir}" /> <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" /> @@ -86,10 +81,7 @@ </copy> </target> - <target name="build.common" description="Compiles the common selenium test code"> - <!-- Added for downloading libraries --> - <antcall target="import.libraries"> </antcall> - + <target name="build.common" depends="copy.selenium" description="Compiles the common selenium test code"> <mkdir dir="${classes.dir}" /> <javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" /> <copy todir="${classes.dir}"> Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java =================================================================== --- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-10-05 10:10:27 UTC (rev 11543) +++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java 2009-10-05 12:05:35 UTC (rev 11544) @@ -245,9 +245,9 @@ else if("-log".equals(cmd)) { rcc.setLogOutFileName(parameters.nextToken()); } - else if("-singleWindow".equals(cmd)) { + /*else if("-singleWindow".equals(cmd)) { rcc.setMultiWindow(false); - } + }*/ else if("-avoidProxy".equals(cmd)) { rcc.setHonorSystemProxy(false); }