add more assertions

vaadin · Sep 1, 2022 · d0d15e8 · d0d15e8
1 parent 73422f2
commit d0d15e8
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 17 deletions.
diff --git a/.../com/vaadin/flow/component/datetimepicker/validation/DateTimePickerValidationBasicIT.java b/.../com/vaadin/flow/component/datetimepicker/validation/DateTimePickerValidationBasicIT.java
@@ -109,35 +109,55 @@ public void min_changeInputValue_assertValidity() {
         assertClientInvalid();
         assertServerInvalid();
 
+        setInputValue(dateInput, "2/2/2000");
+        setInputValue(timeInput, "11:00");
+        assertClientInvalid();
+        assertServerInvalid();
+
         setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "12:00");
         assertClientValid();
         assertServerValid();
 
-        setInputValue(dateInput, "3/3/2000");
+        setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "13:00");
         assertClientValid();
         assertServerValid();
+
+        setInputValue(dateInput, "3/3/2000");
+        setInputValue(timeInput, "11:00");
+        assertClientValid();
+        assertServerValid();
     }
 
     @Test
-    public void max_changeInputValue_assertValidity() {
+    public void max_changeDateInputValue_assertValidity() {
         $("input").id(MAX_INPUT).sendKeys("2000-02-02T12:00", Keys.ENTER);
 
         setInputValue(dateInput, "3/3/2000");
         setInputValue(timeInput, "13:00");
         assertClientInvalid();
         assertServerInvalid();
 
+        setInputValue(dateInput, "2/2/2000");
+        setInputValue(timeInput, "13:00");
+        assertClientInvalid();
+        assertServerInvalid();
+
         setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "12:00");
         assertClientValid();
         assertServerValid();
 
-        setInputValue(dateInput, "1/1/2000");
+        setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "11:00");
         assertClientValid();
         assertServerValid();
+
+        setInputValue(dateInput, "1/1/2000");
+        setInputValue(timeInput, "13:00");
+        assertClientValid();
+        assertServerValid();
     }
 
     @Test

diff --git a/...com/vaadin/flow/component/datetimepicker/validation/DateTimePickerValidationBinderIT.java b/...com/vaadin/flow/component/datetimepicker/validation/DateTimePickerValidationBinderIT.java
@@ -72,51 +72,67 @@ public void required_changeInputValue_assertValidity() {
     @Test
     public void min_changeInputValue_assertValidity() {
         $("input").id(MIN_INPUT).sendKeys("2000-02-02T12:00", Keys.ENTER);
-        $("input").id(EXPECTED_VALUE_INPUT).sendKeys("2000-03-03T13:00",
+        $("input").id(EXPECTED_VALUE_INPUT).sendKeys("2000-03-03T11:00",
                 Keys.ENTER);
 
-        // Constraint validation fails:
         setInputValue(dateInput, "1/1/2000");
         setInputValue(timeInput, "11:00");
         assertClientInvalid();
         assertServerInvalid();
 
-        // Binder validation fails:
+        setInputValue(dateInput, "2/2/2000");
+        setInputValue(timeInput, "11:00");
+        assertClientInvalid();
+        assertServerInvalid();
+
         setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "12:00");
-        assertClientValid();
-        assertServerValid();
+        assertClientInvalid();
+        assertServerInvalid();
         assertErrorMessage(UNEXPECTED_VALUE_ERROR_MESSAGE);
 
-        // Both validations pass:
-        setInputValue(dateInput, "3/3/2000");
+        setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "13:00");
+        assertClientInvalid();
+        assertServerInvalid();
+        assertErrorMessage(UNEXPECTED_VALUE_ERROR_MESSAGE);
+
+        setInputValue(dateInput, "3/3/2000");
+        setInputValue(timeInput, "11:00");
         assertClientValid();
         assertServerValid();
     }
 
     @Test
     public void max_changeInputValue_assertValidity() {
         $("input").id(MAX_INPUT).sendKeys("2000-02-02T12:00", Keys.ENTER);
-        $("input").id(EXPECTED_VALUE_INPUT).sendKeys("2000-03-03T13:00",
+        $("input").id(EXPECTED_VALUE_INPUT).sendKeys("2000-01-01T13:00",
                 Keys.ENTER);
 
-        // Constraint validation fails:
         setInputValue(dateInput, "3/3/2000");
         setInputValue(timeInput, "13:00");
         assertClientInvalid();
         assertServerInvalid();
 
-        // Binder validation fails:
+        setInputValue(dateInput, "2/2/2000");
+        setInputValue(timeInput, "13:00");
+        assertClientInvalid();
+        assertServerInvalid();
+
         setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "12:00");
-        assertClientValid();
-        assertServerValid();
+        assertClientInvalid();
+        assertServerInvalid();
         assertErrorMessage(UNEXPECTED_VALUE_ERROR_MESSAGE);
 
-        // Both validations pass:
-        setInputValue(dateInput, "1/1/2000");
+        setInputValue(dateInput, "2/2/2000");
         setInputValue(timeInput, "11:00");
+        assertClientInvalid();
+        assertServerInvalid();
+        assertErrorMessage(UNEXPECTED_VALUE_ERROR_MESSAGE);
+
+        setInputValue(dateInput, "1/1/2000");
+        setInputValue(timeInput, "13:00");
         assertClientValid();
         assertServerValid();
     }