diff options
| author | Henri Kerola <henri.kerola@itmill.com> | 2010-09-20 15:12:42 +0000 |
|---|---|---|
| committer | Henri Kerola <henri.kerola@itmill.com> | 2010-09-20 15:12:42 +0000 |
| commit | 6be3c8a27296b842df0702da538103fe106122ea (patch) | |
| tree | d9093e943f324f5097d3e22661b0bc287b460678 /tests/integration_tests.xml | |
| parent | e46903fc8b5dafb35f8d8641693cb1674d64b2f1 (diff) | |
| download | vaadin-framework-6be3c8a27296b842df0702da538103fe106122ea.tar.gz vaadin-framework-6be3c8a27296b842df0702da538103fe106122ea.zip | |
#5582: Replaced Sampler with LiferayThemeDemo in the Liferay 6 integration test + run a test for LiferayThemeDemo.
svn changeset:15080/svn branch:6.4
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 206048409b..466bf8eec6 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -228,6 +228,23 @@ </subant>
</target>
+ <target name="test-theme-liferay-6">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="test-liferay6-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="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">
<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" />
@@ -436,6 +453,7 @@ <target name="integration-test-liferay6">
<antcall target="integration-test-start-liferay-6" />
<antcall target="integration-test-liferay-6" />
+ <antcall target="test-theme-liferay-6" />
<antcall target="integration-test-stop-liferay-6" />
</target>
|