summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-04-23 13:54:10 +0300
committerVaadin Code Review <review@vaadin.com>2015-04-23 11:43:17 +0000
commit198b3e61ffff98c649f24f1ced1bea7c713e894f (patch)
tree3bd92dbb954fa93f0222627073e9800908ecf182
parentd68c9382f257429e2c60e8a8d6afb36128c480fc (diff)
downloadvaadin-framework-198b3e61ffff98c649f24f1ced1bea7c713e894f.tar.gz
vaadin-framework-198b3e61ffff98c649f24f1ced1bea7c713e894f.zip
Convert PopupDateFieldValueChangeEventsTest from TB2 to TB4
Change-Id: I0442574763ba5c29f24100f47497b5992ecafbc8
-rw-r--r--uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java11
-rw-r--r--uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java92
-rw-r--r--uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html107
3 files changed, 95 insertions, 115 deletions
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
index b6cc002872..62a788f4c2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
@@ -27,11 +27,9 @@ import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
import com.vaadin.ui.NativeSelect;
/**
@@ -39,7 +37,7 @@ import com.vaadin.ui.NativeSelect;
* @since
* @author Vaadin Ltd
*/
-public class PopupDateFieldValueChangeEvents extends AbstractTestUI {
+public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog {
private int count = 0;
@@ -76,14 +74,11 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUI {
}
});
- final Label log = new Label("", ContentMode.PREFORMATTED);
- addComponent(log);
-
df.addValueChangeListener(new Property.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
- log.setValue("Value changes: " + (++count));
+ log("Value changes: " + (++count));
}
});
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
new file mode 100644
index 0000000000..95b8437b17
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.datefield;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.support.ui.Select;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.DateFieldElement;
+import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest {
+
+ @Test
+ public void tb2test() throws Exception {
+ openTestURL();
+ getPopUpButton().click();
+ getCalendarDayElement(2, 1).click();
+ Assert.assertEquals("1. Value changes: 1", getLogRow(0));
+ getPopUpButton().click();
+ new Select(getHoursSelect()).selectByValue("01");
+ new Select(getMinutesSelect()).selectByValue("02");
+ new Select(getSecondsSelect()).selectByValue("03");
+ new Actions(driver).sendKeys(getSecondsSelect(), Keys.ENTER).perform();
+ $(LabelElement.class).first().click();
+ Assert.assertEquals("2. Value changes: 2", getLogRow(0));
+ getResolutionSelect().selectByText("Month");
+ getPopUpButton().click();
+ getNextMonthButton().click();
+ getNextYearButton().click();
+ getNextMonthButton().click();
+ getNextMonthButton().sendKeys(Keys.ENTER);
+ Assert.assertEquals("3. Value changes: 3", getLogRow(0));
+ }
+
+ public WebElement getPopUpButton() {
+ DateFieldElement datefield = $(DateFieldElement.class).first();
+ return datefield.findElement((By.className("v-datefield-button")));
+ }
+
+ public WebElement getCalendarDayElement(int row, int col) {
+ return findElement(By
+ .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr["
+ + (row + 2) + "]/td[" + (col + 2) + "]/span"));
+ }
+
+ public WebElement getHoursSelect() {
+ return findElement(By
+ .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select"));
+ }
+
+ public WebElement getMinutesSelect() {
+ return findElement(By
+ .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[2]"));
+ }
+
+ public WebElement getSecondsSelect() {
+ return findElement(By
+ .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]"));
+ }
+
+ public NativeSelectElement getResolutionSelect() {
+ return $(NativeSelectElement.class).first();
+ }
+
+ public WebElement getNextMonthButton() {
+ return findElement((By.className("v-button-nextmonth")));
+ }
+
+ public WebElement getNextYearButton() {
+ return findElement((By.className("v-button-nextyear")));
+ }
+}
diff --git a/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html b/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html
deleted file mode 100644
index 18f0ce0da2..0000000000
--- a/uitest/tb2/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.html
+++ /dev/null
@@ -1,107 +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:7171/" />
-<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.datefield.PopupDateFieldValueChangeEvents?restartApplication</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VPopupCalendar[0]#popupButton</td>
- <td>12,11</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[2]/td/table/tbody/tr[4]/td[3]/span</td>
- <td>18,12</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]/domChild[0]</td>
- <td>Value changes: 1</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VPopupCalendar[0]#popupButton</td>
- <td>12,11</td>
-</tr>
-<tr>
- <td>select</td>
- <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select</td>
- <td>label=01</td>
-</tr>
-<tr>
- <td>select</td>
- <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[2]</td>
- <td>label=02</td>
-</tr>
-<tr>
- <td>select</td>
- <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]</td>
- <td>label=03</td>
-</tr>
-<tr>
- <td>pressSpecialKey</td>
- <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]</td>
- <td>enter</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
- <td>410,9</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]/domChild[0]</td>
- <td>Value changes: 2</td>
-</tr>
-<tr>
- <td>select</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VNativeSelect[0]/domChild[0]</td>
- <td>label=MONTH</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VPopupCalendar[0]#popupButton</td>
- <td>14,9</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>xpath=(//button[@type='button'])[4]</td>
- <td>3,13</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>xpath=(//button[@type='button'])[5]</td>
- <td>9,6</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>xpath=(//button[@type='button'])[4]</td>
- <td>7,8</td>
-</tr>
-<tr>
- <td>pressSpecialKey</td>
- <td>xpath=(//button[@type='button'])[4]</td>
- <td>enter</td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFieldValueChangeEvents::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]/domChild[0]</td>
- <td>Value changes: 3</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>