#7178 New servlet integration test not using the address book demo, related screenshots

svn changeset:20342/svn branch:6.7
author: Henri Sara <henri.sara@itmill.com> 2011-08-12 09:53:31 +0000
committer: Henri Sara <henri.sara@itmill.com> 2011-08-12 09:53:31 +0000
commit: a25b677763730d83e8b1986b752f9021dfa61594 (patch)
tree: 0c23ff12d5e1e04e8abb122d735c246e31fc7937
parent: 2a0bf9b8b613addca8a35e7bb6df4c9bcef62917 (diff)
download: vaadin-framework-a25b677763730d83e8b1986b752f9021dfa61594.tar.gz
vaadin-framework-a25b677763730d83e8b1986b752f9021dfa61594.zip
8 files changed, 135 insertions, 106 deletions
diff --git a/build/build.xml b/build/build.xml
index c62f64796d..0b8a47d69a 100644
--- 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
index 495a9ec2e8..0000000000
--- 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
index 0000000000..ff6889d2c8
--- /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/integration_test.tpl
index cf2d9364e4..4275d3fab0 100644
--- a/tests/integration-testscripts/common/addressbook_deployment.tpl
+++ b/tests/integration-testscripts/common/integration_test.tpl
@@ -4,24 +4,19 @@
 <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>
+<title>integration_test</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">addressbook_deployment</td></tr>
+<tr><td rowspan="1" colspan="3">integration_test</td></tr>
 </thead><tbody>
 <tr>
 	<td>openAndWait</td>
-	<td>/demo/AddressBook</td>
+	<td>/demo/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</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>
@@ -29,22 +24,17 @@
 <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>
+	<td>initial</td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>500</td>
-	<td></td>
+	<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>Marge_in_edit_mode</td>
+	<td>finland</td>
 </tr>
 
 </tbody></table>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index a525d5571b..5e6f84e43a 100644
--- 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}" />
 	</target>
 	
-	<!-- Run basic address book test -->
-	<target name="integration-test-addressbook">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />
+	<!-- Run basic integration test test -->
+	<target name="integration-test-servlet">
+		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />
 		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -62,7 +62,7 @@
 	<!-- Start and stop methods for servers -->
 	<target name="integration-test-start-tomcat-4">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-tomcat-4">
@@ -71,7 +71,7 @@
 	
 	<target name="integration-test-start-tomcat-5">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-tomcat-5">
@@ -80,7 +80,7 @@
 	
 	<target name="integration-test-start-tomcat-6">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-tomcat-6">
@@ -89,7 +89,7 @@
 	
 	<target name="integration-test-start-jetty-5">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jetty-5">
@@ -98,7 +98,7 @@
 
 	<target name="integration-test-start-jetty-6">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jetty-6">
@@ -107,7 +107,7 @@
 	
 	<target name="integration-test-start-jetty-7">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jetty-7">
@@ -116,7 +116,7 @@
 	
 	<target name="integration-test-start-jboss-3">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jboss-3">
@@ -125,7 +125,7 @@
 	
 	<target name="integration-test-start-jboss-4">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jboss-4">
@@ -134,7 +134,7 @@
 	
 	<target name="integration-test-start-jboss-5">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jboss-5">
@@ -143,7 +143,7 @@
 	
 	<target name="integration-test-start-glassfish2">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-servlet.html" overwrite="true" />
 	</target>
 	
 	<target name="integration-test-stop-glassfish2">
@@ -152,7 +152,7 @@
 	
 	<target name="integration-test-start-glassfish3">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-3" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-glassfish-3-servlet.html" overwrite="true" />
 	</target>
 	
 	<target name="integration-test-stop-glassfish3">
@@ -334,9 +334,9 @@
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-eXo-3.0.3" />
 	</target>
 	
-	<!-- Run address book test for WebLogic server -->
+	<!-- Run integration test for WebLogic server -->
 	<target name="integration-test-test-weblogic">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />
+		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />
 		<pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -354,7 +354,7 @@
 	
 	<target name="integration-test-start-weblogic9">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-weblogic9">
@@ -363,7 +363,7 @@
 	
 	<target name="integration-test-start-weblogic10">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />
-		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-addressbook.html" overwrite="true" />
+		<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-servlet.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-weblogic10">
@@ -379,9 +379,9 @@
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-weblogic-portal" />
 	</target>
 	
-	<!-- Run address book deployment test on GAE -->
+	<!-- Run integration test on GAE -->
 	<target name="integration-test-test-GAE">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE-addressbook.html" />
+		<fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />
 		<pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -404,7 +404,7 @@
 	<!-- Server setup, test and teardown targets. -->
 	<target name="integration-test-tomcat4">
 		<antcall target="integration-test-start-tomcat-4"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="tomcat-4.1.40" />
 		</antcall>
 		<antcall target="integration-test-stop-tomcat-4"/>
@@ -412,7 +412,7 @@
 	
 	<target name="integration-test-tomcat5">
 		<antcall target="integration-test-start-tomcat-5"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="tomcat-5.5.28" />
 		</antcall>
 		<antcall target="integration-test-stop-tomcat-5"/>
@@ -420,7 +420,7 @@
 	
 	<target name="integration-test-tomcat6">
 		<antcall target="integration-test-start-tomcat-6"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="tomcat-6.0.20" />
 		</antcall>
 		<antcall target="integration-test-stop-tomcat-6"/>
@@ -428,7 +428,7 @@
 	
 	<target name="integration-test-jetty5">
 		<antcall target="integration-test-start-jetty-5"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="jetty-5.1.15" />
 		</antcall>
 		<antcall target="integration-test-stop-jetty-5"/>
@@ -436,7 +436,7 @@
 	
 	<target name="integration-test-jetty6">
 		<antcall target="integration-test-start-jetty-6"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="jetty-6.1.22" />
 		</antcall>
 		<antcall target="integration-test-stop-jetty-6"/>
@@ -444,7 +444,7 @@
 	
 	<target name="integration-test-jetty7">
 		<antcall target="integration-test-start-jetty-7"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="jetty-7.0.0" />
 		</antcall>
 		<antcall target="integration-test-stop-jetty-7"/>
@@ -452,7 +452,7 @@
 	
 	<target name="integration-test-jboss3">
 		<antcall target="integration-test-start-jboss-3"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="jboss-3.2.8" />
 		</antcall>
 		<antcall target="integration-test-stop-jboss-3"/>
@@ -460,7 +460,7 @@
 	
 	<target name="integration-test-jboss4">
 		<antcall target="integration-test-start-jboss-4"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="jboss-4.2.3" />
 		</antcall>
 		<antcall target="integration-test-stop-jboss-4"/>
@@ -468,7 +468,7 @@
 	
 	<target name="integration-test-jboss5">
 		<antcall target="integration-test-start-jboss-5"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="jboss-5.0.1" />
 		</antcall>
 		<antcall target="integration-test-stop-jboss-5"/>
@@ -476,7 +476,7 @@
 		
 	<target name="integration-test-glassfish2">
 		<antcall target="integration-test-start-glassfish2"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="glassfish-2.1.1" />
 		</antcall>
 		<antcall target="integration-test-stop-glassfish2"/>
@@ -484,7 +484,7 @@
 	
 	<target name="integration-test-glassfish3">
 		<antcall target="integration-test-start-glassfish3"/>
-		<antcall target="integration-test-addressbook">
+		<antcall target="integration-test-servlet">
 			<param name="server-name" value="glassfish-3" />
 		</antcall>
 		<antcall target="integration-test-stop-glassfish3"/>
diff --git a/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java
new file mode 100644
index 0000000000..c61d23ae8d
--- /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
index 0000000000..8d3a191828
--- /dev/null
+++ b/tests/src/com/vaadin/tests/integration/fi.gif
diff --git a/tests/src/com/vaadin/tests/integration/se.gif b/tests/src/com/vaadin/tests/integration/se.gif
new file mode 100755
index 0000000000..80f6285228
--- /dev/null
+++ b/tests/src/com/vaadin/tests/integration/se.gif
author	Henri Sara <henri.sara@itmill.com>	2011-08-12 09:53:31 +0000
committer	Henri Sara <henri.sara@itmill.com>	2011-08-12 09:53:31 +0000
commit	a25b677763730d83e8b1986b752f9021dfa61594 (patch)
tree	0c23ff12d5e1e04e8abb122d735c246e31fc7937
parent	2a0bf9b8b613addca8a35e7bb6df4c9bcef62917 (diff)
download	vaadin-framework-a25b677763730d83e8b1986b752f9021dfa61594.tar.gz vaadin-framework-a25b677763730d83e8b1986b752f9021dfa61594.zip