From 3184af5ac142b81ee656f0d5ea84272ac7e0ded8 Mon Sep 17 00:00:00 2001 From: Jonatan Kronqvist Date: Thu, 8 May 2014 14:31:13 +0300 Subject: [PATCH] Convert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures. Change-Id: Ib36917246fce3f051b61a979289c9bce23b1bf82 --- .../ComboBoxClosePopupRetainText.html | 80 ------------------- .../ComboBoxClosePopupRetainTextTest.java | 60 ++++++++++++++ 2 files changed, 60 insertions(+), 80 deletions(-) delete mode 100644 uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html create mode 100644 uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html deleted file mode 100644 index 9248938b28..0000000000 --- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
open/run/com.vaadin.tests.components.combobox.ComboBoxes2?restartApplication
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]47,8
typevaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]I
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]14,10
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]14,10
assertValuevaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]I
open/run/com.vaadin.tests.components.combobox.ComboBoxes2?restartApplication
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]14,10
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item247,9
typevaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]I
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]14,10
assertValuevaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]I
- - diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java new file mode 100644 index 0000000000..a5efb44ec8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java @@ -0,0 +1,60 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.combobox; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest { + @Override + protected Class getUIClass() { + return ComboBoxes2.class; + } + + @Test + public void testClosePopupRetainText() throws Exception { + openTestURL(); + + ComboBoxElement cb = $(ComboBoxElement.class).first(); + WebElement textbox = cb.findElement(By.vaadin("#textbox")); + textbox.sendKeys("I"); + cb.openPopup(); + cb.openPopup(); // openPopup() actually toggles + // The entered value should remain + assertEquals("I", textbox.getAttribute("value")); + } + + @Test + public void testClosePopupRetainText_selectingAValue() throws Exception { + openTestURL(); + ComboBoxElement cb = $(ComboBoxElement.class).first(); + cb.selectByText("Item 3"); + WebElement textbox = cb.findElement(By.vaadin("#textbox")); + textbox.clear(); + textbox.sendKeys("I"); + cb.openPopup(); + // Entered value should remain in the text field even though the popup + // is opened + assertEquals("I", textbox.getAttribute("value")); + + } +} -- 2.39.5