Author: vrockai Date: 2009-05-12 09:34:56 -0400 (Tue, 12 May 2009) New Revision: 13343 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml Log: [selenium] run.sh workspace property fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-12 13:20:33 UTC (rev 13342) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-12 13:34:56 UTC (rev 13343) @@ -3,7 +3,7 @@ <property environment="env" /> - <property name="workspace" location="build.xml" /> + <property name="workspace" location="." /> <property name="java.home" location="${env.JAVA_HOME}" /> <property name="suitename" location="testng-files" /> @@ -66,6 +66,7 @@ <target name="init"> <echo message="Browser : ${browser}" /> <echo message="Screenshot : ${screenshot}" /> + <echo message="Workspace : ${workspace}" /> <echo message="Deleting testng report directory" /> <delete dir="${testng.output.dir}" /> <delete dir="${testng.debug.dir}" /> Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-05-12 13:20:33 UTC (rev 13342) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-05-12 13:34:56 UTC (rev 13343) @@ -47,7 +47,7 @@ exit 0; fi ant -f build.xml copyApps - ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true" + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true" elif [ $1 = "end2end" ]; then if [ -z "$2" -o ! -f "$2" ]; then echo @@ -55,7 +55,7 @@ exit 0; fi ant -f build.xml copyApps - ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true" + ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true" elif [ $1 = "perf" ]; then if [ -z "$2" -o ! -f "$2" ]; then echo @@ -63,7 +63,7 @@ exit 0; fi ant -f build.xml copyApps - ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true" + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true" elif [ $1 = "selenium" ]; then ant -f build.xml run-src elif [ $1 = "single" ]; then Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-12 13:20:33 UTC (rev 13342) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-12 13:34:56 UTC (rev 13343) @@ -18,7 +18,7 @@ /** The constant defining the wait time (in ms) between attempts when checking if the file was uploaded. */ - public static final int ARCHIVE_WAITING = 5000; + public static final int ARCHIVE_WAITING = 1000; /** The constant defining the the number of attempts when checking if the file was uploaded. */ public static final int ATTEMPTS = 50; @@ -76,6 +76,9 @@ selenium.select(SEL_ACTION, "label=Upload Archive"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.waitForPopUp("_top", PAGE_LOAD); + + debugPrint("CMSArchiveUploadTestCase archive location: "+WORKSPACE + "/test_files/archive.zip"); + selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/archive.zip"); selenium.click(SUB_CANCEL_ARCH_UPLOAD); @@ -147,6 +150,9 @@ selenium.select(SEL_ACTION, "label=Upload Archive"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.waitForPopUp("_top", PAGE_LOAD); + + debugPrint("CMSArchiveUploadTestCase archive location: "+WORKSPACE + "/test_files/many_files.zip"); + selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/many_files.zip"); selenium.click(SUB_SEND_ARCHIVE); @@ -197,6 +203,8 @@ selenium.select(SEL_ACTION, "label=Upload Archive"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.waitForPopUp("_top", PAGE_LOAD); + + debugPrint("CMSArchiveUploadTestCase archive location: "+ WORKSPACE + "/test_files/big_archive.zip"); selenium.type(INP_ARCHIVE_FILE, WORKSPACE + "/test_files/big_archive.zip"); selenium.click(SUB_SEND_ARCHIVE); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-05-12 13:20:33 UTC (rev 13342) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2009-05-12 13:34:56 UTC (rev 13343) @@ -1,6 +1,6 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="SeleniumTest"> - +<!-- <test verbose="2" name="org.jboss.portal.test.selenium.UserLoginTestCase" annotations="JDK"> <classes> <class name="org.jboss.portal.test.selenium.UserLoginTestCase"/> @@ -117,7 +117,7 @@ <classes> <class name="org.jboss.portal.test.selenium.portal.EndtoEndPortalAdminTestCase"></class></classes> </test> - +--> <test name="org.jboss.portal.test.selenium.cms.CMSArchiveUploadTestCase" verbose="2" annotations="JDK"> <classes>