Skip to content

Commit c8fdb1e

Browse files
author
Konstantin Bulavin
committed
rebase
1 parent 96f6f03 commit c8fdb1e

File tree

11 files changed

+131
-213
lines changed

11 files changed

+131
-213
lines changed

‎jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class AngularPage extends WebPage {
3434
public static SideNavSection sidenavSection;
3535
public static ExpansionPanelSection expansionPanelSection;
3636
public static SortingOverviewSection sortingOverviewSection;
37-
public static ChipsSection chipsSection;
3837
public static TableSection tableSection;
3938
public static DividerSection dividerSection;
4039
}

‎jdi-light-angular-tests/src/main/java/io/github/com/pages/ChipsPage.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package io.github.com.pages;
22

33
import com.epam.jdi.light.angular.elements.complex.ChipGroup;
4-
import com.epam.jdi.light.angular.elements.complex.Chips;
54
import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
65
import com.epam.jdi.light.ui.html.elements.common.Text;
76

8-
import static com.jdiai.tools.Timer.waitCondition;
9-
107
public class ChipsPage extends NewAngularPage {
118

129
@UI("#basic-chips-row")
@@ -54,10 +51,4 @@ public class ChipsPage extends NewAngularPage {
5451
@UI("#stacked-chips-label")
5552
public static Text stackedSelectedValue;
5653

57-
// @Override
58-
// public void checkOpened() {
59-
// super.checkOpened();
60-
// waitCondition(() -> !basicChips.isDisabled());
61-
// }
62-
6354
}

‎jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/ChipsSection.java‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +0,0 @@
1-
package io.github.com.pages.sections;
2-
3-
import com.epam.jdi.light.angular.elements.complex.Chips;
4-
import com.epam.jdi.light.elements.composite.Section;
5-
import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
6-
import com.epam.jdi.light.ui.html.elements.common.Text;
7-
8-
public class ChipsSection extends Section {
9-
10-
public static Chips chips;
11-
12-
@UI("#mat-chip-list-0")
13-
public static Chips basicChipsRow;
14-
15-
@UI("#mat-chip-list-1")
16-
public static Chips stackedChipsList;
17-
18-
@UI("#basic-chips-label")
19-
public static Text basicSelectedValue;
20-
21-
@UI("#stacked-chips-label")
22-
public static Text stackedSelectedValue;
23-
24-
@UI("#chips-autocomplete-field")
25-
public static Chips chipsAutocompleteField;
26-
27-
@UI("#mat-chip-list-input-0")
28-
public static Chips chipsAutocompleteInput;
29-
30-
@UI("#mat-chip-list-2")
31-
public static Chips autocompleteChipsList;
32-
33-
@UI("#chips-with-input-field")
34-
public static Chips chipsWithInputField;
35-
36-
@UI("#mat-chip-list-input-1")
37-
public static Chips chipsWithInputInput;
38-
39-
@UI("#mat-chip-list-3")
40-
public static Chips chipsWithInputList;
41-
42-
}

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

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import io.github.com.pages.ChipsPage;
44
import io.github.epam.TestsInit;
5-
import org.testng.annotations.BeforeClass;
65
import org.testng.annotations.BeforeMethod;
7-
import org.testng.annotations.Ignore;
86
import org.testng.annotations.Test;
97

108
import java.util.Arrays;
@@ -15,17 +13,12 @@
1513
import static io.github.com.StaticSite.chipsPage;
1614
import static io.github.com.pages.ChipsPage.autocompleteChips;
1715
import static io.github.com.pages.ChipsPage.basicChips;
16+
import static io.github.com.pages.ChipsPage.disabledChips;
1817
import static io.github.com.pages.ChipsPage.inputChips;
1918
import static io.github.com.pages.ChipsPage.multipleChips;
2019
import static io.github.com.pages.ChipsPage.stackedChips;
2120
import static io.github.com.pages.ChipsPage.stackedSelectedValue;
22-
import static io.github.com.pages.sections.ChipsSection.chipsAutocompleteField;
23-
import static io.github.com.pages.sections.ChipsSection.chipsAutocompleteInput;
24-
import static io.github.com.pages.sections.ChipsSection.chipsWithInputInput;
25-
import static io.github.epam.site.steps.States.shouldBeLoggedIn;
2621

27-
// TODO Move to the new page
28-
//@Ignore
2922
public class ChipsTests extends TestsInit {
3023

3124
private static final String ONEFISH = "One fish";
@@ -43,14 +36,7 @@ public class ChipsTests extends TestsInit {
4336
private static final String LEMON = "Lemon";
4437
private static final String LIME = "Lime";
4538

46-
47-
// @BeforeMethod(alwaysRun = true)
48-
// public void before() {
49-
// shouldBeLoggedIn();
50-
// angularPage.shouldBeOpened();
51-
// }
52-
53-
@BeforeClass
39+
@BeforeMethod
5440
public void before() {
5541
chipsPage.open();
5642
waitCondition(() -> chipsPage.isOpened());
@@ -60,9 +46,7 @@ public void before() {
6046
@Test
6147
public void basicChipsTest() {
6248
basicChips.show();
63-
// basicChips.is().displayed();
64-
// basicChips.is().assertChipsIsEnabled();
65-
// basicChips.selectByText(ONEFISH);
49+
basicChips.is().displayed();
6650
basicChips.selectByText(TWOFISH);
6751
basicChips.selectByText(PRIMARYFISH);
6852
basicChips.selectByText(WARNFISH);
@@ -73,8 +57,7 @@ public void basicChipsTest() {
7357
@Test
7458
public void stackedChipsTest() {
7559
stackedChips.show();
76-
// stackedChipsList.is().displayed();
77-
// stackedChipsList.is().assertChipsIsEnabled();
60+
stackedChips.is().displayed();
7861
stackedChips.is().vertical();
7962
stackedChips.selectByText(NONE);
8063
stackedChips.selectByText(PRIMARY);
@@ -90,48 +73,59 @@ public void chipsAutocompleteTest() {
9073
"Apple", "Lemon", "Lime", "Orange", "Strawberry"};
9174
List<String> expectedValues = Arrays.asList(expectedValuesArray);
9275
autocompleteChips.show();
93-
94-
// autocompleteChips.is().disabled();
95-
// chipsAutocompleteField.is().displayed();
96-
// chipsAutocompleteInput.is().assertChipsIsEnabled();
97-
// autocompleteChips.has().assertChipsHasPlaceholder(PLACEHOLDER);
98-
// autocompleteChips.has().assertChipsHasOptions(expectedValues);
76+
autocompleteChips.is().displayed();
77+
autocompleteChips.has().assertChipsHasPlaceholder("New Fruit...");
78+
autocompleteChips.has().assertChipsHasOptions(expectedValues);
9979

10080
autocompleteChips.setValue(LEMON);
101-
// chipsAutocompleteField.collapseField();
102-
// chipsAutocompleteInput.setValue(APPLE);
103-
// chipsAutocompleteField.collapseField();
104-
// chipsAutocompleteInput.setValue(LIME);
105-
// chipsAutocompleteField.collapseField();
106-
107-
81+
autocompleteChips.collapseField();
82+
autocompleteChips.is().hasElement(LEMON);
83+
autocompleteChips.setValue(APPLE);
84+
autocompleteChips.collapseField();
85+
autocompleteChips.is().hasElement(APPLE);
86+
autocompleteChips.setValue(LIME);
87+
autocompleteChips.collapseField();
88+
autocompleteChips.is().hasElement(LIME);
10889
}
10990

11091
@Test
11192
public void chipsWithInputTest() {
11293
inputChips.show();
113-
chipsWithInputInput.is().displayed();
114-
// inputChips.is().assertChipsIsEnabled();
94+
inputChips.is().displayed();
11595
inputChips.has().assertChipsHasPlaceholder(PLACEHOLDER);
11696
inputChips.input("Kiwi" + "\n");
11797
inputChips.input("Melon");
11898
inputChips.clearInputField();
11999
inputChips.input("Rockmelon" + "\n");
100+
inputChips.is().hasElement("Kiwi");
101+
inputChips.is().hasElement("Rockmelon");
102+
}
103+
104+
@Test
105+
public void chipsRemovableTest() {
106+
inputChips.show();
107+
inputChips.is().displayed();
108+
inputChips.getElement("Lemon").is().removable();
109+
inputChips.getElement("Lemon").close();
110+
inputChips.getElement("Lemon");
120111
}
121112

113+
@Test
114+
public void chipDisabledTest() {
115+
disabledChips.groupElements().get(0).is().disabled();
116+
disabledChips.groupElements().get(1).is().disabled();
117+
disabledChips.groupElements().get(2).is().disabled();
118+
119+
}
122120

123121
@Test
124-
public void mult() {
122+
public void chipsMultipleSelectionTest() {
125123
multipleChips.show();
126-
// multipleChips.is().displayed();
127-
// multipleChips.is().multiselectable();
124+
multipleChips.is().displayed();
125+
multipleChips.is().multiselectable();
126+
multipleChips.selectByText("multiple color none");
127+
multipleChips.selectByText("multiple color Primary");
128+
multipleChips.getElement("multiple color none").is().selected();
129+
multipleChips.getElement("multiple color Primary").is().selected();
128130
}
129-
//
130-
// @Test
131-
// public void testTest() {
132-
// basicChips.getChipsByIndex(1).click();
133-
// ChipsPage.basicSelectedValue.has().text(format("You clicked: %s", ONEFISH));
134-
// System.out.println("Hello world!");
135-
// System.out.println(basicChips.getText());
136-
// }
137131
}

‎jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ChipAssert.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,23 @@
22

33
import com.epam.jdi.light.angular.elements.common.Chip;
44
import com.epam.jdi.light.asserts.generic.UIAssert;
5+
import com.epam.jdi.light.common.JDIAction;
6+
import org.hamcrest.Matchers;
7+
8+
import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
59

610
public class ChipAssert extends UIAssert<ChipAssert, Chip> {
711

12+
@JDIAction("Assert that '{name}' enabled")
13+
public ChipAssert selected() {
14+
jdiAssert(element().selected(), Matchers.is(true));
15+
return this;
16+
}
17+
18+
@JDIAction("Assert that '{name}' ")
19+
public ChipAssert removable() {
20+
jdiAssert(element().removable(), Matchers.is(true));
21+
return this;
22+
}
23+
824
}

‎jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ChipGroupAssert.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ public ChipGroupAssert assertChipsHasOptions(List<String> options) {
3030
}
3131

3232
public ChipGroupAssert multiselectable() {
33-
jdiAssert(element().isMultiselectable(), Matchers.is(true));
33+
jdiAssert(element().isMultiselectable(), Matchers.is("true"));
34+
return this;
35+
}
36+
37+
public ChipGroupAssert hasElement(String expected) {
38+
jdiAssert(element().hasElement(expected), Matchers.is(true));
3439
return this;
3540
}
3641

‎jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ChipsAssert.java‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ChipsAssertDELETE.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.epam.jdi.light.angular.asserts;
2+
3+
import com.epam.jdi.light.angular.elements.complex.ChipsDELETE;
4+
import com.epam.jdi.light.asserts.generic.UIAssert;
5+
6+
import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
7+
8+
public class ChipsAssertDELETE extends UIAssert<ChipsAssertDELETE, ChipsDELETE> {
9+
10+
// @JDIAction("Assert that '{name}' enabled")
11+
// public ChipsAssert assertChipsIsEnabled() {
12+
// jdiAssert(element().enabled(), Matchers.is(true));
13+
// return this;
14+
// }
15+
//
16+
// @JDIAction("Assert that '{name}' has options")
17+
// public ChipsAssert assertChipsHasOptions(List<String> options) {
18+
// jdiAssert(element().options(), Matchers.is(options));
19+
// return this;
20+
// }
21+
//
22+
// @JDIAction("Assert that '{name}' has placeholder '{0}'")
23+
// public ChipsAssert assertChipsHasPlaceholder(String expected) {
24+
// jdiAssert(element().getPlaceholderForChips(), Matchers.is(expected));
25+
// return this;
26+
// }
27+
//
28+
// @JDIAction("Assert that '{name}' is multiple selection")
29+
// public ChipsAssert assertChipsIsMultiselectable() {
30+
// jdiAssert(element().isMultipleSelection(), Matchers.is(true));
31+
// return this;
32+
// }
33+
}

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

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,23 @@
1010

1111
public class Chip extends UIBaseElement<ChipAssert> implements HasClick, HasColor, HasIcon, HasImage {
1212

13-
// @Override
14-
// @JDIAction("Get if '{name}' is enabled")
15-
// public boolean isEnabled() {
16-
// return hasAttribute("disabled");
17-
// }
18-
1913
@JDIAction("Close '{name}'")
2014
public void close() {
2115
find("matChipRemove").click();
2216
}
2317

24-
@JDIAction ("Get if '{name}' is removable")
25-
public boolean isRemovable() {
26-
return hasAttribute("matchipremove");
18+
@JDIAction("Get if '{name}' is removable")
19+
public boolean removable() {
20+
return hasAttribute("matchipremove");
2721
}
2822

2923
@JDIAction("Get if '{name} is focused'")
30-
public boolean isFocused() {
24+
public boolean focused() {
3125
return hasClass("cdk-focused");
3226
}
3327

3428
@JDIAction("Get if '{name} is selected'")
35-
public boolean isSelected() {
29+
public boolean selected() {
3630
return hasClass("mat-mdc-chip-selected");
3731
}
3832

@@ -49,11 +43,6 @@ public void click() {
4943
core().click();
5044
}
5145

52-
// @JDIAction("Get '{name}' text")
53-
// public String getText() {
54-
// return
55-
// }
56-
5746
@Override
5847
public ChipAssert is() {
5948
return new ChipAssert().set(this);

0 commit comments

Comments
 (0)