From cf50732c3c8d94bb6ec542c43b1225fbb46f741e Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 8 Jan 2016 14:03:37 +0200 Subject: Convert ComboBoxItemIcon test to TB4 Change-Id: I939fe7e5c5b57c007a543f5f7c491c8c9f11e773 --- .../components/combobox/ComboBoxItemIconTest.java | 32 +++++++++ .../components/combobox/ComboBoxItemIcon.html | 76 ---------------------- 2 files changed, 32 insertions(+), 76 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java delete mode 100644 uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java new file mode 100644 index 0000000000..15c87b65f0 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java @@ -0,0 +1,32 @@ +package com.vaadin.tests.components.combobox; + +import org.junit.Test; + +import com.vaadin.tests.tb3.MultiBrowserTest; +import com.vaadin.tests.tb3.newelements.ComboBoxElement; + +public class ComboBoxItemIconTest extends MultiBrowserTest { + @Test + public void testIconsInComboBox() throws Exception { + openTestURL(); + + ComboBoxElement firstCombo = $(ComboBoxElement.class).first(); + + firstCombo.openPopup(); + compareScreen("first-combobox-open"); + + // null item not on the list, so use index 1 + firstCombo.selectByText(firstCombo.getPopupSuggestions().get(1)); + + compareScreen("fi-hu-selected"); + + ComboBoxElement secondCombo = $(ComboBoxElement.class).get(1); + + secondCombo.openPopup(); + compareScreen("second-combobox-open"); + + secondCombo.selectByText(secondCombo.getPopupSuggestions().get(2)); + compareScreen("fi-au-selected"); + } + +} \ No newline at end of file diff --git a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html deleted file mode 100644 index 6e6e87bc7e..0000000000 --- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -ComboBoxItemIcon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ComboBoxItemIcon
open/run/com.vaadin.tests.components.combobox.ComboBoxItemIcon?restartApplication
waitForVaadin
clickvaadin=runcomvaadintestscomponentscomboboxComboBoxItemIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]
waitForVaadin
screenCapturefirst-combobox-open
click//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[2]/td
waitForVaadin
screenCapturefi-hu-selected
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxItemIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[2]12,17
screenCapturesecond-combobox-open
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxItemIcon::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item232,10
screenCapturefi-au-selected
- - -- cgit v1.2.3