Author: mposolda(a)redhat.com Date: 2009-07-28 18:28:07 -0400 (Tue, 28 Jul 2009) New Revision: 13609 Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/build.xml branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java Log: Refactoring for selenium https test. Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/build.xml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/build.xml 2009-07-28 14:57:57 UTC (rev 13608) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/build.xml 2009-07-28 22:28:07 UTC (rev 13609) @@ -39,7 +39,7 @@ <!-- Default properties for single-test-without-dependencies --> <property name="suite.test.name" value="Ant test" /> - <property name="browserURL" value="http://localhost:8080/portal/" /> + <property name="browser.url" value="http://localhost:8080/portal/" /> <path id="jboss.test.classpath"> <pathelement path="${jboss.test.jar}" /> @@ -114,6 +114,13 @@ </target> <target name="run-src"> + <!-- Only one call is performed --> + <antcall target="run-src-without-ssl" /> + <antcall target="run-src-with-ssl" /> + </target> + + <!-- RUNNING SELENIUM SERVER FOR NORMAL TESTING --> + <target name="run-src-without-ssl" unless="https.flag"> <echo message="Starting Selenium Remote Control" /> <java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true"> <arg value="-multiWindow" /> @@ -126,15 +133,18 @@ <arg value="-debug" /> <arg value="-userExtensions" /> <arg value="${selsrv.dir}/user-extensions.js" /> - </java> + </java> <sleep seconds="20" /> </target> - <target name="run-src-with-ssl"> - <echo message="Starting Selenium Remote Control with usage of HTTPS" /> + <!-- RUNNING SELENIUM SERVER FOR HTTPS TESTING --> + <target name="run-src-with-ssl" if="https.flag"> + <echo message="Starting Selenium Remote Control for testing with HTTPS" /> <java jar="${selsrv.dir}/selenium-server.jar" fork="true" spawn="true"> <arg value="-trustAllSSLCertificates" /> <arg value="-multiWindow" /> + <arg value="-timeout" /> + <arg value="320000" /> <arg value="-port" /> <arg value="44444" /> <arg value="-log" /> @@ -143,10 +153,10 @@ <arg value="-firefoxProfileTemplate" /> <arg value="${selsrv.dir}/https-testing/localhost/SSLFirefoxProfile" /> <arg value="-userExtensions" /> - <arg value="${selsrv.dir}/user-extensions.js" /> + <arg value="${selsrv.dir}/user-extensions.js" /> </java> <sleep seconds="20" /> - </target> + </target> <target name="stop-src"> <get taskname="selenium-shutdown" src="http://localhost:44444/selenium-server/driver/?cmd=shutDown" dest="result.txt" ignoreerrors="true" /> @@ -206,8 +216,6 @@ </target> <target name="selenium-suite" depends="init, compile, run-src, copyApps, create-test-files"> - <echo message="Runing TestNG" /> - <mkdir dir="test-output" /> <mkdir dir="debug" /> <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumSuite"> @@ -215,6 +223,7 @@ <xmlfileset dir="." includes="${user.suite}" /> <sysproperty key="browser" value="${browser}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> @@ -238,6 +247,7 @@ <xmlfileset dir="." includes="${test.suite}" /> <sysproperty key="browser" value="${browser}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> @@ -261,6 +271,7 @@ <classfileset dir="${test.build.dir}" includes="${testname}" /> <sysproperty key="browser" value="${browser}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> @@ -283,7 +294,7 @@ <classfileset dir="${test.build.dir}" includes="${testname}" /> <sysproperty key="browser" value="${browser}" /> - <sysproperty key="browserURL" value="${browserURL}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> @@ -305,6 +316,7 @@ <xmlfileset dir="." includes="${test.suite}" /> <sysproperty key="browser" value="${browser}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> @@ -328,6 +340,7 @@ <xmlfileset dir="." includes="${test.cms.suite}" /> <sysproperty key="browser" value="${browser}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> @@ -352,6 +365,7 @@ <xmlfileset dir="." includes="${usecase.suite}" /> <sysproperty key="browser" value="${browser}" /> + <sysproperty key="browser.url" value="${browser.url}" /> <sysproperty key="screenshot" value="${screenshot}" /> <sysproperty key="debug" value="${debug}" /> <sysproperty key="workspace" value="${workspace}" /> Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-07-28 14:57:57 UTC (rev 13608) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-07-28 22:28:07 UTC (rev 13609) @@ -76,7 +76,7 @@ ELEM_TIMEOUT = Integer.valueOf(getMess("selenium.timeout.elem", String.valueOf(ELEM_TIMEOUT+""))); String browser = System.getProperty("browser"); - String browserURL = System.getProperty("browserURL"); + String browserURL = System.getProperty("browser.url"); if ((browserURL == null) || ("".equals(browserURL))) { browserURL = "http://localhost:8080/portal/"; }