]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a0bf9b)
#7178 New servlet integration test not using the address book demo, related screenshots
authorHenri Sara <henri.sara@itmill.com>
Fri, 12 Aug 2011 09:53:31 +0000 (09:53 +0000)
committerHenri Sara <henri.sara@itmill.com>
Fri, 12 Aug 2011 09:53:31 +0000 (09:53 +0000)
svn changeset:20342/svn branch:6.7

build/build.xml patch | blob | history
tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html [deleted file] patch | blob | history
tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html [new file with mode: 0644] patch | blob
tests/integration-testscripts/common/addressbook_deployment.tpl [deleted file] patch | blob | history
tests/integration-testscripts/common/integration_test.tpl [new file with mode: 0644] patch | blob
tests/integration_tests.xml patch | blob | history
tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java [new file with mode: 0644] patch | blob
tests/src/com/vaadin/tests/integration/fi.gif [new file with mode: 0755] patch | blob
tests/src/com/vaadin/tests/integration/se.gif [new file with mode: 0755] patch | blob

diff --git a/build/build.xml b/build/build.xml
index c62f64796d84fcdd12d138c6f4bd324075d81181..0b8a47d69afa5c90ea3d1bca2d8580147dc4b499 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -837,6 +837,13 @@
             </fileset>
         </copy>
 
+        <echo>Adding test resources.</echo>
+        <copy todir="${output-dir}/WebContent/WEB-INF/classes">
+            <fileset dir="tests/src">
+                <include name="${toolkit-package}/tests/integration/*.gif" />
+            </fileset>
+        </copy>
+
         <echo>Adding source for demos</echo>
         <copy todir="${output-dir}/WebContent/WEB-INF/src">
             <fileset dir="${result-path}/src/demo">
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html
deleted file mode 100644 (file)
index 495a9ec..0000000
--- a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://vaadin-integration-test.appspot.com/" />
-<title>integration-test-GAE-addressbook</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">integration-test-GAE-addressbook</td></tr>
-</thead><tbody>
-<tr>
-       <td>openAndWait</td>
-       <td>/AddressBook</td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>5000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
-       <td>62,13</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>1000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>1000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>verifyTextPresent</td>
-       <td>Save</td>
-       <td></td>
-</tr>
-<tr>
-       <td>verifyValue</td>
-       <td>vaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
-       <td>Marge</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
new file mode 100644 (file)
index 0000000..ff6889d
--- /dev/null
+++ b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://vaadin-integration-test.appspot.com/" />
+<title>integration-test-GAE</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration-test-GAE</td></tr>
+</thead><tbody>
+<tr>
+       <td>openAndWait</td>
+       <td>/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>5000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+       <td>51,13</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>5000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyValue</td>
+       <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
+       <td>FI</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/common/addressbook_deployment.tpl b/tests/integration-testscripts/common/addressbook_deployment.tpl
deleted file mode 100644 (file)
index cf2d936..0000000
--- a/tests/integration-testscripts/common/addressbook_deployment.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://vaadin-integration-tests:8080/" />
-<title>addressbook_deployment</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">addressbook_deployment</td></tr>
-</thead><tbody>
-<tr>
-       <td>openAndWait</td>
-       <td>/demo/AddressBook</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
-       <td>62,13</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>Marge_selected</td>
-</tr>
-<tr>
-       <td>click</td>
-       <td>vaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>500</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>Marge_in_edit_mode</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration-testscripts/common/integration_test.tpl b/tests/integration-testscripts/common/integration_test.tpl
new file mode 100644 (file)
index 0000000..4275d3f
--- /dev/null
+++ b/tests/integration-testscripts/common/integration_test.tpl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://vaadin-integration-tests:8080/" />
+<title>integration_test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration_test</td></tr>
+</thead><tbody>
+<tr>
+       <td>openAndWait</td>
+       <td>/demo/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>500</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>initial</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=demoruncomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+       <td>51,13</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>finland</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index a525d5571b1370c245b723ce7535d576e5e164c3..5e6f84e43a3d31085aee59cd5a1418344b3d1cbd 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -40,9 +40,9 @@
                <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />\r
        </target>\r
        \r
-       <!-- Run basic address book test -->\r
-       <target name="integration-test-addressbook">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />\r
+       <!-- Run basic integration test test -->\r
+       <target name="integration-test-servlet">\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />\r
                <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -62,7 +62,7 @@
        <!-- Start and stop methods for servers -->\r
        <target name="integration-test-start-tomcat-4">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-tomcat-4">\r
@@ -71,7 +71,7 @@
        \r
        <target name="integration-test-start-tomcat-5">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-tomcat-5">\r
@@ -80,7 +80,7 @@
        \r
        <target name="integration-test-start-tomcat-6">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-tomcat-6">\r
@@ -89,7 +89,7 @@
        \r
        <target name="integration-test-start-jetty-5">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jetty-5">\r
@@ -98,7 +98,7 @@
 \r
        <target name="integration-test-start-jetty-6">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jetty-6">\r
@@ -107,7 +107,7 @@
        \r
        <target name="integration-test-start-jetty-7">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jetty-7">\r
@@ -116,7 +116,7 @@
        \r
        <target name="integration-test-start-jboss-3">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jboss-3">\r
@@ -125,7 +125,7 @@
        \r
        <target name="integration-test-start-jboss-4">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jboss-4">\r
@@ -134,7 +134,7 @@
        \r
        <target name="integration-test-start-jboss-5">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jboss-5">\r
@@ -143,7 +143,7 @@
        \r
        <target name="integration-test-start-glassfish2">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-servlet.html" overwrite="true" />\r
        </target>\r
        \r
        <target name="integration-test-stop-glassfish2">\r
@@ -152,7 +152,7 @@
        \r
        <target name="integration-test-start-glassfish3">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-3" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-glassfish-3-servlet.html" overwrite="true" />\r
        </target>\r
        \r
        <target name="integration-test-stop-glassfish3">\r
@@ -334,9 +334,9 @@
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-eXo-3.0.3" />\r
        </target>\r
        \r
-       <!-- Run address book test for WebLogic server -->\r
+       <!-- Run integration test for WebLogic server -->\r
        <target name="integration-test-test-weblogic">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />\r
                <pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -354,7 +354,7 @@
        \r
        <target name="integration-test-start-weblogic9">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-weblogic9">\r
@@ -363,7 +363,7 @@
        \r
        <target name="integration-test-start-weblogic10">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />\r
-               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-addressbook.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-servlet.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-weblogic10">\r
@@ -379,9 +379,9 @@
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-weblogic-portal" />\r
        </target>\r
        \r
-       <!-- Run address book deployment test on GAE -->\r
+       <!-- Run integration test on GAE -->\r
        <target name="integration-test-test-GAE">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE-addressbook.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />\r
                <pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -404,7 +404,7 @@
        <!-- Server setup, test and teardown targets. -->\r
        <target name="integration-test-tomcat4">\r
                <antcall target="integration-test-start-tomcat-4"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="tomcat-4.1.40" />\r
                </antcall>\r
                <antcall target="integration-test-stop-tomcat-4"/>\r
@@ -412,7 +412,7 @@
        \r
        <target name="integration-test-tomcat5">\r
                <antcall target="integration-test-start-tomcat-5"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="tomcat-5.5.28" />\r
                </antcall>\r
                <antcall target="integration-test-stop-tomcat-5"/>\r
@@ -420,7 +420,7 @@
        \r
        <target name="integration-test-tomcat6">\r
                <antcall target="integration-test-start-tomcat-6"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="tomcat-6.0.20" />\r
                </antcall>\r
                <antcall target="integration-test-stop-tomcat-6"/>\r
@@ -428,7 +428,7 @@
        \r
        <target name="integration-test-jetty5">\r
                <antcall target="integration-test-start-jetty-5"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="jetty-5.1.15" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jetty-5"/>\r
@@ -436,7 +436,7 @@
        \r
        <target name="integration-test-jetty6">\r
                <antcall target="integration-test-start-jetty-6"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="jetty-6.1.22" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jetty-6"/>\r
@@ -444,7 +444,7 @@
        \r
        <target name="integration-test-jetty7">\r
                <antcall target="integration-test-start-jetty-7"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="jetty-7.0.0" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jetty-7"/>\r
@@ -452,7 +452,7 @@
        \r
        <target name="integration-test-jboss3">\r
                <antcall target="integration-test-start-jboss-3"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="jboss-3.2.8" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jboss-3"/>\r
@@ -460,7 +460,7 @@
        \r
        <target name="integration-test-jboss4">\r
                <antcall target="integration-test-start-jboss-4"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="jboss-4.2.3" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jboss-4"/>\r
@@ -468,7 +468,7 @@
        \r
        <target name="integration-test-jboss5">\r
                <antcall target="integration-test-start-jboss-5"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="jboss-5.0.1" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jboss-5"/>\r
@@ -476,7 +476,7 @@
                \r
        <target name="integration-test-glassfish2">\r
                <antcall target="integration-test-start-glassfish2"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="glassfish-2.1.1" />\r
                </antcall>\r
                <antcall target="integration-test-stop-glassfish2"/>\r
@@ -484,7 +484,7 @@
        \r
        <target name="integration-test-glassfish3">\r
                <antcall target="integration-test-start-glassfish3"/>\r
-               <antcall target="integration-test-addressbook">\r
+               <antcall target="integration-test-servlet">\r
                        <param name="server-name" value="glassfish-3" />\r
                </antcall>\r
                <antcall target="integration-test-stop-glassfish3"/>\r
diff --git a/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java
new file mode 100644 (file)
index 0000000..c61d23a
--- /dev/null
+++ b/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -0,0 +1,47 @@
+package com.vaadin.tests.integration;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+
+public class IntegrationTestApplication extends Application {
+
+    @Override
+    public void init() {
+        Window window = new Window("Vaadin Application");
+        setMainWindow(window);
+
+        final Table table = new Table();
+        table.addContainerProperty("icon", Resource.class, null);
+        table.setItemIconPropertyId("icon");
+        table.addContainerProperty("country", String.class, null);
+        table.setRowHeaderMode(Table.ROW_HEADER_MODE_ICON_ONLY);
+        table.setImmediate(true);
+        table.setSelectable(true);
+        table.setVisibleColumns(new Object[] { "country" });
+        window.addComponent(table);
+
+        Item item = table.addItem("FI");
+        item.getItemProperty("icon")
+                .setValue(new ClassResource("fi.gif", this));
+        item.getItemProperty("country").setValue("Finland");
+        item = table.addItem("SE");
+        item.getItemProperty("icon")
+                .setValue(new ClassResource("se.gif", this));
+        item.getItemProperty("country").setValue("Sweden");
+
+        final Label selectedLabel = new Label();
+        table.addListener(new ValueChangeListener() {
+            public void valueChange(ValueChangeEvent event) {
+                selectedLabel.setValue(table.getValue());
+            }
+        });
+        window.addComponent(selectedLabel);
+    }
+}
diff --git a/tests/src/com/vaadin/tests/integration/fi.gif b/tests/src/com/vaadin/tests/integration/fi.gif
new file mode 100755 (executable)
index 0000000..8d3a191
Binary files /dev/null and b/tests/src/com/vaadin/tests/integration/fi.gif differ
diff --git a/tests/src/com/vaadin/tests/integration/se.gif b/tests/src/com/vaadin/tests/integration/se.gif
new file mode 100755 (executable)
index 0000000..80f6285
Binary files /dev/null and b/tests/src/com/vaadin/tests/integration/se.gif differ
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework