Skip to content

Commit

Permalink
use abstract test classes from components-test-util
Browse files Browse the repository at this point in the history
  • Loading branch information
vursen committed Aug 31, 2022
1 parent 38c622b commit 8231622
Show file tree
Hide file tree
Showing 7 changed files with 189 additions and 253 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin-flow-components-test-util</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import java.time.LocalDateTime;

import com.vaadin.flow.component.datetimepicker.DateTimePicker;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.component.html.NativeButton;
import com.vaadin.flow.router.Route;
import com.vaadin.tests.validation.AbstractValidationPage;

@Route("vaadin-date-time-picker/validation/basic")
public class DateTimePickerValidationBasicPage extends AbstractValidationPage {
public class DateTimePickerValidationBasicPage extends AbstractValidationPage<DateTimePicker> {
public static final String ATTACH_FIELD_BUTTON = "attach-field-button";
public static final String DETACH_FIELD_BUTTON = "detach-field-button";

Expand All @@ -19,28 +21,32 @@ public DateTimePickerValidationBasicPage() {
super();

add(createButton(REQUIRED_BUTTON, "Enable required", event -> {
field.setRequiredIndicatorVisible(true);
testField.setRequiredIndicatorVisible(true);
}));

add(createInput(MIN_INPUT, "Set min date time", event -> {
var value = LocalDateTime.parse(event.getValue());
field.setMin(value);
testField.setMin(value);
}));

add(createInput(MAX_INPUT, "Set max date time", event -> {
var value = LocalDateTime.parse(event.getValue());
field.setMax(value);
testField.setMax(value);
}));

addAttachDetachControls();
}

protected void addAttachDetachControls() {
NativeButton attachButton = createButton(ATTACH_FIELD_BUTTON,
"Attach field", event -> add(field));
"Attach field", event -> add(testField));
NativeButton detachButton = createButton(DETACH_FIELD_BUTTON,
"Detach field", event -> add(field));
"Detach field", event -> add(testField));

add(new Div(attachButton, detachButton));
}

protected DateTimePicker createTestField() {
return new DateTimePicker();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import java.time.LocalDateTime;

import com.vaadin.flow.component.datetimepicker.DateTimePicker;
import com.vaadin.flow.data.binder.Binder;
import com.vaadin.flow.router.Route;
import com.vaadin.tests.validation.AbstractValidationPage;

@Route("vaadin-date-time-picker/validation/binder")
public class DateTimePickerValidationBinderPage extends AbstractValidationPage {
public class DateTimePickerValidationBinderPage extends AbstractValidationPage<DateTimePicker> {
public static final String MIN_INPUT = "min-input";
public static final String MAX_INPUT = "max-input";
public static final String EXPECTED_VALUE_INPUT = "expected-value-input";
Expand Down Expand Up @@ -34,7 +36,7 @@ public DateTimePickerValidationBinderPage() {
super();

binder = new Binder<>(Bean.class);
binder.forField(field).asRequired(REQUIRED_ERROR_MESSAGE)
binder.forField(testField).asRequired(REQUIRED_ERROR_MESSAGE)
.withValidator(value -> value.equals(expectedValue),
UNEXPECTED_VALUE_ERROR_MESSAGE)
.bind("property");
Expand All @@ -47,12 +49,16 @@ public DateTimePickerValidationBinderPage() {

add(createInput(MIN_INPUT, "Set min date time", event -> {
var value = LocalDateTime.parse(event.getValue());
field.setMin(value);
testField.setMin(value);
}));

add(createInput(MAX_INPUT, "Set max date time", event -> {
var value = LocalDateTime.parse(event.getValue());
field.setMax(value);
testField.setMax(value);
}));
}

protected DateTimePicker createTestField() {
return new DateTimePicker();
}
}

This file was deleted.

Loading

0 comments on commit 8231622

Please sign in to comment.