From d067636681e0d1719f2c0e8ac1f3a0ff13c65546 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 24 Sep 2009 12:04:57 +0000 Subject: [PATCH] Merged test updates svn changeset:8902/svn branch:6.2 --- .../TestBeanItemContainerUsage.html | 5 --- .../components/combobox/ComboBoxItemIcon.java | 6 +-- .../tests/components/link/LinkTargetSize.html | 42 ------------------- .../window/SubwindowInvalidLayout.html | 32 -------------- 4 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 src/com/vaadin/tests/components/link/LinkTargetSize.html delete mode 100644 src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html diff --git a/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html index ea49b92c6a..a37e8ea662 100644 --- a/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html +++ b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html @@ -21,11 +21,6 @@ - - verifyTextPresent - Table containing Persons



age

firstName

lastName




35
Jones
Birchman
30
Marc
Smith
75
Greg
Sandman - - screenCapture diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java index 905e9a37c3..4800316a5a 100644 --- a/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java +++ b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.combobox; import com.vaadin.data.Item; -import com.vaadin.terminal.ClassResource; import com.vaadin.terminal.Resource; +import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.ComboBox; @@ -27,10 +27,10 @@ public class ComboBoxItemIcon extends TestBase { Item item = cb.addItem("FI"); item.getItemProperty("icon").setValue( - new ClassResource("fi.gif", ComboBoxItemIcon.this)); + new ThemeResource("../sampler/flags/fi.gif")); item = cb.addItem("SE"); item.getItemProperty("icon").setValue( - new ClassResource("se.gif", ComboBoxItemIcon.this)); + new ThemeResource("../sampler/flags/se.gif")); } diff --git a/src/com/vaadin/tests/components/link/LinkTargetSize.html b/src/com/vaadin/tests/components/link/LinkTargetSize.html deleted file mode 100644 index a28865361f..0000000000 --- a/src/com/vaadin/tests/components/link/LinkTargetSize.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - -LinkTargetSize - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LinkTargetSize
open/run/com.vaadin.tests.components.link.LinkTargetSize
waitForVaadin
clickvaadin=runcomvaadintestscomponentslinkLinkTargetSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLink[0]/domChild[0]/domChild[0]
waitForVaadin
screenCapture
- - diff --git a/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html b/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html deleted file mode 100644 index 9d54eafd02..0000000000 --- a/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - -SubwindowInvalidLayout - - - - - - - - - - - - - - - - - - - - - - -
SubwindowInvalidLayout
open/run/com.vaadin.tests.components.window.SubwindowInvalidLayout
waitForVaadin
screenCapture
- - -- 2.39.5