From a25b677763730d83e8b1986b752f9021dfa61594 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 12 Aug 2011 09:53:31 +0000 Subject: #7178 New servlet integration test not using the address book demo, related screenshots svn changeset:20342/svn branch:6.7 --- build/build.xml | 7 +++ .../integration-test-GAE-addressbook.html | 57 ------------------- .../GoogleAppEngine/integration-test-GAE.html | 42 ++++++++++++++ .../common/addressbook_deployment.tpl | 52 ----------------- .../common/integration_test.tpl | 42 ++++++++++++++ tests/integration_tests.xml | 62 ++++++++++----------- .../integration/IntegrationTestApplication.java | 47 ++++++++++++++++ tests/src/com/vaadin/tests/integration/fi.gif | Bin 0 -> 371 bytes tests/src/com/vaadin/tests/integration/se.gif | Bin 0 -> 367 bytes 9 files changed, 169 insertions(+), 140 deletions(-) delete mode 100644 tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html create mode 100644 tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html delete mode 100644 tests/integration-testscripts/common/addressbook_deployment.tpl create mode 100644 tests/integration-testscripts/common/integration_test.tpl create mode 100644 tests/src/com/vaadin/tests/integration/IntegrationTestApplication.java create mode 100755 tests/src/com/vaadin/tests/integration/fi.gif create mode 100755 tests/src/com/vaadin/tests/integration/se.gif 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 @@ + Adding test resources. + + + + + + Adding source for demos 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 @@ - - - - - - -integration-test-GAE-addressbook - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
integration-test-GAE-addressbook
openAndWait/AddressBook
pause5000
mouseClickvaadin=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]62,13
pause1000
clickvaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]
pause1000
verifyTextPresentSave
verifyValuevaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]Marge
- - 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 @@ + + + + + + +integration-test-GAE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
integration-test-GAE
openAndWait/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication
pause5000
mouseClickvaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]51,13
pause5000
verifyValuevaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]FI
+ + diff --git a/tests/integration-testscripts/common/addressbook_deployment.tpl b/tests/integration-testscripts/common/addressbook_deployment.tpl deleted file mode 100644 index cf2d9364e4..0000000000 --- a/tests/integration-testscripts/common/addressbook_deployment.tpl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - -addressbook_deployment - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
addressbook_deployment
openAndWait/demo/AddressBook
mouseClickvaadin=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]62,13
pause500
screenCaptureMarge_selected
clickvaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]
pause500
screenCaptureMarge_in_edit_mode
- - diff --git a/tests/integration-testscripts/common/integration_test.tpl b/tests/integration-testscripts/common/integration_test.tpl new file mode 100644 index 0000000000..4275d3fab0 --- /dev/null +++ b/tests/integration-testscripts/common/integration_test.tpl @@ -0,0 +1,42 @@ + + + + + + +integration_test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
integration_test
openAndWait/demo/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication
pause500
screenCaptureinitial
mouseClickvaadin=demoruncomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]51,13
screenCapturefinland
+ + 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 @@ - - - + + + @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -334,9 +334,9 @@ - + - + @@ -354,7 +354,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -379,9 +379,9 @@ - + - + @@ -404,7 +404,7 @@ - + @@ -412,7 +412,7 @@ - + @@ -420,7 +420,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -436,7 +436,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -452,7 +452,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -468,7 +468,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -484,7 +484,7 @@ - + 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 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 index 0000000000..80f6285228 Binary files /dev/null and b/tests/src/com/vaadin/tests/integration/se.gif differ -- cgit v1.2.3