[portal-commits] JBoss Portal SVN: r13397 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test and 3 other directories.

Author: vrockai Date: 2009-05-21 09:23:01 -0400 (Thu, 21 May 2009) New Revision: 13397 Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java Removed: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/big_archive.zip branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/many_files.zip Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java Log: [selenium] - removing big archive files for cms, generating them instead 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-20 13:42:30 UTC (rev 13396) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-05-21 13:23:01 UTC (rev 13397) @@ -1,17 +1,18 @@ - <project name="Tests" default="compile" basedir="." xmlns:server="http://jboss.org/ns/test/ant/server"> <property environment="env" /> <property name="workspace" location="${basedir}" /> <property name="java.home" location="${env.JAVA_HOME}" /> - + +<!-- <property name="suitename" location="testng-files" /> <property name="testname" location="testng-files" /> - <property name="testng.dir" location="testng-files" /> <property name="testng.output.dir" location="test-output" /> <property name="testng.debug.dir" location="debug" /> +--> + <property name="dir.testfiles" location="test_files" /> <property name="dir.javadoc" location="javadoc" /> <property name="test.build.dir" location="output/classes" /> <property name="test.src.dir" location="src" /> @@ -42,7 +43,6 @@ <fileset dir="${lib.dir}"> <include name="*.jar" /> </fileset> - </path> <path id="test.cp"> @@ -73,7 +73,6 @@ <!--delete dir="${dir.javadoc}" /--> </target> - <target name="compile" depends=""> <echo message="Compiling testsuite" /> <mkdir dir="${test.build.dir}" /> @@ -81,7 +80,23 @@ <copy file="${test.src.dir}/org/jboss/portal/test/selenium/locator.properties" todir="${test.build.dir}/org/jboss/portal/test/selenium/" /> <copy file="${test.src.dir}/org/jboss/portal/test/selenium/assert.properties" todir="${test.build.dir}/org/jboss/portal/test/selenium/" /> </target> + + <target name="jar-task" depends="compile"> + <jar destfile="${lib.dir}/createFile.jar" basedir="${test.build.dir}" includes="**/ant/**" /> + <taskdef name="createfile" classname="org.jboss.portal.test.ant.FileCreate" classpath="${lib.dir}/createFile.jar"/> + </target> + <target name="create-test-files" depends="jar-task"> + + <mkdir dir="${dir.testfiles}/tmp"/> + <createfile filename="${dir.testfiles}/tmp/bigfile" size="20971520"/> + <zip destfile="${dir.testfiles}/big_archive.zip" basedir="${dir.testfiles}/tmp/" includes="bigfile" /> + + <mkdir dir="${dir.testfiles}/tmp/many_files"/> + <createfile filename="${dir.testfiles}/tmp/many_files/file" count="101" size="1024" suffix=".txt"/> + <zip destfile="${dir.testfiles}/many_files.zip" basedir="${dir.testfiles}/tmp/" includes="many_files/**" /> + </target> + <target name="javadoc" depends=""> <delete dir="${dir.javadoc}" /> <mkdir dir="${dir.javadoc}" /> @@ -121,6 +136,7 @@ <target name="clean"> <echo message="Going to delete directory ${test.build.dir}" /> + <delete dir="${dir.testfiles}/tmp"/> <delete dir="${test.build.dir}" /> </target> @@ -133,13 +149,35 @@ </server> </server:config> - <target name="cleanup"> <echo message="Cleaning up..." /> <antcall target="stop-src" /> </target> - <target name="selenium-suite" depends="init, compile, run-src, copyApps"> + <target name="selenium-groups" depends="init, compile, run-src, copyApps, create-test-files"> + <echo message="Runing TestNG groups: ${testng.groups}" /> + + <mkdir dir="test-output" /> + <mkdir dir="debug" /> + <testng classpathref="test.cp" groups="" sourcedir="${test.src.dir}" listeners="org.jboss.portal.test.selenium.JBossSeleniumTestListener" outputdir="${testng.output.dir}" suitename="SeleniumSuite"> + + <classfileset dir="${test.build.dir}" includes="**/*.class" /> + + <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-suite" depends="init, compile, run-src, copyApps, create-test-files"> <echo message="Runing TestNG" /> <mkdir dir="test-output" /> @@ -162,7 +200,7 @@ <antcall target="cleanup" /> </target> - <target name="run-and-build" depends="init, compile, copyApps"> + <target name="run-and-build" depends="init, compile, copyApps, create-test-files"> <echo message="Starting portal instance : ${portal.instance}" /> <server:start name="${portal.instance}" /> @@ -186,7 +224,7 @@ <antcall target="cleanup" /> </target> - <target name="single-test" depends="init, compile, run-src, copyApps"> + <target name="single-test" depends="init, compile, run-src, copyApps, create-test-files"> <echo message="Runing TestNG" /> <mkdir dir="test-output" /> @@ -207,7 +245,7 @@ </target> - <target name="selenium-test" depends="init, compile, run-src, copyApps"> + <target name="selenium-test" depends="init, compile, run-src, copyApps, create-test-files"> <echo message="Runing TestNG" /> <mkdir dir="test-output" /> @@ -230,7 +268,7 @@ <antcall target="cleanup" /> </target> - <target name="selenium-cms-test" depends="init, compile, run-src, copyApps"> + <target name="selenium-cms-test" depends="init, compile, run-src, copyApps, create-test-files"> <echo message="Runing TestNG" /> <mkdir dir="test-output" /> @@ -253,7 +291,7 @@ <antcall target="cleanup" /> </target> - <target name="selenium-usecase" depends="init, compile, run-src, copyApps"> + <target name="selenium-usecase" depends="init, compile, run-src, copyApps, create-test-files"> <echo message="Runing TestNG" /> <mkdir dir="test-output" /> @@ -275,13 +313,6 @@ </testng> <antcall target="cleanup" /> </target> - - <target name="archive"> - <!--<touch file="touchme.txt"/>--> - <echo file="touchme.txt" message="pipik2" /> - <genkey alias="apache-group" storepass="secret" dname="CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US" /> - <echo message="" /> - </target> - + </project> Added: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/ant/FileCreate.java 2009-05-21 13:23:01 UTC (rev 13397) @@ -0,0 +1,62 @@ +package org.jboss.portal.test.ant; + +import java.io.FileWriter; +import java.io.IOException; + +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; + +public class FileCreate extends Task { + + String filename; + String suffix = ""; + int size = 0; + int count = 1; + + public void setFilename(String filename) { + this.filename = filename; + } + + public void setSuffix(String suffix) { + this.suffix = suffix; + } + + public void setSize(int size) { + this.size = size; + } + + public void setCount(int count) { + this.count = count; + } + + public void execute() { + createFile(); + } + + public void createFile() { + + FileWriter fstream; + try { + for (int i = 0; i < count; i++) { + + String fname = count > 1 ? filename + "" + (i+1) + suffix: filename; + + fstream = new FileWriter(fname); + + for (int k = 0; k < size; k++) { + fstream.write(Math.random() > 0.5 ? 1 : 0); + } + + fstream.close(); + + } + String mess = "File \"" + filename + "\" of size " + size + "B was created"; + if (count > 1) + mess = count + " files \"" + filename + "[i]"+suffix+"\" each of size " + size + "B were created"; + log(mess, Project.MSG_INFO); + } catch (IOException e) { + log("FAIL: " + e.getLocalizedMessage()); + } + } + +} 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-20 13:42:30 UTC (rev 13396) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-05-21 13:23:01 UTC (rev 13397) @@ -28,11 +28,11 @@ * uncomment following lines and set the right path to the workspace in the * case you want to use this test case locally from eclipse */ - /* + { System.setProperty("workspace", "/home/vrockai/workspace/p2.7tests/ui-tests/"); } - */ + /** prefix for locator properties = cms.arch.*/ public final String casePfx = "cms.arch."; private final String SUB_CANCEL_ARCH_UPLOAD = getLoc(casePfx+"sub.cancel.arch.upload","cancel"); @@ -51,7 +51,7 @@ logoutIfPossible(); login("admin", "admin"); // timeout hack - selenium.setSpeed("10000"); + selenium.setSpeed("1000"); } @AfterMethod(groups = { "log" }) Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/big_archive.zip =================================================================== (Binary files differ) Deleted: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/test_files/many_files.zip =================================================================== (Binary files differ)