]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b136dd5)
Convert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures.
authorJonatan Kronqvist <jonatan@vaadin.com>
Thu, 8 May 2014 11:31:13 +0000 (14:31 +0300)
committerVaadin Code Review <review@vaadin.com>
Thu, 8 May 2014 12:59:26 +0000 (12:59 +0000)
Change-Id: Ib36917246fce3f051b61a979289c9bce23b1bf82

uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html [deleted file] patch | blob | history
uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java [new file with mode: 0644] patch | blob

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 (file)
index 9248938..0000000
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
+++ /dev/null
@@ -1,80 +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="" />
-<title></title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3"></td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.combobox.ComboBoxes2?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]</td>
-       <td>47,8</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]</td>
-       <td>I</td>
-</tr>
-<!--Open popup-->
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]</td>
-       <td>14,10</td>
-</tr>
-<!--Close poup-->
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]</td>
-       <td>14,10</td>
-</tr>
-<tr>
-       <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]</td>
-       <td>I</td>
-</tr>
-<!--Select a value-->
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.combobox.ComboBoxes2?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]</td>
-       <td>14,10</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item2</td>
-       <td>47,9</td>
-</tr>
-<tr>
-       <td>type</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]</td>
-       <td>I</td>
-</tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[1]</td>
-       <td>14,10</td>
-</tr>
-<!--Entered value should remain in the text field even though the popup is opened-->
-<tr>
-       <td>assertValue</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxes2::PID_StestComponent/domChild[0]</td>
-       <td>I</td>
-</tr>
-</tbody></table>
-</body>
-</html>
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 (file)
index 0000000..a5efb44
--- /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"));
+
+    }
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework