AbstractDateField: set value after being invalid (#10187)

Fixes #9763
Fixes #9978 

3 files changed, 114 insertions, 9 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldSetAfterInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldSetAfterInvalid.java
new file mode 100644
index 0000000000..6d7baefb86
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldSetAfterInvalid.java
@@ -0,0 +1,36 @@
+package com.vaadin.tests.components.datefield;
+
+import java.time.LocalDate;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.DateField;
+
+public class DateFieldSetAfterInvalid extends AbstractTestUI {
+
+    @Override
+    protected String getTestDescription() {
+        return "DateField to programatically change the value after having invalid text";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 9763;
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        DateField dateField = new DateField();
+        addComponent(dateField);
+
+        Button nowButton = new Button("Today");
+        nowButton.addClickListener(e -> dateField.setValue(LocalDate.now()));
+        addComponent(nowButton);
+
+        Button clearButton = new Button("Clear");
+        clearButton.addClickListener(e -> dateField.clear());
+        addComponent(clearButton);
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
index 847a25174a..914c7b490f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
@@ -30,22 +30,15 @@ public class DisabledParentLayout extends AbstractReindeerTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        VerticalLayout content = new VerticalLayout();
-
-        content.setSpacing(true);
-        content.setMargin(true);
 
         final VerticalLayout pane = new VerticalLayout();
         AbstractLocalDateField dateField = new TestDateField();
         pane.addComponent(dateField);
 
-        content.addComponent(pane);
-
         Button button = new Button("Test");
         button.addClickListener(event -> pane.setEnabled(!pane.isEnabled()));
-        content.addComponent(button);
 
-        addComponent(content);
+        addComponents(pane, button);
     }
 
     @Override
@@ -55,7 +48,7 @@ public class DisabledParentLayout extends AbstractReindeerTestUI {
 
     @Override
     protected Integer getTicketNumber() {
-        return 13124;
+        return 4773;
     }
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldSetAfterInvalidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldSetAfterInvalidTest.java
new file mode 100644
index 0000000000..5e25c55cc6
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldSetAfterInvalidTest.java
@@ -0,0 +1,76 @@
+package com.vaadin.tests.components.datefield;
+
+import static java.time.temporal.ChronoUnit.DAYS;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDate;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.DateFieldElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class DateFieldSetAfterInvalidTest extends MultiBrowserTest {
+
+    private static final org.openqa.selenium.By ERROR_INDICATOR_BY = By
+            .className("v-errorindicator");
+
+    private static String INVALID_TEXT = "abc";
+
+    @Test
+    public void setValueAfterBeingInvalid() {
+        openTestURL();
+
+        DateFieldElement dateField = $(DateFieldElement.class).first();
+        dateField.setDate(LocalDate.now().minus(5, DAYS));
+        assertNoErrorIndicator();
+
+        dateField.setValue(dateField.getValue() + INVALID_TEXT);
+        assertErrorIndicator();
+
+        $(ButtonElement.class).caption("Today").first().click();
+
+        assertFalse(dateField.getValue().endsWith(INVALID_TEXT));
+        assertNoErrorIndicator();
+    }
+
+    @Test
+    public void clearAfterBeingInvalid() {
+        openTestURL();
+
+        DateFieldElement dateField = $(DateFieldElement.class).first();
+        dateField.setDate(LocalDate.now().minus(5, DAYS));
+        assertNoErrorIndicator();
+
+        dateField.setValue(dateField.getValue() + INVALID_TEXT);
+        assertErrorIndicator();
+
+        $(ButtonElement.class).caption("Clear").first().click();
+
+        assertTrue(dateField.getValue().isEmpty());
+        assertNoErrorIndicator();
+
+        dateField.setValue(INVALID_TEXT);
+        assertErrorIndicator();
+    }
+
+    @Test
+    public void invalidTypedText() {
+        openTestURL();
+
+        DateFieldElement dateField = $(DateFieldElement.class).first();
+        dateField.setValue(INVALID_TEXT);
+        assertErrorIndicator();
+    }
+
+    private void assertErrorIndicator() {
+        assertElementPresent(ERROR_INDICATOR_BY);
+    }
+
+    private void assertNoErrorIndicator() {
+        assertElementNotPresent(ERROR_INDICATOR_BY);
+    }
+}