diff options
| author | Mika Murtojarvi <mika@vaadin.com> | 2015-06-02 11:10:18 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-06-03 07:16:34 +0000 |
| commit | e82bb28693eb663f3aa14aaf88d7efe7fd5c44ca (patch) | |
| tree | abef602edc39dfb31571733374b2784de3bdd346 /uitest | |
| parent | 4724d89af9228edcb9bbff987255122841c6d33e (diff) | |
| download | vaadin-framework-e82bb28693eb663f3aa14aaf88d7efe7fd5c44ca.tar.gz vaadin-framework-e82bb28693eb663f3aa14aaf88d7efe7fd5c44ca.zip | |
Convert a ComboBox test to TB4.7.5.0.beta3
Also fixes a bug in the test introduced in
https://dev.vaadin.com/review/#/c/7117/8.
Change-Id: I39ce310fd71296a8d8c223dfc09185c983b19299
Diffstat (limited to 'uitest')
2 files changed, 37 insertions, 59 deletions
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 0000000000..921c1b40e4 --- /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 c4d9fb0b3f..0000000000 --- a/uitest/tb2/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="http://localhost:8888/" /> -<title>New Test</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">New Test</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/run/com.vaadin.tests.components.combobox.ComboBoxCombinedWithEnterShortcut?restartApplication</td> - <td></td> -</tr> -<tr> - <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td> - <td>81,11</td> -</tr> -<tr> - <td>pressSpecialKey</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td> - <td>down</td> -</tr> -<tr> - <td>pressSpecialKey</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td> - <td>down</td> -</tr> -<tr> - <td>pressSpecialKey</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td> - <td>enter</td> -</tr> -<!--Enter in the popup should not send a shortcut event--> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::PID_SLog_row_0</td> - <td></td> -</tr> -<tr> - <td>pressSpecialKey</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td> - <td>enter</td> -</tr> -<!--Enter again in the combobox SHOULD send a shortcut event--> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxCombinedWithEnterShortcut::PID_SLog_row_0</td> - <td>1. Button clicked. ComboBox value: Berlin</td> -</tr> - -</tbody></table> -</body> -</html> |