Skip to content

Commit d552742

Browse files
author
Konstantin Bulavin
committed
Modified in accordance with the comments
1 parent 2b4178e commit d552742

File tree

3 files changed

+46
-29
lines changed
  • jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex
  • jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements

3 files changed

+46
-29
lines changed

jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/ChipsTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public void before() {
4646
public void basicChipsTest() {
4747
basicChips.show();
4848
basicChips.is().displayed().and().enabled();
49-
basicChips.selectByText(TWOFISH);
49+
basicChips.selectByLabel(TWOFISH);
5050
basicChips.getElement(TWOFISH).is().selected();
51-
basicChips.selectByText(WARNFISH);
51+
basicChips.selectByLabel(WARNFISH);
5252
basicChips.getElement(WARNFISH).is().selected();
5353

5454
ChipsPage.basicSelectedValue.has().text(format("You clicked: %s", WARNFISH));
@@ -121,7 +121,7 @@ public void chipsRemovableTest() {
121121
inputChips.show();
122122
inputChips.is().displayed();
123123
inputChips.getElement(LEMON).is().removable();
124-
inputChips.getElement(LEMON).close();
124+
inputChips.getElement(LEMON).remove();
125125
}
126126

127127
@Test(description = "Test checks that chips can't be removed")
@@ -159,8 +159,8 @@ public void chipsMultipleSelectionTest() {
159159
multipleChips.show();
160160
multipleChips.is().displayed();
161161
multipleChips.is().multiselectable();
162-
multipleChips.selectByText("multiple color none");
163-
multipleChips.selectByText("multiple color Primary");
162+
multipleChips.selectByLabel("multiple color none");
163+
multipleChips.selectByLabel("multiple color Primary");
164164
multipleChips.getElement("multiple color none").is().selected();
165165
multipleChips.getElement("multiple color Primary").is().selected();
166166
}
@@ -170,8 +170,8 @@ public void chipsNotMultipleSelectionTest() {
170170
basicChips.show();
171171
basicChips.is().displayed();
172172
basicChips.is().notMultiselectable();
173-
basicChips.selectByText(TWOFISH);
174-
basicChips.selectByText(WARNFISH);
173+
basicChips.selectByLabel(TWOFISH);
174+
basicChips.selectByLabel(WARNFISH);
175175
basicChips.getElement(TWOFISH).is().deselected();
176176
basicChips.getElement(WARNFISH).is().selected();
177177

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/common/Chip.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public boolean selected() {
2020
}
2121

2222
@JDIAction("Close '{name}'")
23-
public void close() {
23+
public void remove() {
2424
find(MAT_CHIP_REMOVE).click();
2525
}
2626

@@ -44,6 +44,20 @@ public boolean highlighted() {
4444
return hasClass("mat-mdc-chip-highlighted");
4545
}
4646

47+
@JDIAction()
48+
public void select() {
49+
if (!selected()) {
50+
label().click();
51+
}
52+
}
53+
54+
@JDIAction()
55+
public void unselect() {
56+
if (selected()) {
57+
label().click();
58+
}
59+
}
60+
4761
@Override
4862
public Label label() {
4963
return new Label().setCore(Label.class, find(".mdc-evolution-chip__text-label"));

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ChipGroup.java

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.epam.jdi.light.angular.asserts.ChipGroupAssert;
44
import com.epam.jdi.light.angular.elements.common.Chip;
5+
import com.epam.jdi.light.angular.elements.interfaces.HasErrorState;
56
import com.epam.jdi.light.angular.elements.interfaces.HasOrientation;
67
import com.epam.jdi.light.angular.elements.interfaces.IsGroupElement;
78
import com.epam.jdi.light.common.JDIAction;
@@ -11,7 +12,7 @@
1112
import java.util.List;
1213
import java.util.stream.Collectors;
1314

14-
public class ChipGroup extends UIBaseElement<ChipGroupAssert> implements IsGroupElement<Chip>, HasOrientation {
15+
public class ChipGroup extends UIBaseElement<ChipGroupAssert> implements IsGroupElement<Chip>, HasOrientation, HasErrorState {
1516

1617
public static final String CHIP_LOCATOR = ".mat-mdc-chip";
1718

@@ -39,13 +40,6 @@ public boolean hasElement(String value) {
3940
.anyMatch(chip -> chip.labelText().equals(value));
4041
}
4142

42-
@Override
43-
@JDIAction("Get if all chips elements in '{name}' is displayed")
44-
public boolean isDisplayed() {
45-
return groupElements().stream()
46-
.allMatch(ICoreElement::isDisplayed);
47-
}
48-
4943
@Override
5044
@JDIAction("Get if all chips elements in '{name}' is enabled")
5145
public boolean isEnabled() {
@@ -54,19 +48,33 @@ public boolean isEnabled() {
5448
}
5549

5650
@JDIAction("Select chip element in '{name}' by '{0}'")
57-
public void selectByText(String text) {
51+
public void selectByLabel(String text) {
5852
Chip chip = getElement(text);
59-
if (!chip.selected()) {
60-
chip.click();
61-
}
53+
chip.select();
54+
}
55+
56+
@JDIAction("Select chip element in '{name}' by '{0}'")
57+
public void selectByLabel(List<String> values) {
58+
values.forEach(value -> {
59+
Chip chip = getElement(value);
60+
chip.select();
61+
});
62+
6263
}
6364

6465
@JDIAction("Deselect chip element in '{name}' by '{0}'")
65-
public void deselectByText(String text) {
66+
public void unselectByLabel(String text) {
6667
Chip chip = getElement(text);
67-
if (chip.selected()) {
68-
chip.click();
69-
}
68+
chip.unselect();
69+
}
70+
71+
@JDIAction("Deselect chip element in '{name}' by '{0}'")
72+
public void unselectByLabel(List<String> values) {
73+
values.forEach(value -> {
74+
Chip chip = getElement(value);
75+
chip.unselect();
76+
});
77+
7078
}
7179

7280
@Override
@@ -80,11 +88,6 @@ public String multiselectable() {
8088
return attr("aria-multiselectable");
8189
}
8290

83-
@JDIAction("Get if '{name}' has error state")
84-
public boolean errorState() {
85-
return core().hasClass("mat-form-field-invalid");
86-
}
87-
8891
@Override
8992
public ChipGroupAssert is() {
9093
return new ChipGroupAssert().set(this);

0 commit comments

Comments
 (0)