From 42789ab0836451aea7bc1964e0572178ef0f8ded Mon Sep 17 00:00:00 2001
From: Denis Anisimov <denis@vaadin.com>
Date: Sun, 16 Mar 2014 15:47:20 +0200
Subject: [PATCH] VDateField shoud implement HasEnabled (#13124).

Change-Id: I5b8cd173f3b4646240c224090843583175eca93d
---
 .../src/com/vaadin/client/ui/VDateField.java  |  5 +-
 .../datefield/DisabledParentLayout.java       | 65 +++++++++++++++++++
 .../datefield/DisabledParentLayoutTest.java   | 51 +++++++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
 create mode 100644 uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java

diff --git a/client/src/com/vaadin/client/ui/VDateField.java b/client/src/com/vaadin/client/ui/VDateField.java
index 5b49711df1..cd9052dc73 100644
--- a/client/src/com/vaadin/client/ui/VDateField.java
+++ b/client/src/com/vaadin/client/ui/VDateField.java
@@ -19,11 +19,12 @@ package com.vaadin.client.ui;
 import java.util.Date;
 
 import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HasEnabled;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.DateTimeService;
 import com.vaadin.shared.ui.datefield.Resolution;
 
-public class VDateField extends FlowPanel implements Field {
+public class VDateField extends FlowPanel implements Field, HasEnabled {
 
     public static final String CLASSNAME = "v-datefield";
 
@@ -161,10 +162,12 @@ public class VDateField extends FlowPanel implements Field {
         this.readonly = readonly;
     }
 
+    @Override
     public boolean isEnabled() {
         return enabled;
     }
 
+    @Override
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
new file mode 100644
index 0000000000..cf09ff029d
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
@@ -0,0 +1,65 @@
+/*
+ * 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 com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * 
+ * @author Vaadin Ltd
+ */
+public class DisabledParentLayout extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout content = new VerticalLayout();
+
+        content.setSpacing(true);
+        content.setMargin(true);
+
+        final VerticalLayout pane = new VerticalLayout();
+        pane.setEnabled(false);
+        pane.addComponent(new DateField());
+
+        content.addComponent(pane);
+
+        Button button = new Button("Test");
+        button.addClickListener(new Button.ClickListener() {
+            @Override
+            public void buttonClick(Button.ClickEvent event) {
+                pane.setEnabled(true);
+            }
+        });
+        content.addComponent(button);
+
+        addComponent(content);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Data field should be functional after enabling disabled parent.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 13124;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
new file mode 100644
index 0000000000..3ee4544693
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * 
+ * @author Vaadin Ltd
+ */
+public class DisabledParentLayoutTest extends MultiBrowserTest {
+
+    @Test
+    public void testEnableParentLayout() {
+        openTestURL();
+
+        WebElement button = driver.findElement(By.className("v-button"));
+        button.click();
+
+        WebElement dataFieldButton = driver.findElement(By
+                .className("v-datefield-button"));
+        dataFieldButton.click();
+
+        WebElement popup = driver
+                .findElement(By.className("v-datefield-popup"));
+
+        Assert.assertFalse("Unexpected disabled element found",
+                isElementPresent(By.className("v-disabled")));
+
+        Assert.assertNotNull(
+                "Date popup is not opened after click to its button", popup);
+    }
+}
-- 
2.39.5