Fix DisabledDateFieldPopup test

Change-Id: I27f43e5bed2a0ebc0f04a1a83c922de42fb1a3c5

diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
index f11aff11de8a21833982dfc3e0033c84e88986cf..49590a3cee2b7f46e54bb39bf61f35ca65bc531f 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
@@ -19,11 +19,6 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 
-/**
- * 
- * @since 7.1
- * @author Vaadin Ltd
- */
 public class DisabledDateFieldPopup extends AbstractTestUI {
 
     @Override

diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
index add96f72f28be898f982c5c376b32f8cfe816a6d..a57017746ab81f9136eae183f93f95b256414943 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
@@ -15,38 +15,44 @@
  */
 package com.vaadin.tests.components.datefield;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
-/**
- * 
- * @since 7.1
- * @author Vaadin Ltd
- */
 public class DisabledDateFieldPopupTest extends MultiBrowserTest {
 
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>();
+        for (DesiredCapabilities browser : super.getBrowsersToTest()) {
+            if (BrowserUtil.isIE(browser)) {
+                browsers.add(browser);
+            }
+        }
+        return browsers;
+    }
+
     @Test
-    public void testPopup() {
+    public void testPopup() throws IOException {
         openTestURL();
 
         WebElement button = driver.findElement(By
                 .className("v-datefield-button"));
-        button.click();
+        new Actions(driver).moveToElement(button).click()
+                .sendKeys(Keys.ARROW_DOWN).perform();
 
         Assert.assertFalse(
-                "Calendar popup should not be opened for disabled date field on mouse click",
+                "Calendar popup should not be opened for disabled date field",
                 isElementPresent(By.className("v-datefield-popup")));
-
-        button.sendKeys(Keys.ARROW_DOWN);
-
-        Assert.assertFalse("Calendar popup should not be opened for "
-                + "disabled date fild on down key",
-                isElementPresent(By.className("v-datefield-popup")));
-
     }
 }