Fixed compilation error in TB3 test

Change-Id: I62e246995879733393af3275778e9201cd970adb

diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
index 2a61e79f327c402b56be1843d6c2943362a2c9df..d92199a214bf0d1a3ecc4e183d5325f2f6a4aa2e 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
@@ -7,17 +7,8 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.DateField;
 
 public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
@@ -149,98 +140,4 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
         }
     };
 
-    public static class Tb3DateFieldTests extends MultiBrowserTest {
-
-        @Override
-        protected boolean isDebug() {
-            // run in debug to see js errors
-            return true;
-        }
-
-        @Test
-        public void testMakingRequired() throws InterruptedException {
-            Thread.sleep(1000);
-            menu("Component");
-            menuSub("State");
-            menu("Required");
-            assertNoErrorNotification();
-        }
-
-        private void assertNoErrorNotification() {
-            try {
-                getDriver().findElement(
-                        By.xpath("//div[contains(@class, 'v-Notification') ]"));
-                Assert.fail("Error notification shown!");
-            } catch (NoSuchElementException e) {
-                // As expected
-            }
-        }
-
-        @Test
-        public void testValueAfterOpeningPopupInRequiredField()
-                throws InterruptedException {
-            Thread.sleep(1000);
-            menu("Component");
-            menuSub("State");
-            menu("Required");
-
-            menu("Component");
-            menuSub("Features");
-            menuSub("Resolution");
-            menu("Month");
-
-            menu("Component");
-            menuSub("Listeners");
-            menu("Value change listener");
-
-            String inputtedValue = "2/12";
-            getInput().sendKeys(inputtedValue);
-
-            openPopup();
-            closePopup();
-            String actual = getInput().getAttribute("value");
-            Assert.assertEquals(inputtedValue, actual);
-            assertNoErrorNotification();
-
-        }
-
-        private void openPopup() throws InterruptedException {
-            Dimension size = getInput().getSize();
-            new Actions(getDriver()).moveToElement(getInput(), 0, 0)
-                    .moveByOffset(size.getWidth() + 5, size.getHeight() / 2)
-                    .click();
-            // This fails in Opera for some weird reason
-            // getDriver().findElement(By.className("v-datefield-button")).click();
-        }
-
-        private WebElement getInput() {
-            return getDriver().findElement(By.xpath("//input"));
-        }
-
-        private void closePopup() {
-            getDriver().findElement(By.tagName("body")).click();
-        }
-
-        /**
-         * @since
-         * @param string
-         */
-        private void menuSub(String string) {
-            getDriver().findElement(
-                    By.xpath("//span[text() = '" + string + "']")).click();
-            new Actions(getDriver()).moveByOffset(100, 0).build().perform();
-        }
-
-        /**
-         * @since
-         * @param string
-         */
-        private void menu(String string) {
-            getDriver().findElement(
-                    By.xpath("//span[text() = '" + string + "']")).click();
-
-        }
-
-    }
-
 }

diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
new file mode 100644 (file)
index 0000000..557201e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2000-2013 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.By;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class DateFieldTestTest extends MultiBrowserTest {
+
+    @Test
+    public void testMakingRequired() throws InterruptedException {
+        setDebug(true);
+        openTestURL();
+        Thread.sleep(1000);
+        menu("Component");
+        menuSub("State");
+        menu("Required");
+        assertNoErrorNotification();
+    }
+
+    private void assertNoErrorNotification() {
+        try {
+            getDriver().findElement(
+                    By.xpath("//div[contains(@class, 'v-Notification') ]"));
+            Assert.fail("Error notification shown!");
+        } catch (NoSuchElementException e) {
+            // As expected
+        }
+    }
+
+    @Test
+    public void testValueAfterOpeningPopupInRequiredField()
+            throws InterruptedException {
+        setDebug(true);
+        openTestURL();
+        Thread.sleep(1000);
+        menu("Component");
+        menuSub("State");
+        menu("Required");
+
+        menu("Component");
+        menuSub("Features");
+        menuSub("Resolution");
+        menu("Month");
+
+        menu("Component");
+        menuSub("Listeners");
+        menu("Value change listener");
+
+        String inputtedValue = "2/12";
+        getInput().sendKeys(inputtedValue);
+
+        openPopup();
+        closePopup();
+        String actual = getInput().getAttribute("value");
+        Assert.assertEquals(inputtedValue, actual);
+        assertNoErrorNotification();
+
+    }
+
+    private void openPopup() throws InterruptedException {
+        Dimension size = getInput().getSize();
+        new Actions(getDriver()).moveToElement(getInput(), 0, 0)
+                .moveByOffset(size.getWidth() + 5, size.getHeight() / 2)
+                .click();
+        // This fails in Opera for some weird reason
+        // getDriver().findElement(By.className("v-datefield-button")).click();
+    }
+
+    private WebElement getInput() {
+        return getDriver().findElement(By.xpath("//input"));
+    }
+
+    private void closePopup() {
+        getDriver().findElement(By.tagName("body")).click();
+    }
+
+    /**
+     * @since
+     * @param string
+     */
+    private void menuSub(String string) {
+        getDriver().findElement(
+                By.xpath("//span[text() = '" + string + "']")).click();
+        new Actions(getDriver()).moveByOffset(100, 0).build().perform();
+    }
+
+    /**
+     * @since
+     * @param string
+     */
+    private void menu(String string) {
+        getDriver().findElement(
+                By.xpath("//span[text() = '" + string + "']")).click();
+
+    }
+
+}
\ No newline at end of file