feat: add HasLabel and HasValidation to CustomFieldElement (#7657)

vursen · web-flow · commit a1ec8e5507d3 · 2025-07-02T14:45:23.000+03:00
diff --git a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/customfield/tests/ValidationIT.java b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/customfield/tests/ValidationIT.java
@@ -19,14 +19,15 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.flow.component.customfield.testbench.CustomFieldElement;
 import com.vaadin.flow.testutil.TestPath;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.tests.AbstractComponentIT;
 
 @TestPath("vaadin-custom-field/validation")
 public class ValidationIT extends AbstractComponentIT {
 
-    private TestBenchElement customField;
+    private CustomFieldElement customField;
     private TestBenchElement setInvalid;
     private TestBenchElement attach;
     private TestBenchElement detach;
@@ -37,7 +38,7 @@ public class ValidationIT extends AbstractComponentIT {
     public void init() {
         open();
 
-        customField = $("vaadin-custom-field").waitForFirst();
+        customField = $(CustomFieldElement.class).waitForFirst();
         setInvalid = $("button").id("set-invalid");
         attach = $("button").id("attach");
         detach = $("button").id("detach");
@@ -51,7 +52,7 @@ public void overridesClientValidation() {
 
         executeScript("arguments[0].validate()", customField);
 
-        Assert.assertEquals(true, customField.getPropertyBoolean("invalid"));
+        Assert.assertEquals(true, customField.isInvalid());
     }
 
     @Test
@@ -60,10 +61,10 @@ public void detach_reattach_overridesClientValidation() {
         detach.click();
         attach.click();
 
-        customField = $("vaadin-custom-field").waitForFirst();
+        customField = $(CustomFieldElement.class).waitForFirst();
         executeScript("arguments[0].validate()", customField);
 
-        Assert.assertEquals(true, customField.getPropertyBoolean("invalid"));
+        Assert.assertEquals(true, customField.isInvalid());
     }
 
     @Test
diff --git a/vaadin-custom-field-flow-parent/vaadin-custom-field-testbench/src/main/java/com/vaadin/flow/component/customfield/testbench/CustomFieldElement.java b/vaadin-custom-field-flow-parent/vaadin-custom-field-testbench/src/main/java/com/vaadin/flow/component/customfield/testbench/CustomFieldElement.java
@@ -17,20 +17,14 @@
 
 import com.vaadin.testbench.ElementQuery;
 import com.vaadin.testbench.HasHelper;
+import com.vaadin.testbench.HasLabel;
+import com.vaadin.testbench.HasValidation;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elementsbase.Element;
 
 @Element("vaadin-custom-field")
-public class CustomFieldElement extends TestBenchElement implements HasHelper {
-
-    public String getLabel() {
-        return getPropertyString("label");
-    }
-
-    public String getErrorMessage() {
-        return getPropertyString("errorMessage");
-    }
-
+public class CustomFieldElement extends TestBenchElement
+        implements HasHelper, HasLabel, HasValidation {
     /**
      * {@inheritDoc}
      */
