From af30540ddac9798eec5e326b1e72c56dacd7dd21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Teemu=20P=C3=B6ntelin?= Date: Sun, 27 Sep 2015 18:10:30 +0300 Subject: [PATCH] Close calendar popup when DateField is detached (#18985) Change-Id: Ib04b7356577dd5027cd9daac351f49a1a1e23f1d --- .../com/vaadin/client/ui/VPopupCalendar.java | 1 + .../DateFieldPopupClosingOnDetach.java | 71 +++++++++++++++++++ .../DateFieldPopupClosingOnDetachTest.java | 44 ++++++++++++ .../com/vaadin/tests/tb3/AbstractTB3Test.java | 9 +++ 4 files changed, 125 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java create mode 100644 uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java diff --git a/client/src/com/vaadin/client/ui/VPopupCalendar.java b/client/src/com/vaadin/client/ui/VPopupCalendar.java index bbf654980b..47f11b09b1 100644 --- a/client/src/com/vaadin/client/ui/VPopupCalendar.java +++ b/client/src/com/vaadin/client/ui/VPopupCalendar.java @@ -212,6 +212,7 @@ public class VPopupCalendar extends VTextualDate implements Field, protected void onDetach() { super.onDetach(); descriptionForAssisitveDevicesElement.removeFromParent(); + closeCalendarPanel(); } @SuppressWarnings("deprecation") diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java new file mode 100644 index 0000000000..247d1a079c --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java @@ -0,0 +1,71 @@ +/* + * 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 java.util.Timer; +import java.util.TimerTask; + +import com.vaadin.event.LayoutEvents.LayoutClickEvent; +import com.vaadin.event.LayoutEvents.LayoutClickListener; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.DateField; + +public class DateFieldPopupClosingOnDetach extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + // Use polling to notice the removal of DateField. + getUI().setPollInterval(500); + + final DateField df = new DateField(); + getLayout().addLayoutClickListener(new LayoutClickListener() { + + @Override + public void layoutClick(LayoutClickEvent event) { + // Use a background Thread to remove the DateField 1 second + // after being clicked. + TimerTask removeTask = new TimerTask() { + + @Override + public void run() { + getUI().access(new Runnable() { + @Override + public void run() { + removeComponent(df); + } + }); + } + }; + new Timer(true).schedule(removeTask, 1000); + } + }); + + addComponent(df); + } + + @Override + protected String getTestDescription() { + return "DateField popup should be removed if it's open while the DateField is removed. " + + "Click the popup open and a background Thread will remove the DateField after 1 second."; + } + + @Override + protected Integer getTicketNumber() { + return 18985; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java new file mode 100644 index 0000000000..ca3d3a8748 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java @@ -0,0 +1,44 @@ +/* + * 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 java.io.IOException; + +import org.junit.Test; +import org.openqa.selenium.By; + +import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class DateFieldPopupClosingOnDetachTest extends MultiBrowserTest { + + @Test + public void testDateFieldPopupClosingLongClick() + throws InterruptedException, IOException { + openTestURL(); + + // Open the DateField popup. + DateFieldElement df = $(DateFieldElement.class).first(); + df.findElement(By.tagName("button")).click(); + + // Test UI will remove the DateField after 1 second. + waitForElementNotPresent(By.className("v-datefield")); + + // The popup should be also removed now. + assertElementNotPresent(By.className("v-datefield-popup")); + } + +} diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java index 9bcaf4598b..c1afe4a370 100644 --- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -465,6 +465,15 @@ public abstract class AbstractTB3Test extends ParallelTest { waitUntil(ExpectedConditions.presenceOfElementLocated(by)); } + protected void waitForElementNotPresent(final By by) { + waitUntil(new ExpectedCondition() { + @Override + public Boolean apply(WebDriver input) { + return input.findElements(by).isEmpty(); + } + }); + } + protected void waitForElementVisible(final By by) { waitUntil(ExpectedConditions.visibilityOfElementLocated(by)); } -- 2.39.5