diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-10-05 09:11:52 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-10-05 09:11:52 +0000 |
| commit | 29bdff707705ffe2b67752a103e267778be75324 (patch) | |
| tree | 9bc621a36a7c45e7a2ec134f5013df6e40174674 /tests/integration_tests.xml | |
| parent | fd73c209e01309c35398eae25bce58563de707b7 (diff) | |
| download | vaadin-framework-29bdff707705ffe2b67752a103e267778be75324.tar.gz vaadin-framework-29bdff707705ffe2b67752a103e267778be75324.zip | |
Merged test, javadoc and integration test changes from 6.4
svn changeset:15402/svn branch:6.5
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index ef96c2d17f..a3f56259f4 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -244,6 +244,39 @@ </subant>
</target>
+ <target name="integration-test-liferay-6ee">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-liferay-6ee.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="test-theme-liferay-6ee">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay6EE-theme.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="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">
<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" />
@@ -278,6 +311,14 @@ <target name="integration-test-stop-liferay-6">
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0.5" />
</target>
+
+ <target name="integration-test-start-liferay-6ee">
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0-ee" />
+ </target>
+
+ <target name="integration-test-stop-liferay-6ee">
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0-ee" />
+ </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" />
@@ -456,6 +497,13 @@ <antcall target="integration-test-stop-liferay-6" />
</target>
+ <target name="integration-test-liferay6ee">
+ <antcall target="integration-test-start-liferay-6ee" />
+ <antcall target="integration-test-liferay-6ee" />
+ <antcall target="test-theme-liferay-6ee" />
+ <antcall target="integration-test-stop-liferay-6ee" />
+ </target>
+
<target name="integration-test-gatein3">
<antcall target="integration-test-start-gatein-3" />
<antcall target="integration-test-gatein-3" />
@@ -533,6 +581,9 @@ <param name="target-server" value="liferay6"/>
</antcall>
<antcall target="run-integration-test">
+ <param name="target-server" value="liferay6ee"/>
+ </antcall>
+ <antcall target="run-integration-test">
<param name="target-server" value="gatein3"/>
</antcall>
<antcall target="run-integration-test">
|