Skip to content

Commit e870909

Browse files
web-padawanweb-padawan
authored
test: cleanup TextField ITs for features covered by unit tests (#7392)
1 parent b0c58b8 commit e870909

File tree

15 files changed

+41
-271
lines changed

15 files changed

+41
-271
lines changed

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/BigDecimalFieldPage.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ public BigDecimalFieldPage() {
4545
e -> field.setReadOnly(!field.isReadOnly()));
4646
toggleReadOnly.setId("toggle-read-only");
4747

48-
NativeButton toggleRequired = new NativeButton("toggle required",
49-
e -> field.setRequiredIndicatorVisible(
50-
!field.isRequiredIndicatorVisible()));
51-
toggleRequired.setId("toggle-required");
52-
5348
NativeButton toggleEnabled = new NativeButton("toggle enabled",
5449
e -> field.setEnabled(!field.isEnabled()));
5550
toggleEnabled.setId("toggle-enabled");
@@ -63,8 +58,8 @@ public BigDecimalFieldPage() {
6358
fieldWithClearButton.setId("clear-big-decimal-field");
6459
fieldWithClearButton.addValueChangeListener(this::logValueChangeEvent);
6560

66-
Div buttons = new Div(setValueWithScale, toggleReadOnly, toggleRequired,
67-
toggleEnabled, setFrenchLocale);
61+
Div buttons = new Div(setValueWithScale, toggleReadOnly, toggleEnabled,
62+
setFrenchLocale);
6863
add(field, buttons, fieldWithClearButton, messageContainer);
6964
}
7065

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/EmailFieldPage.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ public EmailFieldPage() {
4545
event -> emailField.setReadOnly(!emailField.isReadOnly()));
4646
add(button);
4747

48-
NativeButton required = new NativeButton(
49-
"Set/unset field required property");
50-
required.setId("required");
51-
required.addClickListener(
52-
event -> emailField.setRequiredIndicatorVisible(
53-
!emailField.isRequiredIndicatorVisible()));
54-
add(required);
55-
5648
NativeButton enabled = new NativeButton(
5749
"Set/unset field enabled property");
5850
enabled.setId("disabled");

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/IntegerFieldPage.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ public IntegerFieldPage() {
4444
event -> integerField.setReadOnly(!integerField.isReadOnly()));
4545
add(toggleReadOnly);
4646

47-
NativeButton required = new NativeButton("Toggle required");
48-
required.setId("toggle-required");
49-
required.addClickListener(
50-
event -> integerField.setRequiredIndicatorVisible(
51-
!integerField.isRequiredIndicatorVisible()));
52-
add(required);
53-
5447
NativeButton toggleEnabled = new NativeButton("Toggle enabled");
5548
toggleEnabled.setId("toggle-enabled");
5649
toggleEnabled.addClickListener(

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/NumberFieldPage.java

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.vaadin.flow.component.HasValue.ValueChangeListener;
2020
import com.vaadin.flow.component.html.Div;
2121
import com.vaadin.flow.component.html.NativeButton;
22-
import com.vaadin.flow.component.html.Span;
2322
import com.vaadin.flow.component.textfield.NumberField;
2423
import com.vaadin.flow.router.Route;
2524

@@ -46,14 +45,6 @@ public NumberFieldPage() {
4645
event -> numberField.setReadOnly(!numberField.isReadOnly()));
4746
add(button);
4847

49-
NativeButton required = new NativeButton(
50-
"Set/unset field required property");
51-
required.setId("required");
52-
required.addClickListener(
53-
event -> numberField.setRequiredIndicatorVisible(
54-
!numberField.isRequiredIndicatorVisible()));
55-
add(required);
56-
5748
NativeButton enabled = new NativeButton(
5849
"Set/unset field enabled property");
5950
enabled.setId("disabled");
@@ -83,7 +74,6 @@ public NumberFieldPage() {
8374
logValueChangeListener(stepValueMessage));
8475

8576
add(numberFieldStep, stepValueMessage);
86-
addNumberFields();
8777
}
8878

8979
private ValueChangeListener<? super ComponentValueChangeEvent<NumberField, Double>> logValueChangeListener(
@@ -92,26 +82,4 @@ private ValueChangeListener<? super ComponentValueChangeEvent<NumberField, Doubl
9282
.setText(String.format("Old value: '%s'. New value: '%s'.",
9383
event.getOldValue(), event.getValue()));
9484
}
95-
96-
private void addNumberFields() {
97-
NumberField dollarField = new NumberField("Dollars");
98-
dollarField.setPrefixComponent(new Span("$"));
99-
100-
NumberField euroField = new NumberField("Euros");
101-
euroField.setSuffixComponent(new Span("€"));
102-
103-
NumberField stepperField = new NumberField("Stepper");
104-
stepperField.setValue(1d);
105-
stepperField.setMin(0);
106-
stepperField.setMax(10);
107-
stepperField.setStepButtonsVisible(true);
108-
109-
euroField.setSuffixComponent(new Span("€"));
110-
111-
dollarField.setId("dollar-field");
112-
euroField.setId("euro-field");
113-
stepperField.setId("step-number-field-2");
114-
115-
add(dollarField, euroField, stepperField);
116-
}
11785
}

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/PasswordFieldPage.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ public PasswordFieldPage() {
4646
.setReadOnly(!passwordField.isReadOnly()));
4747
add(button);
4848

49-
NativeButton required = new NativeButton(
50-
"Set/unset field required property");
51-
required.setId("required");
52-
required.addClickListener(
53-
event -> passwordField.setRequiredIndicatorVisible(
54-
!passwordField.isRequiredIndicatorVisible()));
55-
add(required);
56-
5749
PasswordField passwordFieldClear = new PasswordField();
5850
passwordFieldClear.setId("clear-password-field");
5951
passwordFieldClear.getStyle().set("display", "block");
@@ -82,7 +74,6 @@ private void addBasicField() {
8274

8375
PasswordField passwordField = new PasswordField();
8476
passwordField.setLabel("Password field label");
85-
passwordField.setPlaceholder("placeholder text");
8677
passwordField.addValueChangeListener(event -> message.setText(
8778
String.format("Password field value changed from '%s' to '%s'",
8879
event.getOldValue(), event.getValue())));

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/TextAreaPage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ private void addBasicFeatures() {
7777
Div message = new Div();
7878
TextArea textArea = new TextArea();
7979
textArea.setLabel("Text area label");
80-
textArea.setPlaceholder("placeholder text");
8180
textArea.addValueChangeListener(event -> message.setText(
8281
String.format("Text area value changed from '%s' to '%s'",
8382
event.getOldValue(), event.getValue())));

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/main/java/com/vaadin/flow/component/textfield/tests/TextFieldPage.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ private void initView() {
5252
event -> textField.setReadOnly(!textField.isReadOnly()));
5353
add(button);
5454

55-
NativeButton required = new NativeButton(
56-
"Set/unset field required property");
57-
required.setId("required");
58-
required.addClickListener(
59-
event -> textField.setRequiredIndicatorVisible(
60-
!textField.isRequiredIndicatorVisible()));
61-
add(required);
62-
6355
TextField valueChangeSource = new TextField();
6456
valueChangeSource.getStyle().set("display", "block");
6557
valueChangeSource.setId("value-change");

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/BigDecimalFieldPageIT.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.vaadin.flow.component.textfield.tests;
1717

1818
import static org.junit.Assert.assertFalse;
19-
import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
2019

2120
import java.util.List;
2221

@@ -147,18 +146,6 @@ public void assertEnabled() {
147146
assertValueChange(2, 123, 987);
148147
}
149148

150-
@Test
151-
public void assertRequired() {
152-
assertFalse(field.hasAttribute("required"));
153-
154-
WebElement toggleRequired = findElement(By.id("toggle-required"));
155-
toggleRequired.click();
156-
waitUntil(attributeToBe(field, "required", "true"));
157-
158-
toggleRequired.click();
159-
waitUntil(attributeToBe(field, "required", ""));
160-
}
161-
162149
@Test
163150
public void assertClearValue() {
164151
field = $(BigDecimalFieldElement.class).id("clear-big-decimal-field");

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/EmailFieldPageIT.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.vaadin.flow.component.textfield.tests;
1717

1818
import static org.junit.Assert.assertFalse;
19-
import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
2019

2120
import org.junit.Assert;
2221
import org.junit.Before;
@@ -95,20 +94,6 @@ public void assertEnabled() {
9594
messageDiv.getText());
9695
}
9796

98-
@Test
99-
public void assertRequired() {
100-
EmailFieldElement emailField = $(EmailFieldElement.class).first();
101-
102-
assertFalse(emailField.hasAttribute("required"));
103-
104-
WebElement button = findElement(By.id("required"));
105-
button.click();
106-
waitUntil(attributeToBe(emailField, "required", "true"));
107-
108-
button.click();
109-
waitUntil(attributeToBe(emailField, "required", ""));
110-
}
111-
11297
@Test
11398
public void assertClearValue() {
11499
EmailFieldElement field = $(EmailFieldElement.class)

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/IntegerFieldPageIT.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.vaadin.flow.component.textfield.tests;
1717

1818
import static org.junit.Assert.assertFalse;
19-
import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
2019

2120
import java.util.List;
2221

@@ -104,18 +103,6 @@ public void assertEnabled() {
104103
assertValueChange(2, 123, 987);
105104
}
106105

107-
@Test
108-
public void assertRequired() {
109-
assertFalse(field.hasAttribute("required"));
110-
111-
WebElement toggleRequired = findElement(By.id("toggle-required"));
112-
toggleRequired.click();
113-
waitUntil(attributeToBe(field, "required", "true"));
114-
115-
toggleRequired.click();
116-
waitUntil(attributeToBe(field, "required", ""));
117-
}
118-
119106
@Test
120107
public void assertClearValue() {
121108
field = $(IntegerFieldElement.class).id("clear-integer-field");

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/NumberFieldPageIT.java

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.vaadin.flow.component.textfield.tests;
1717

1818
import static org.junit.Assert.assertFalse;
19-
import static org.openqa.selenium.support.ui.ExpectedConditions.attributeToBe;
2019

2120
import org.junit.Assert;
2221
import org.junit.Before;
@@ -102,20 +101,6 @@ public void assertEnabled() {
102101
messageDiv.getText());
103102
}
104103

105-
@Test
106-
public void assertRequired() {
107-
NumberFieldElement numberField = $(NumberFieldElement.class).first();
108-
109-
assertFalse(numberField.hasAttribute("required"));
110-
111-
WebElement button = findElement(By.id("required"));
112-
button.click();
113-
waitUntil(attributeToBe(numberField, "required", "true"));
114-
115-
button.click();
116-
waitUntil(attributeToBe(numberField, "required", ""));
117-
}
118-
119104
@Test
120105
public void assertClearValue() {
121106
NumberFieldElement field = $(NumberFieldElement.class)
@@ -153,36 +138,4 @@ public void assertValueChange() {
153138
String message = $("div").id("clear-message").getText();
154139
Assert.assertEquals("Old value: 'null'. New value: '123.0'.", message);
155140
}
156-
157-
@Test
158-
public void dollarFieldHasDollarPrefix() {
159-
WebElement dollarField = findElement(By.id("dollar-field"));
160-
WebElement span = dollarField.findElement(By.tagName("span"));
161-
162-
Assert.assertEquals("$", span.getText());
163-
164-
int spanX = span.getLocation().getX();
165-
int middleX = dollarField.getLocation().getX()
166-
+ dollarField.getSize().getWidth() / 2;
167-
168-
Assert.assertTrue(
169-
"The dollar sign should be located on the left side of the text field",
170-
spanX < middleX);
171-
}
172-
173-
@Test
174-
public void euroFieldHasEuroSuffix() {
175-
WebElement euroField = findElement(By.id("euro-field"));
176-
WebElement span = euroField.findElement(By.tagName("span"));
177-
178-
Assert.assertEquals("€", span.getText());
179-
180-
int spanX = span.getLocation().getX();
181-
int middleX = euroField.getLocation().getX()
182-
+ euroField.getSize().getWidth() / 2;
183-
184-
Assert.assertTrue(
185-
"The euro sign should be located on the right side of the text field",
186-
spanX > middleX);
187-
}
188141
}

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/PasswordFieldPageIT.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,6 @@ public void assertReadOnly() {
5656
.equals(getProperty(webComponent, "readonly")));
5757
}
5858

59-
@Test
60-
public void assertRequired() {
61-
WebElement webComponent = findElement(
62-
By.tagName("vaadin-password-field"));
63-
64-
Assert.assertNull(webComponent.getDomAttribute("required"));
65-
66-
WebElement button = findElement(By.id("required"));
67-
button.click();
68-
waitUntil(
69-
driver -> "true".equals(getProperty(webComponent, "required")));
70-
71-
button.click();
72-
waitUntil(driver -> "false"
73-
.equals(getProperty(webComponent, "required")));
74-
}
75-
7659
@Test
7760
public void assertClearValue() {
7861
PasswordFieldElement field = $(PasswordFieldElement.class)
@@ -118,14 +101,6 @@ public void assertFocusShortcut() {
118101
shortcutField.hasAttribute("focused"));
119102
}
120103

121-
@Test
122-
public void passwordFieldHasPlaceholder() {
123-
WebElement passwordField = findElement(
124-
By.id("password-field-with-value-change-listener"));
125-
Assert.assertEquals(passwordField.getDomAttribute("placeholder"),
126-
"placeholder text");
127-
}
128-
129104
@Test
130105
public void valueChangeListenerReportsCorrectValues() {
131106
WebElement passwordFieldValueDiv = findElement(

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/TextAreaPageIT.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,6 @@ private void waitUntilTextsEqual(String expected, WebElement valueDiv) {
120120
waitUntil(driver -> expected.equals(valueDiv.getText()));
121121
}
122122

123-
@Test
124-
public void textAreaHasPlaceholder() {
125-
WebElement textField = findElement(
126-
By.id("text-area-with-value-change-listener"));
127-
Assert.assertEquals(textField.getDomAttribute("placeholder"),
128-
"placeholder text");
129-
}
130-
131123
@Test
132124
public void maxHeight() {
133125
WebElement textArea = findElement(By.id("text-area-with-max-height"));

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/TextFieldPageIT.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,6 @@ public void assertReadOnly() {
6363
.equals(getProperty(webComponent, "readonly")));
6464
}
6565

66-
@Test
67-
public void assertRequired() {
68-
WebElement webComponent = findElement(By.tagName("vaadin-text-field"));
69-
Assert.assertNull(webComponent.getDomAttribute("required"));
70-
WebElement button = findElement(By.id("required"));
71-
button.click();
72-
waitUntil(
73-
driver -> "true".equals(getProperty(webComponent, "required")));
74-
75-
button.click();
76-
waitUntil(driver -> "false"
77-
.equals(getProperty(webComponent, "required")));
78-
}
79-
8066
@Test
8167
public void labelMatches() {
8268
List<TextFieldElement> textFieldElements = $(TextFieldElement.class)
@@ -266,14 +252,6 @@ public void valueChangeListenerReportsCorrectValues() {
266252
updateValues(textFieldValueDiv, textField, false);
267253
}
268254

269-
@Test
270-
public void textFieldHasPlaceholder() {
271-
WebElement textField = findElement(
272-
By.id("text-field-with-value-change-listener"));
273-
Assert.assertEquals("placeholder text",
274-
textField.getDomAttribute("placeholder"));
275-
}
276-
277255
@Test
278256
public void assertFocusShortcut() {
279257
TextFieldElement shortcutField = $(TextFieldElement.class)

0 commit comments

Comments
 (0)