diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-09-07 06:12:39 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-09-07 06:12:39 +0000 |
| commit | 33167286e9a16d020340abde3d621b157ef39f04 (patch) | |
| tree | 5b05afd36c27acb8939dbac434267e99aebb534f /tests/integration_tests.xml | |
| parent | 3826e2e42c5a5ecdec0b956015887d412451c358 (diff) | |
| download | vaadin-framework-33167286e9a16d020340abde3d621b157ef39f04.tar.gz vaadin-framework-33167286e9a16d020340abde3d621b157ef39f04.zip | |
Updated integration tests.
Fixed GateIn test.
Added Liferay6 test.
svn changeset:14731/svn branch:6.4
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 298c161285..906155df2b 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -7,7 +7,7 @@ <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-firefox36" />
@@ -209,7 +209,23 @@ <fileset dir="." includes="test.xml" />
</subant>
+ </target>
+ <target name="integration-test-liferay-6">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-liferay-6.0.5.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="server.start.succeeded" value="1" />
+ <property name="browsers" value="winxp-firefox36" />
+ <property name="testfiles" value="${test-liferay}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
</target>
<target name="integration-test-gatein-3">
@@ -227,7 +243,6 @@ <fileset dir="." includes="test.xml" />
</subant>
-
</target>
<target name="integration-test-start-liferay">
@@ -239,6 +254,15 @@ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-5.2.3" />
</target>
+ <target name="integration-test-start-liferay-6">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0.5" />
+ <copy file="integration-testscripts/integration-test-liferay-6.0.5.html" tofile="integration-testscripts/integration-test-liferay-6.0.5-sampler.html" overwrite="true" />
+ </target>
+
+ <target name="integration-test-stop-liferay-6">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0.5" />
+ </target>
+
<target name="integration-test-start-gatein-3">
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-gatein-3.1.0" />
</target>
@@ -408,6 +432,12 @@ <antcall target="integration-test-liferay-portlet2" />
<antcall target="integration-test-stop-liferay" />
</target>
+
+ <target name="integration-test-liferay6">
+ <antcall target="integration-test-start-liferay-6" />
+ <antcall target="integration-test-liferay-6" />
+ <antcall target="integration-test-stop-liferay-6" />
+ </target>
<target name="integration-test-gatein3">
<antcall target="integration-test-start-gatein-3" />
@@ -482,10 +512,12 @@ <antcall target="run-integration-test">
<param name="target-server" value="liferay"/>
</antcall>
-<!-- <antcall target="run-integration-test">
+ <antcall target="run-integration-test">
+ <param name="target-server" value="liferay6"/>
+ </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>
|