Author: mposolda(a)redhat.com Date: 2009-06-22 15:38:34 -0400 (Mon, 22 Jun 2009) New Revision: 13478 Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/apps/portal-bookstore-samples.war Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml Log: Adding portal-bookstore-samples test to the main selenium testsuite. Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/apps/portal-bookstore-samples.war =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/apps/portal-bookstore-samples.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-06-22 13:36:15 UTC (rev 13477) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-06-22 19:38:34 UTC (rev 13478) @@ -37,6 +37,9 @@ <property name="test.cms.suite" value="testng-cms.xml" /> <property name="usecase.suite" value="end2end.xml" /> + <!-- Default properties for single-test-without-dependencies --> + <property name="suite.test.name" value="Ant test" /> + <path id="jboss.test.classpath"> <pathelement path="${jboss.test.jar}" /> </path> @@ -125,6 +128,22 @@ </java> <sleep seconds="20" /> </target> + + <target name="run-src-with-ssl"> + <echo message="Starting Selenium Remote Control with usage of HTTPS" /> + <java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true"> + <arg value="-trustAllSSLCertificates" /> + <arg value="-multiWindow" /> + <arg value="-port" /> + <arg value="44444" /> + <arg value="-log" /> + <arg value="selenium.log" /> + <arg value="-debug" /> + <arg value="-userExtensions" /> + <arg value="${selsrv.dir}/user-extensions.js" /> + </java> + <sleep seconds="20" /> + </target> <target name="stop-src"> <get taskname="selenium-shutdown" src="http://localhost:44444/selenium-server/driver/?cmd=shutDown" dest="result.txt" ignoreerrors="true" /> @@ -245,10 +264,33 @@ <sysproperty key="output-dir" value="${testng.output.dir}" /> <jvmarg value="-ea" /> </testng> + <antcall target="cleanup" /> </target> + <target name="single-test-without-dependencies" depends="run-src"> + <echo message="Runing TestNG" /> + + <!--<mkdir dir="test-output" /> + <mkdir dir="debug" />--> + <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" listeners="org.jboss.portal.test.selenium.JBossSeleniumTestListener" suitename="SeleniumSingleTest" testname="${suite.test.name}" verbose="2" > + + <classfileset dir="${test.build.dir}" includes="${testname}" /> + <sysproperty key="browser" value="${browser}" /> + <sysproperty key="screenshot" value="${screenshot}" /> + <sysproperty key="debug" value="${debug}" /> + <sysproperty key="workspace" value="${workspace}" /> + <sysproperty key="userCount" value="${userCount}" /> + <sysproperty key="html-src" value="${html-src}" /> + <sysproperty key="output-dir" value="${testng.output.dir}" /> + <jvmarg value="-ea" /> + </testng> + + <antcall target="cleanup" /> + + </target> + <target name="selenium-test" depends="init, compile, run-src, copyApps, create-test-files"> <echo message="Runing TestNG" /> Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-06-22 13:36:15 UTC (rev 13477) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-06-22 19:38:34 UTC (rev 13478) @@ -105,6 +105,12 @@ <classes> <class name="org.jboss.portal.test.selenium.PortalAjaxSamplesTestCase"></class></classes> </test> + + <test name="org.jboss.portal.test.selenium.PortalBookstoreSampleTestCase" + verbose="2" annotations="JDK"> + <classes> + <class name="org.jboss.portal.test.selenium.PortalBookstoreSampleTestCase"></class></classes> + </test> <test name="org.jboss.portal.test.selenium.EndToEndBeaPortlet" verbose="2" annotations="JDK">