From e82bb28693eb663f3aa14aaf88d7efe7fd5c44ca Mon Sep 17 00:00:00 2001 From: Mika Murtojarvi Date: Tue, 2 Jun 2015 11:10:18 +0300 Subject: [PATCH] Convert a ComboBox test to TB4. Also fixes a bug in the test introduced in https://dev.vaadin.com/review/#/c/7117/8. Change-Id: I39ce310fd71296a8d8c223dfc09185c983b19299 --- ...ComboBoxCombinedWithEnterShortcutTest.java | 37 ++++++++++++ .../ComboBoxCombinedWithEnterShortcut.html | 59 ------------------- 2 files changed, 37 insertions(+), 59 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java delete mode 100644 uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java new file mode 100644 index 00000000000..921c1b40e4c --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java @@ -0,0 +1,37 @@ +/* + * 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 org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.Keys; + +import com.vaadin.tests.tb3.MultiBrowserTest; +import com.vaadin.tests.tb3.newelements.ComboBoxElement; + +public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest { + @Test + public void testKeyboardSelection() throws InterruptedException { + openTestURL(); + ComboBoxElement cb = $(ComboBoxElement.class).first(); + cb.click(); + cb.sendKeys(500, Keys.DOWN, Keys.DOWN, Keys.DOWN, Keys.ENTER); + Assert.assertEquals("", getLogRow(0).trim()); + cb.sendKeys(Keys.ENTER); + Assert.assertEquals("1. Button clicked. ComboBox value: Berlin", + getLogRow(0)); + } +} \ No newline at end of file diff --git a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html b/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html deleted file mode 100644 index c4d9fb0b3fa..00000000000 --- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - -New Test - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
New Test
open/run/com.vaadin.tests.components.combobox.ComboBoxCombinedWithEnterShortcut?restartApplication
mouseClickvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]81,11
pressSpecialKeyvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]down
pressSpecialKeyvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]down
pressSpecialKeyvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]enter
assertTextvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::PID_SLog_row_0
pressSpecialKeyvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]enter
assertTextvaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::PID_SLog_row_01. Button clicked. ComboBox value: Berlin
- -