Skip to content

Commit 16e21c8

Browse files
authored
feat: integrate client-side validation into RadioButtonGroup (#4310)
* feat: integrate client-validation into RadioButtonGroup * drop legacy validation tests * reuse common attach, detach buttons
1 parent 437682e commit 16e21c8

9 files changed

Lines changed: 217 additions & 218 deletions

File tree

‎vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
<groupId>com.vaadin</groupId>
8888
<artifactId>vaadin-flow-components-test-util</artifactId>
8989
<version>${project.version}</version>
90-
<scope>test</scope>
9190
</dependency>
9291
</dependencies>
9392
<build>

‎vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/src/main/java/com/vaadin/flow/component/radiobutton/tests/RequiredValidationPage.java‎

Lines changed: 0 additions & 78 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.vaadin.flow.component.radiobutton.tests.validation;
2+
3+
import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
4+
import com.vaadin.flow.router.Route;
5+
import com.vaadin.tests.validation.AbstractValidationPage;
6+
7+
import java.util.List;
8+
9+
@Route("vaadin-radio-button-group/validation/basic")
10+
public class BasicValidationPage
11+
extends AbstractValidationPage<RadioButtonGroup<String>> {
12+
public static final String REQUIRED_BUTTON = "required-button";
13+
14+
public BasicValidationPage() {
15+
add(createButton(REQUIRED_BUTTON, "Enable required", event -> {
16+
testField.setRequiredIndicatorVisible(true);
17+
}));
18+
}
19+
20+
@Override
21+
protected RadioButtonGroup<String> createTestField() {
22+
RadioButtonGroup<String> radioButtonGroup = new RadioButtonGroup<>();
23+
radioButtonGroup.setItems(List.of("foo", "bar", "baz"));
24+
radioButtonGroup.setLabel("Radio Button Group");
25+
26+
return radioButtonGroup;
27+
}
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package com.vaadin.flow.component.radiobutton.tests.validation;
2+
3+
import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
4+
import com.vaadin.flow.data.binder.Binder;
5+
import com.vaadin.flow.router.Route;
6+
import com.vaadin.tests.validation.AbstractValidationPage;
7+
8+
import java.util.List;
9+
10+
@Route("vaadin-radio-button-group/validation/binder")
11+
public class BinderValidationPage
12+
extends AbstractValidationPage<RadioButtonGroup<String>> {
13+
14+
public static final String REQUIRED_ERROR_MESSAGE = "The field is required";
15+
16+
public static class Bean {
17+
private String property;
18+
19+
public String getProperty() {
20+
return property;
21+
}
22+
23+
public void setProperty(String property) {
24+
this.property = property;
25+
}
26+
}
27+
28+
protected Binder<Bean> binder;
29+
30+
public BinderValidationPage() {
31+
super();
32+
33+
binder = new Binder<>(Bean.class);
34+
binder.forField(testField).asRequired(REQUIRED_ERROR_MESSAGE)
35+
.bind("property");
36+
}
37+
38+
@Override
39+
protected RadioButtonGroup<String> createTestField() {
40+
RadioButtonGroup<String> radioButtonGroup = new RadioButtonGroup<>();
41+
radioButtonGroup.setItems(List.of("foo", "bar", "baz"));
42+
43+
return radioButtonGroup;
44+
}
45+
}

‎vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/src/test/java/com/vaadin/flow/component/radiobutton/tests/RequiredValidationIT.java‎

Lines changed: 0 additions & 77 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package com.vaadin.flow.component.radiobutton.tests.validation;
2+
3+
import com.vaadin.flow.component.radiobutton.testbench.RadioButtonElement;
4+
import com.vaadin.flow.component.radiobutton.testbench.RadioButtonGroupElement;
5+
import com.vaadin.flow.testutil.TestPath;
6+
import com.vaadin.tests.validation.AbstractValidationIT;
7+
import org.junit.Test;
8+
import org.openqa.selenium.Keys;
9+
10+
import static com.vaadin.flow.component.radiobutton.tests.validation.BasicValidationPage.REQUIRED_BUTTON;
11+
12+
@TestPath("vaadin-radio-button-group/validation/basic")
13+
public class BasicValidationIT
14+
extends AbstractValidationIT<RadioButtonGroupElement> {
15+
16+
@Test
17+
public void fieldIsInitiallyValid() {
18+
assertClientValid();
19+
assertServerValid();
20+
}
21+
22+
@Test
23+
public void triggerBlur_assertValidity() {
24+
testField.$(RadioButtonElement.class).last().sendKeys(Keys.TAB);
25+
assertServerValid();
26+
assertClientValid();
27+
}
28+
29+
@Test
30+
public void required_triggerBlur_assertValidity() {
31+
$("button").id(REQUIRED_BUTTON).click();
32+
33+
testField.$(RadioButtonElement.class).last().sendKeys(Keys.TAB);
34+
assertServerInvalid();
35+
assertClientInvalid();
36+
}
37+
38+
@Test
39+
public void required_changeValue_assertValidity() {
40+
$("button").id(REQUIRED_BUTTON).click();
41+
42+
testField.selectByText("foo");
43+
assertServerValid();
44+
assertClientValid();
45+
}
46+
47+
@Test
48+
public void detach_attach_preservesInvalidState() {
49+
// Make field invalid
50+
$("button").id(REQUIRED_BUTTON).click();
51+
testField.$(RadioButtonElement.class).last().sendKeys(Keys.TAB);
52+
53+
detachAndReattachField();
54+
55+
assertServerInvalid();
56+
assertClientInvalid();
57+
}
58+
59+
@Test
60+
public void webComponentCanNotModifyInvalidState() {
61+
assertWebComponentCanNotModifyInvalidState();
62+
63+
detachAndReattachField();
64+
65+
assertWebComponentCanNotModifyInvalidState();
66+
}
67+
68+
@Override
69+
protected RadioButtonGroupElement getTestField() {
70+
return $(RadioButtonGroupElement.class).first();
71+
}
72+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.vaadin.flow.component.radiobutton.tests.validation;
2+
3+
import com.vaadin.flow.component.radiobutton.testbench.RadioButtonElement;
4+
import com.vaadin.flow.component.radiobutton.testbench.RadioButtonGroupElement;
5+
import com.vaadin.flow.testutil.TestPath;
6+
import com.vaadin.tests.validation.AbstractValidationIT;
7+
import org.junit.Test;
8+
import org.openqa.selenium.Keys;
9+
10+
import static com.vaadin.flow.component.radiobutton.tests.validation.BinderValidationPage.REQUIRED_ERROR_MESSAGE;
11+
12+
@TestPath("vaadin-radio-button-group/validation/binder")
13+
public class BinderValidationIT
14+
extends AbstractValidationIT<RadioButtonGroupElement> {
15+
16+
@Test
17+
public void fieldIsInitiallyValid() {
18+
assertClientValid();
19+
assertServerValid();
20+
assertErrorMessage(null);
21+
}
22+
23+
@Test
24+
public void required_triggerInputBlur_assertValidity() {
25+
testField.$(RadioButtonElement.class).last().sendKeys(Keys.TAB);
26+
assertServerInvalid();
27+
assertClientInvalid();
28+
assertErrorMessage(REQUIRED_ERROR_MESSAGE);
29+
}
30+
31+
@Test
32+
public void required_changeValue_assertValidity() {
33+
testField.selectByText("foo");
34+
assertServerValid();
35+
assertClientValid();
36+
}
37+
38+
@Override
39+
protected RadioButtonGroupElement getTestField() {
40+
return $(RadioButtonGroupElement.class).first();
41+
}
42+
}

0 commit comments

Comments
 (0)