Renamed tests -> uitest and tests/testbench -> uitest/src (#9299)

1 files changed, 0 insertions, 485 deletions

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
deleted file mode 100644
index e8e978c1ea..0000000000
--- a/tests/integration_tests.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0"?>
-
-<project xmlns:antcontrib="antlib:net.sf.antcontrib"
-	name="Vaadin Integration Tests" basedir="." default="integration-test-all">
-
-    <!-- Import common targets  -->
-    <import file="../build/common.xml" />
-
-	<!-- Target deploying demo.war -->
-	<fail unless="test.integration.server" message="test.integration.server must be set for integration tests to run" />
-
-	<fail unless="test.integration.user" message="test.integration.user must be set for integration tests to run" />
-	<fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" />
-
-	<!-- Test with these browsers -->
-	<property name="test_browsers" value="winxp-firefox11" />
-
-	<!-- Path to key file. Default value -->
-	<property name="sshkey.file" value="id_dsa" />
-
-	<!-- path and name for demo.war to be deployed -->
-	<property name="demo.war" value="demo.war" />
-
-	<!-- Host running Testbench RC or Testbench Hub. Default value -->
-	<property name="com.vaadin.testbench.tester.host" value="127.0.0.1" />
-
-	<!-- Base url where the testable application is deployed -->
-	<property name="deployment.url" value="http://${test.integration.server}:8080" />
-
-	<!-- ssh host values -->
-	<property name="ant.hub" value="${test.integration.antfile}" />
-	<property name="user" value="${test.integration.user}" />
-	<property name="passphrase" value="" />
-
-	<!-- Upload war to deploy to ssh host -->
-	<target name="integration-test-upload-demo">
-		<scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
-	</target>
-
-	<!-- Run basic integration test test -->
-	<target name="integration-test-servlet">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
-			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
-			<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
-			<property name="server.start.succeeded" value="1" />
-			<property name="browsers" value="${test_browsers}" />
-			<property name="testfiles" value="${testfiles}" />
-			<property name="test-output-dir" value="../build/integration-test-output/${server-name}" />
-			<property name="retries" value="0" />
-
-			<fileset dir="." includes="test.xml" />
-		</subant>
-	</target>
-
-	<target name="integration-test-theme">
-		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
-			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
-			<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
-			<property name="server.start.succeeded" value="1" />
-			<property name="testfiles" value="${testfiles-theme}" />
-			<property name="test-output-dir" value="../build/integration-test-output/${server-name}" />
-
-			<fileset dir="." includes="test.xml" />
-		</subant>
-	</target>
-
-	<!-- Run integration test on GAE -->
-	<target name="integration-test-test-GAE">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />
-		<pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />
-
-		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
-			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
-			<property name="com.vaadin.testbench.deployment.url" value="http://vaadin-integration-test.appspot.com/" />
-			<property name="server.start.succeeded" value="1" />
-			<property name="browsers" value="${test_browsers}" />
-			<property name="testfiles" value="${test-GAE}" />
-			<property name="test-output-dir" value="../build/integration-test-gae-output" />
-
-			<fileset dir="." includes="test.xml" />
-		</subant>
-	</target>
-
-	<target name="integration-test-deploy-to-GAE">
-		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />
-	</target>
-
-
-	<target name="integration-test-tomcat7">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="tomcat7" />
-		</antcall>
-	</target>
-	<target name="integration-test-tomcat5">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="tomcat5" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-tomcat6">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="tomcat6" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jetty5">
-		<antcall target="run-generic-integration-test">
-			<param name="target-server" value="jetty5" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jetty6">
-		<antcall target="run-generic-integration-test">
-			<param name="target-server" value="jetty6" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jetty7">
-		<antcall target="run-generic-integration-test">
-			<param name="target-server" value="jetty7" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jetty8">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="300" />
-			<param name="target-server" value="jetty8" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jboss4">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="jboss4" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jboss5">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="jboss5" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jboss6">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="jboss6" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-jboss7">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="jboss7" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-glassfish2">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="glassfish2" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-glassfish3">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="10" />
-			<param name="target-server" value="glassfish3" />
-		</antcall>
-	</target>
-
-
-	<target name="integration-test-liferay6">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/integration-test-liferay-6.0.5.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-
-		<fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6/Liferay6-theme.html" />
-		<pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />
-
-
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-server" value="liferay6" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-liferay5">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-server" value="liferay5" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-liferay6ee">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6EE/integration-test-liferay-6ee.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-
-		<fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6EE/Liferay6EE-theme.html" />
-		<pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />
-
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-server" value="liferay6ee" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-gatein3">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="test_browsers" value="winxp-googlechrome19" />
-			<param name="target-server" value="gatein3" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-exo3">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-portlet2.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="test_browsers" value="winxp-googlechrome19" />
-			<param name="target-server" value="exo3" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-weblogic9">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-port" value="7001" />
-			<param name="target-server" value="weblogic9" />
-		</antcall>
-	</target>
-	
-    <target name="integration-test-websphere8">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="600" />
-            <param name="target-port" value="9080" />
-            <param name="target-server" value="websphere8" />
-        </antcall>
-    </target>	
-
-	<target name="integration-test-weblogic10">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-port" value="7001" />
-			<param name="target-server" value="weblogic10" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-weblogic12">
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-port" value="7001" />
-			<param name="target-server" value="weblogic12" />
-		</antcall>
-	</target>
-
-
-	<target name="integration-test-weblogicPortal">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />
-		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-		<antcall target="run-generic-integration-test">
-			<param name="startDelay" value="600" />
-			<param name="target-port" value="7001" />
-			<param name="target-server" value="weblogicportal" />
-		</antcall>
-	</target>
-
-	<target name="integration-test-GAE">
-		<antcall target="integration-test-deploy-to-GAE" />
-		<antcall target="integration-test-test-GAE" />
-	</target>
-
-	<!-- Upload demo, clean error screenshots and test deployment on all servers -->
-	<target name="integration-test-all" depends="common.init-deps">
-		<parallel>
-			<antcontrib:trycatch property="tried">
-				<try>
-					<!-- Still running GAE test from the old server which requires its own lock -->
-					<echo message="Getting lock" />
-					<antcall target="integration-test-get-lock" />
-					<echo message="Got lock" />
-					<antcall target="integration-test-upload-demo" />
-
-					<antcall target="run-integration-test">
-						<param name="target-server" value="GAE" />
-					</antcall>
-
-					<antcall target="integration-test-clean" />
-					<echo message="Getting lock" />
-					<antcall target="integration-test-release-lock" />
-					<echo message="Lock released" />
-
-				</try>
-				<catch>
-					<echo message="Uploading of demo.war failed. ${tried}" />
-				</catch>
-			</antcontrib:trycatch>
-			<antcall target="integration-test-liferay6" />
-			<antcall target="integration-test-liferay6ee" />
-			<antcall target="integration-test-exo3" />
-			<antcall target="integration-test-weblogicPortal" />
-			<antcall target="integration-test-liferay5" />
-			<antcall target="integration-test-weblogic9" />
-			<antcall target="integration-test-weblogic10" />
-			<antcall target="integration-test-weblogic12" />
-			<antcall target="integration-test-gatein3" />
-			<antcall target="integration-test-glassfish2" />
-			<antcall target="integration-test-glassfish3" />
-			<antcall target="integration-test-jboss4" />
-			<antcall target="integration-test-jboss5" />
-			<antcall target="integration-test-jboss6" />
-			<antcall target="integration-test-jboss7" />
-			<antcall target="integration-test-jetty5" />
-			<antcall target="integration-test-jetty6" />
-			<antcall target="integration-test-jetty7" />
-			<antcall target="integration-test-jetty8" />
-			<antcall target="integration-test-tomcat5" />
-			<antcall target="integration-test-tomcat6" />
-			<antcall target="integration-test-tomcat7" />
-			<antcall target="integration-test-websphere8" />
-
-		</parallel>
-
-	</target>
-
-	<target name="do-run-generic-test">
-		<property name="target-host" value="${target-server}.devnet.vaadin.com" />
-		<property name="target-port" value="8080" />
-		<antcontrib:if>
-			<isset property="startDelay" />
-			<then>
-				<antcontrib:math result="sleepTime" datatype="int">
-					<op op="rint">
-						<op op="*">
-							<num value="${startDelay}" />
-							<op op="random" />
-						</op>
-					</op>
-				</antcontrib:math>
-				<echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo>		
-				<sleep seconds="${sleepTime}" />
-			</then>
-		</antcontrib:if>
-		
-		<scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >
-			<fileset dir="integration_base_files">
-				<include name="*" />
-			</fileset>
-		</scp>
-
-		<!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->
-		<antcontrib:trycatch property="error_message">
-			<try>
-				<!-- timeout in one hour (remote end should timeout in 55 minutes) -->
-				<sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />
-				<antcall target="echo-prefix">
-					<param name="prefix" value="${target-server}: " />
-					<param name="message" value="${lock-output}" />
-				</antcall>
-
-				<scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
-
-				<!-- timeout in 15 minutes -->
-				<sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" failonerror="false" />
-				<antcall target="echo-prefix">
-					<param name="prefix" value="${target-server}: " />
-					<param name="message" value="${start-output}" />
-				</antcall>
-
-				<fail message="${start-output}">
-					<condition>
-						<not>
-							<contains string="${start-output}" substring="Demo deployed successfully" />
-						</not>
-					</condition>
-				</fail>
-
-				<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" />
-				<antcall target="integration-test-servlet">
-					<param name="server-name" value="${target-server}" />
-					<param name="deployment.url" value="http://${target-host}:${target-port}" />
-				</antcall>
-
-				<!-- Run theme tests in all browsers if there's a property with the test files -->
-				<antcontrib:if>
-					<isset property="testfiles-theme" />
-					<antcontrib:then>
-						<antcall target="integration-test-theme">
-							<param name="server-name" value="${target-server}" />
-							<param name="deployment.url" value="http://${target-host}:${target-port}" />
-						</antcall>
-					</antcontrib:then>
-				</antcontrib:if>
-				
-				<!-- timeout in five minutes -->
-				<sshexec host="${target-host}" outputproperty="stop-output" timeout="600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" />
-				<antcall target="echo-prefix">
-					<param name="prefix" value="${target-server}: " />
-					<param name="message" value="${stop-output}" />
-				</antcall>
-			</try>
-			<catch>
-				<fail message="${error_message}" />
-			</catch>
-		</antcontrib:trycatch>
-	</target>
-
-	<target name="echo-prefix">
-		<antcontrib:propertyregex property="message-prefixed" input="${prefix}${message}" regexp="\n" replace="\0${prefix}" global="true" defaultValue="${prefix}${message}" />
-		<echo message="${message-prefixed}" />
-	</target>
-
-	<target name="run-generic-integration-test">
-		<concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
-		<antcontrib:trycatch property="tried">
-			<try>
-				<antcall target="do-run-generic-test" />
-			</try>
-			<catch>
-				<antcontrib:antcallback target="teamcity-escape" return="tried-escaped">
-					<param name="returnTo" value="tried-escaped" />
-					<param name="message" value="${tried}" />
-				</antcontrib:antcallback>
-				<concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']</concat>
-			</catch>
-		</antcontrib:trycatch>
-		<concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
-	</target>
-
-	<target name="teamcity-escape">
-		<property name="returnTo" value="return" />
-
-		<!-- Should also perform other escaping (\u0085, \u2028 and \u2029) - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->
-		<!-- Immutable properties -> needs to create a new one every time -->
-		<antcontrib:propertyregex property="details-escaped1" input="${message}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${message}" />
-		<antcontrib:propertyregex property="details-escaped2" input="${details-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${details-escaped1}" />
-		<antcontrib:propertyregex property="details-escaped3" input="${details-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${details-escaped2}" />
-
-		<property name="${returnTo}" value="${details-escaped3}" />
-	</target>
-
-	<target name="run-integration-test">
-		<concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
-		<antcontrib:trycatch property="tried">
-			<try>
-				<antcall target="integration-test-${target-server}" />
-			</try>
-			<catch>
-				<antcallback target="teamcity-escape" return="tried-escaped">
-					<param name="returnTo" value="tried-escaped" />
-					<param name="message" value="${tried}" />
-				</antcallback>
-				<concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>
-			</catch>
-		</antcontrib:trycatch>
-		<concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
-	</target>
-
-	<target name="integration-test-get-lock">
-		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} get-lock" />
-	</target>
-
-	<target name="integration-test-release-lock">
-		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} release-lock" />
-	</target>
-
-	<!-- Remove demo.war -->
-	<target name="integration-test-clean">
-		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />
-	</target>
-</project>