diff options
author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-07-01 12:18:59 +0000 |
---|---|---|
committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-07-01 12:18:59 +0000 |
commit | 938ba6e3c47d38f900fb04ed05038cd6a7bb545b (patch) | |
tree | 4ee58b99e9782b7fca951ec8cc8a2be1dc7939b3 /tests/integration_tests.xml | |
parent | 6ff992225d0d424d9ecd14b767310752f8c52c79 (diff) | |
download | vaadin-framework-938ba6e3c47d38f900fb04ed05038cd6a7bb545b.tar.gz vaadin-framework-938ba6e3c47d38f900fb04ed05038cd6a7bb545b.zip |
liferay portlet2 test.
gatein 3.1.0 integration test
svn changeset:14005/svn branch:6.4
Diffstat (limited to 'tests/integration_tests.xml')
-rw-r--r-- | tests/integration_tests.xml | 65 |
1 files changed, 63 insertions, 2 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index abbb189e81..fefab83861 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -191,6 +191,42 @@ </subant>
</target>
+ <target name="integration-test-liferay-portlet2">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-liferay-5.2.3-portlet2.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="server.start.succeeded" value="1" />
+ <property name="browsers" value="winxp-firefox36" />
+ <property name="testfiles" value="${init-liferay}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+
+ </target>
+
+ <target name="integration-test-gatein-3">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-GateIn-3.1.0-sampler.html" />
+ <pathconvert pathsep=" " property="test-gatein" 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="winxp-firefox36" />
+ <property name="testfiles" value="${test-gatein}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+
+ </target>
+
<target name="integration-test-start-liferay">
<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />
<copy file="integration-testscripts/sampler_deployment_liferay.html" tofile="integration-testscripts/integration-test-liferay-5.2.3-sampler.html" overwrite="true" />
@@ -200,6 +236,14 @@ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-5.2.3" />
</target>
+ <target name="integration-test-start-gatein-3">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-gatein-3.1.0" />
+ </target>
+
+ <target name="integration-test-stop-gatein-3">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-gatein-3.1.0" />
+ </target>
+
<!-- Run sampler deployment test for WebLogic server -->
<target name="integration-test-test-weblogic">
<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
@@ -349,11 +393,25 @@ <target name="integration-test-liferay">
<antcall target="integration-test-start-liferay" />
- <antcall target="integration-test-init-liferay" />
- <antcall target="integration-test-test-liferay" />
+ <trycatch property="tried">
+ <try>
+ <antcall target="integration-test-init-liferay" />
+ <antcall target="integration-test-test-liferay" />
+ </try>
+ <catch>
+ <echo message="Liferay sampler test failed. ${tried}" />
+ </catch>
+ </trycatch>
+ <antcall target="integration-test-liferay-portlet2" />
<antcall target="integration-test-stop-liferay" />
</target>
+ <target name="integration-test-gatein3">
+ <antcall target="integration-test-start-gatein-3" />
+ <antcall target="integration-test-gatein-3" />
+ <antcall target="integration-test-stop-gatein-3" />
+ </target>
+
<target name="integration-test-weblogic9">
<antcall target="integration-test-start-weblogic9"/>
<antcall target="integration-test-test-weblogic">
@@ -422,6 +480,9 @@ <param name="target-server" value="liferay"/>
</antcall>
<antcall target="run-integration-test">
+ <param name="target-server" value="gatein3"/>
+ </antcall>
+ <antcall target="run-integration-test">
<param name="target-server" value="weblogic9"/>
</antcall>
<antcall target="run-integration-test">
|