summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMikael Grankvist <mikael.grankvist@itmill.com>2009-11-24 09:13:34 +0000
committerMikael Grankvist <mikael.grankvist@itmill.com>2009-11-24 09:13:34 +0000
commitef81d11d3ed443c0aa544556a16370156e8d473d (patch)
treebb219b22f5e877cddb88de2953ce16f8edae012f /tests
parent4f6f373c195093f003f5144ae610fa2097f77971 (diff)
downloadvaadin-framework-ef81d11d3ed443c0aa544556a16370156e8d473d.tar.gz
vaadin-framework-ef81d11d3ed443c0aa544556a16370156e8d473d.zip
Added server integration tests. For #3386
svn changeset:9973/svn branch:6.2
Diffstat (limited to 'tests')
-rw-r--r--tests/integration-testscripts/Add_Sampler_to_Liferay.html87
-rw-r--r--tests/integration-testscripts/sampler_deployment.tpl83
-rw-r--r--tests/integration-testscripts/sampler_deployment_liferay.html77
-rw-r--r--tests/integration_tests.xml375
-rw-r--r--tests/test.xml4
5 files changed, 624 insertions, 2 deletions
diff --git a/tests/integration-testscripts/Add_Sampler_to_Liferay.html b/tests/integration-testscripts/Add_Sampler_to_Liferay.html
new file mode 100644
index 0000000000..41a6ea7d20
--- /dev/null
+++ b/tests/integration-testscripts/Add_Sampler_to_Liferay.html
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://192.168.56.102:8080/" />
+<title>Add_Sampler_to_Liferay</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Add_Sampler_to_Liferay</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/web/guest</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>link=Login as bruno</td>
+ <td>48,8</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//div[@id='add-page']/a/span</td>
+ <td>44,113</td>
+</tr>
+<tr>
+ <td>enterCharacter</td>
+ <td>new_page</td>
+ <td>sampler</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Save</td>
+ <td>26,13</td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>200</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>link=sampler</td>
+ <td>39,25</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Layout Template</td>
+ <td>122,21</td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>200</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//img[@onclick=&quot;document.getElementById('layoutTemplateId1').checked = true;&quot;]</td>
+ <td>65,78</td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>document.forms[1].elements[14]</td>
+ <td>23,12</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Add Application</td>
+ <td>76,18</td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>3000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>//div[@id='Vaadin-Sampler']/p/a</td>
+ <td>9,8</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/sampler_deployment.tpl b/tests/integration-testscripts/sampler_deployment.tpl
new file mode 100644
index 0000000000..00823cc62d
--- /dev/null
+++ b/tests/integration-testscripts/sampler_deployment.tpl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>demosampler-all-samples</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">sampler-all-samples</td></tr>
+</thead><tbody>
+<tr>
+ <td>openAndWait</td>
+ <td>/demo</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>//div[@id='sampler']/a/strong</td>
+ <td>96,14</td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<!--Start scrolling through all samples in order-->
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+ <td>11,13</td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>@server@_1</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+ <td>11,13</td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>@server@_2</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/sampler_deployment_liferay.html b/tests/integration-testscripts/sampler_deployment_liferay.html
new file mode 100644
index 0000000000..da5c51af50
--- /dev/null
+++ b/tests/integration-testscripts/sampler_deployment_liferay.html
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Test_Sampler</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_Sampler</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/web/guest/sampler</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+ <td>11,12</td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+ <td>11,12</td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
new file mode 100644
index 0000000000..f00d9e0de1
--- /dev/null
+++ b/tests/integration_tests.xml
@@ -0,0 +1,375 @@
+<?xml version="1.0"?>
+
+<project name="Test sampler deployment" basedir="." default="all">
+
+ <!-- Test with these browsers -->
+ <property name="test_browsers" value="winxp-firefox35" />
+
+ <!-- Target deploying demo.war -->
+ <property name="sshHost" value="rndtestlinux.office.itmill.com" />
+
+ <!-- Key file to use -->
+ <property name="key.file" value="id_rsa" />
+
+ <!-- path and name for demo.war to be deployed -->
+ <property name="demo.war" value="demo.war"/>
+
+ <!-- Host running Testbench RC or Testbench Hub -->
+ <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://${sshHost}:8080" />
+
+ <!-- ssh host values -->
+ <property name="ant.hub" value="/home/rnd/deploy.xml" />
+ <property name="user" value="rnd" />
+ <property name="passphrase" value="" />
+
+ <!-- Upload war to deploy to ssh host -->
+ <target name="upload-demo">
+ <scp file="${demo.war}" todir="${user}@${sshHost}:servers/demo.war" keyfile="${key.file}" passphrase="${passphrase}" />
+ </target>
+
+ <!-- Run sampler deployment test -->
+ <target name="test-sampler">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment.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="browsers" value="${test_browsers}" />
+ <property name="testfiles" value="${testfiles}" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
+ <!-- Start and stop methods for servers -->
+ <target name="start-tomcat-4">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="tomcat-4.1.40" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-tomcat-4">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-tomcat-4.1.40" />
+ </target>
+
+ <target name="start-tomcat-5">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="tomcat-5.5.28" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-tomcat-5">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-tomcat-5.5.28" />
+ </target>
+
+ <target name="start-tomcat-6">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="tomcat-6.0.20" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-tomcat-6">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-tomcat-6.0.20" />
+ </target>
+
+ <target name="start-jetty-5">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="jetty-5.1.15" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-jetty-5">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jetty-5.1.15" />
+ </target>
+
+ <target name="start-jetty-6">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="jetty-6.1.22" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-jetty-6">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jetty-6.1.22" />
+ </target>
+
+ <target name="start-jetty-7">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="jetty-7.0.0" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-jetty-7">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jetty-7.0.0" />
+ </target>
+
+ <target name="start-jboss-3">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="jboss-3.2.8" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-jboss-3">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jboss-3.2.8" />
+ </target>
+
+ <target name="start-jboss-4">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="jboss-4.2.3" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-jboss-4">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jboss-4.2.3" />
+ </target>
+
+ <target name="start-jboss-5">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="jboss-5.0.1" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-jboss-5">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-jboss-5.0.1" />
+ </target>
+
+ <target name="start-glassfish">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="glassfish-2.1.1" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-glassfish">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-glassfish-2.1.1" />
+ </target>
+
+ <!-- Test liferay sampler -->
+ <target name="test-liferay">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment_liferay.html"/>
+ <pathconvert pathsep=" " property="test-liferay" 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="browsers" value="${test_browsers}" />
+ <property name="testfiles" value="${test-liferay}" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
+ <!-- "deploy" sampler to liferay -->
+ <target name="init-liferay">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="Add_Sampler_to_Liferay.html"/>
+ <pathconvert pathsep=" " property="init-liferay" 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="browsers" value="winxp-firefox35" />
+ <property name="testfiles" value="${init-liferay}" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
+ <target name="start-liferay">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />
+ </target>
+
+ <target name="stop-liferay">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-liferay-5.2.3" />
+ </target>
+
+ <!-- Run sampler deployment test for WebLogic server -->
+ <target name="test-weblogic">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment.html"/>
+ <pathconvert pathsep=" " property="test-weblogic" 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://${sshHost}:7001" />
+ <property name="browsers" value="${test_browsers}" />
+ <property name="testfiles" value="${test-weblogic}" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
+ <target name="start-weblogic9">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="weblogic-9.2" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-weblogic9">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-weblogic-9.2" />
+ </target>
+
+ <target name="start-weblogic10">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />
+ <copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="server" value="weblogic-10.3" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="stop-weblogic10">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} stop-weblogic-10.3" />
+ </target>
+
+ <!-- Server setup, test and teardown targets. -->
+ <target name="tomcat4">
+ <antcall target="start-tomcat-4"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-tomcat-4"/>
+ </target>
+
+ <target name="tomcat5">
+ <antcall target="start-tomcat-5"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-tomcat-5"/>
+ </target>
+
+ <target name="tomcat6">
+ <antcall target="start-tomcat-6"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-tomcat-6"/>
+ </target>
+
+ <target name="jetty5">
+ <antcall target="start-jetty-5"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-jetty-5"/>
+ </target>
+
+ <target name="jetty6">
+ <antcall target="start-jetty-6"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-jetty-6"/>
+ </target>
+
+ <target name="jetty7">
+ <antcall target="start-jetty-7"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-jetty-7"/>
+ </target>
+
+ <target name="jboss3">
+ <antcall target="start-jboss-3"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-jboss-3"/>
+ </target>
+
+ <target name="jboss4">
+ <antcall target="start-jboss-4"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-jboss-4"/>
+ </target>
+
+ <target name="jboss5">
+ <antcall target="start-jboss-5"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-jboss-5"/>
+ </target>
+
+ <target name="glassfish">
+ <antcall target="start-glassfish"/>
+ <antcall target="test-sampler"/>
+ <antcall target="stop-glassfish"/>
+ </target>
+
+ <target name="liferay" depends="start-liferay,init-liferay,test-liferay,stop-liferay" />
+
+ <target name="weblogic9">
+ <antcall target="start-weblogic9"/>
+ <antcall target="test-weblogic"/>
+ <antcall target="stop-weblogic9"/>
+ </target>
+
+ <target name="weblogic10">
+ <antcall target="start-weblogic10"/>
+ <antcall target="test-weblogic"/>
+ <antcall target="stop-weblogic10"/>
+ </target>
+
+ <!-- Upload demo, clean error screenshots and test deployment on all servers -->
+ <target name="all" depends="upload-demo,tomcat4,tomcat5,tomcat6,jetty5,jetty6,jetty7,jboss3,jboss4,jboss5,glassfish,liferay,weblogic9,weblogic10,clean" />
+
+ <!-- Remove demo.war -->
+ <target name="clean">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${key.file}" command="ant -f ${ant.hub} clean" />
+ </target>
+
+ <!-- Remove old screenshots if any -->
+ <target name="clean-old">
+ <subant target="remove-error-screens">
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+</project> \ No newline at end of file
diff --git a/tests/test.xml b/tests/test.xml
index c841f8e03b..213bd06f9a 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -104,7 +104,7 @@
<fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
</target>
- <target name="run-tests" depends="remove-error-screens, compile-tests">
+ <target name="run-tests" depends="compile-tests">
<foreach maxthreads="10" parallel="true" target="execute-tests" param="target">
<path>
<fileset dir="${test-output-dir}" includes="**/**.java" />
@@ -162,7 +162,7 @@
<!-- ================================================================== -->
<!-- The default target. -->
- <target name="run-and-clean-up" depends="check-parameters, run-tests,remove-temp-testclasses">
+ <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests,remove-temp-testclasses">
</target>
<!-- Also starts the server. -->
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 03:10:26 +0000