diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2009-11-26 12:46:27 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2009-11-26 12:46:27 +0000 |
| commit | 032930eb484ad9bac2b8cee3f4249f7897b60d34 (patch) | |
| tree | 59373b368e7868914ea4359823348b43983c87c0 /tests/integration_tests.xml | |
| parent | 6bc4eda9973c56cc6e0ac8f4ba881833f566f643 (diff) | |
| download | vaadin-framework-032930eb484ad9bac2b8cee3f4249f7897b60d34.tar.gz vaadin-framework-032930eb484ad9bac2b8cee3f4249f7897b60d34.zip | |
#3387 GAE integration test added
fixed weblogic test naming
svn changeset:10069/svn branch:6.2
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index f276f592f6..25e324ffe6 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -180,7 +180,7 @@ <!-- Run sampler deployment test for WebLogic server -->
<target name="test-weblogic">
- <fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment.html" />
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
<pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />
<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -212,6 +212,26 @@ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-weblogic-10.3" />
</target>
+ <!-- Run sampler deployment test on GAE -->
+ <target name="test-GAE">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-GAE-sampler.html" />
+ <pathconvert pathsep=" " property="test-GAE" 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://vaadin-integration-test.appspot.com/" />
+ <property name="browsers" value="${test_browsers}" />
+ <property name="testfiles" value="${test-GAE}" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
+ <target name="deploy-to-GAE">
+ <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />
+ </target>
+
<!-- Server setup, test and teardown targets. -->
<target name="tomcat4">
<antcall target="start-tomcat-4"/>
@@ -316,8 +336,13 @@ <antcall target="stop-weblogic10"/>
</target>
+ <target name="GAE">
+ <antcall target="deploy-to-GAE"/>
+ <antcall target="test-GAE" />
+ </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" />
+ <target name="all" depends="upload-demo,tomcat4,tomcat5,tomcat6,jetty5,jetty6,jetty7,jboss3,jboss4,jboss5,glassfish,liferay,weblogic9,weblogic10,GAE,clean" />
<!-- Remove demo.war -->
<target name="clean">
|