fix: fix date/time/datetime picker tester validation (#1845)

Validation API of Date/Time/DateTime picker has been changed since Vaadin 24.5, and the UI Unit testers are failing with recent Vaadin version. This change makes the testers compatible with all Vaadin 24 series. Fixes #1840
vaadin · Jan 13, 2025 · 23de5be · 23de5be
1 parent 6cad5c7
commit 23de5be
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 17 deletions.
diff --git a/...n-testbench-unit-junit5/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt b/...n-testbench-unit-junit5/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt
@@ -39,13 +39,19 @@ internal fun DynaNodeGroup.locatorTest2() {
         _expectNoDialogs() // should succeed on no dialogs
         val dlg = Dialog()
         dlg.open()
-        expectThrows(AssertionError::class,
-            """Too many visible Dialogs (1) in MockedUI[] matching Dialog and count=0..0: [Dialog[opened='true', virtualChildNodeIds='[]']]. Component tree:
-└── MockedUI[]
-    └── Dialog[opened='true', virtualChildNodeIds='[]']
-""") {
+        val exception = expectThrows(AssertionError::class,
+            "Too many visible Dialogs (1) in MockedUI[] matching Dialog and count=0..0:") {
             _expectNoDialogs()
         }
+        expect(true) {
+            val msg = exception.message!!
+            println(msg)
+            msg.matches(""".*Too many visible Dialogs \(1\) in MockedUI\[] matching Dialog and count=0\.\.0: \[Dialog\[.*]]\. Component tree:
+└── MockedUI\[]
+\s+└── Dialog\[.*].*
+""".toRegex(RegexOption.MULTILINE)
+            )
+        }
         dlg.close()
         _expectNoDialogs()
     }

diff --git a/...ench-unit-shared/src/main/java/com/vaadin/flow/component/datepicker/DatePickerTester.java b/...ench-unit-shared/src/main/java/com/vaadin/flow/component/datepicker/DatePickerTester.java
@@ -47,17 +47,30 @@ public DatePickerTester(T component) {
     public void setValue(LocalDate date) {
         ensureComponentIsUsable();
 
-        final Method isInvalid = getMethod("isInvalid", LocalDate.class);
         try {
-            if ((boolean) isInvalid.invoke(getComponent(), date)) {
+            if (isInvalid(date)) {
                 throw new IllegalArgumentException(
                         "Given date is not a valid value");
             }
-
         } catch (IllegalAccessException | InvocationTargetException e) {
             throw new RuntimeException(e);
         }
 
         getComponent().setValue(date);
     }
+
+    private boolean isInvalid(LocalDate date)
+            throws InvocationTargetException, IllegalAccessException {
+        try {
+            // Vaadin 24.4
+            final Method isInvalid = getMethod("isInvalid", LocalDate.class);
+            return (boolean) isInvalid.invoke(getComponent(), date);
+        } catch (RuntimeException ex) {
+            if (!(ex.getCause() instanceof NoSuchMethodException)) {
+                throw ex;
+            }
+        }
+        // Vaadin 24.5+
+        return getComponent().getDefaultValidator().apply(date, null).isError();
+    }
 }
diff --git a/...t-shared/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerTester.java b/...t-shared/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerTester.java
@@ -10,6 +10,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import com.vaadin.testbench.unit.ComponentTester;
@@ -47,9 +48,8 @@ public DateTimePickerTester(T component) {
     public void setValue(LocalDateTime dateTime) {
         ensureComponentIsUsable();
 
-        final Method isInvalid = getMethod("isInvalid", LocalDateTime.class);
         try {
-            if ((boolean) isInvalid.invoke(getComponent(), dateTime)) {
+            if (isInvalid(dateTime)) {
                 throw new IllegalArgumentException(
                         "Given date is not a valid value");
             }
@@ -60,4 +60,19 @@ public void setValue(LocalDateTime dateTime) {
         getComponent().setValue(dateTime);
     }
 
+    private boolean isInvalid(LocalDateTime date)
+            throws InvocationTargetException, IllegalAccessException {
+        try {
+            // Vaadin 24.4
+            final Method isInvalid = getMethod("isInvalid", LocalDate.class);
+            return (boolean) isInvalid.invoke(getComponent(), date);
+        } catch (RuntimeException ex) {
+            if (!(ex.getCause() instanceof NoSuchMethodException)) {
+                throw ex;
+            }
+        }
+        // Vaadin 24.5+
+        return getComponent().getDefaultValidator().apply(date, null).isError();
+    }
+
 }
diff --git a/...ench-unit-shared/src/main/java/com/vaadin/flow/component/timepicker/TimePickerTester.java b/...ench-unit-shared/src/main/java/com/vaadin/flow/component/timepicker/TimePickerTester.java
@@ -10,6 +10,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.time.LocalDate;
 import java.time.LocalTime;
 
 import com.vaadin.testbench.unit.ComponentTester;
@@ -46,9 +47,8 @@ public TimePickerTester(T component) {
     public void setValue(LocalTime time) {
         ensureComponentIsUsable();
 
-        final Method isInvalid = getMethod("isInvalid", LocalTime.class);
         try {
-            if ((boolean) isInvalid.invoke(getComponent(), time)) {
+            if (isInvalid(time)) {
                 throw new IllegalArgumentException(
                         "Given time is not a valid value");
             }
@@ -59,4 +59,19 @@ public void setValue(LocalTime time) {
         getComponent().setValue(time);
     }
 
+    private boolean isInvalid(LocalTime date)
+            throws InvocationTargetException, IllegalAccessException {
+        try {
+            // Vaadin 24.4
+            final Method isInvalid = getMethod("isInvalid", LocalDate.class);
+            return (boolean) isInvalid.invoke(getComponent(), date);
+        } catch (RuntimeException ex) {
+            if (!(ex.getCause() instanceof NoSuchMethodException)) {
+                throw ex;
+            }
+        }
+        // Vaadin 24.5+
+        return getComponent().getDefaultValidator().apply(date, null).isError();
+    }
+
 }
diff --git a/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt b/vaadin-testbench-unit/src/test/kotlin/com/vaadin/testbench/unit/internal/LocatorTest.kt
@@ -39,13 +39,19 @@ internal fun DynaNodeGroup.locatorTest2() {
         _expectNoDialogs() // should succeed on no dialogs
         val dlg = Dialog()
         dlg.open()
-        expectThrows(AssertionError::class,
-            """Too many visible Dialogs (1) in MockedUI[] matching Dialog and count=0..0: [Dialog[opened='true', virtualChildNodeIds='[]']]. Component tree:
-└── MockedUI[]
-    └── Dialog[opened='true', virtualChildNodeIds='[]']
-""") {
+        val exception = expectThrows(AssertionError::class,
+            "Too many visible Dialogs (1) in MockedUI[] matching Dialog and count=0..0:") {
             _expectNoDialogs()
         }
+        expect(true) {
+            val msg = exception.message!!
+            println(msg)
+            msg.matches(""".*Too many visible Dialogs \(1\) in MockedUI\[] matching Dialog and count=0\.\.0: \[Dialog\[.*]]\. Component tree:
+└── MockedUI\[]
+\s+└── Dialog\[.*].*
+""".toRegex(RegexOption.MULTILINE)
+            )
+        }
         dlg.close()
         _expectNoDialogs()
     }