Skip to content

Commit 05c9e97

Browse files
committed
Merge branch 'master' into update_appium_client_9_0_0
2 parents 2307824 + 775d22a commit 05c9e97

File tree

30 files changed

+177
-198
lines changed

30 files changed

+177
-198
lines changed

config/checkstyle/checkstyle.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,4 +339,10 @@
339339
<property name="message" value="core() should be used with these methods" />
340340
<property name="id" value="CoreMethodsUnused_Error" />
341341
</module>
342+
<module name="RegexpSingleline">
343+
<property name="severity" value="error" />
344+
<property name="format" value="\.is\((true|false)\)\)" />
345+
<property name="message" value="Matcher.is(true/false) should be used with error message" />
346+
<property name="id" value="MatcherBooleanWithoutMessage_Error" />
347+
</module>
342348
</module>

jdi-bdd-tests/src/main/java/io/github/com/pages/HtmlElementsPage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public class HtmlElementsPage extends WebPage {
8888
//endregion
8989

9090
//region Complex Elements
91-
// TODO add Enum
9291

9392
public static DropdownSelect dressCode;
9493
@UI("#dress-code") public static Dropdown dressCode2;

jdi-bdd-tests/src/test/resources/features/WebPage.feature

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ Feature: Checking Basic WebPage Actions
2828
When I scroll "10" px right
2929
And I scroll "5" px left
3030
Then the page scrolled by "5" px right
31-
# TODO
32-
#Scenario: zoom test
33-
# When I zoom in "2" times
34-
# Then the page is zoomed "2" times
3531

3632
Scenario: go back test
3733
When I go back

jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/InputTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public void inputWithACustomErrorStateMatcherTest() {
4444
@Test
4545
public void autoResizingTextAreaTest() {
4646
autoSizeTextArea.isDisplayed();
47-
// TODO FIX TEST
48-
// autoSizeTextArea.has().cssClass("cdktextareaautosize");
4947
autoSizeTextArea.setLines("line1", "line2");
5048
autoSizeTextArea.addNewLine("line3");
5149
autoSizeTextArea.is().text("line1\nline2\nline3");

jdi-light-core/src/main/java/com/epam/jdi/light/elements/complex/table/IGrid.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -199,29 +199,4 @@ default String cell(String colName, String rowName) {
199199
}
200200
// endregion
201201

202-
// region Matchers
203-
//default Line row(Matcher<String> matcher) {
204-
// return LinqUtils.first(rows(), matcher::matches);
205-
//}
206-
//default List<Line> rows(Matcher<? super String> matcher) {
207-
// return LinqUtils.filter(rows(), matcher::matches);
208-
//}
209-
//default Line column(Matcher<String> matcher) {
210-
// return LinqUtils.first(columns(), matcher::matches);
211-
//}
212-
//default List<Line> columns(Matcher<? super String> matcher) {
213-
// return LinqUtils.filter(columns(), matcher::matches);
214-
//}
215-
//default UIElement cell(Matcher<String> matcher) {
216-
// return LinqUtils.first(webCells(), matcher::matches);
217-
//}
218-
//default List<UIElement> cells(Matcher<? super String> matcher) {
219-
// return LinqUtils.filter(webCells(), matcher::matches);
220-
//}
221-
// endregion
222-
223-
// region TableMatchers
224-
// TODO
225-
// endregion
226-
227202
}

jdi-light-html-tests/src/main/java/io/github/com/pages/HtmlElementsPage.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ public class HtmlElementsPage extends WebPage {
9090
// @UI("#height") public static NumberSelector height;
9191

9292
//region Complex Elements
93-
// TODO add Enum
94-
9593
// @UI("#dress-code") public static Dropdown dressCode;
9694
public static DropdownSelect dressCode;
9795
@UI("#dress-code") public static Dropdown dressCode2;

jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/ActionsCloseTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* Email: [email protected]; Skype: roman.iovlev
1818
*/
1919

20-
// TODO
2120
public class ActionsCloseTests implements TestsInit {
2221

2322
@BeforeMethod

jdi-light-material-ui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<artifactId>jdi-light-material-ui</artifactId>
88
<packaging>jar</packaging>
9-
<name>JDI Material UI Elements v4</name>
9+
<name>JDI Light Material UI Elements v4</name>
1010
<version>1.5.3-SNAPSHOT</version>
1111
<groupId>com.epam.jdi</groupId>
1212
<url>https://github.com/jdi-testing</url>

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/inputs/TextFieldAssert.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public TextFieldAssert helperText(Matcher<String> condition) {
6262
*/
6363
@JDIAction("Assert that '{name}' has helper text")
6464
public TextFieldAssert hasHelperText() {
65-
jdiAssert(element().hasHelperText(), Matchers.is(true));
65+
jdiAssert(element().hasHelperText(), Matchers.is(true), "TextField doesn't have helper text");
6666
return this;
6767
}
6868

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/AutocompletesPage.java

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,25 @@
99

1010
public class AutocompletesPage extends VuetifyPage {
1111

12-
@JAutocomplete(root = "//div[@id='style']/div[2]//div[2]/div[contains(@class, 'v-autocomplete')]",
13-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']")
12+
@UI("//div[@id='style']/div[2]//div[2]/div[contains(@class, 'v-autocomplete')]")
1413
public static Autocomplete lightDenseShapedOutlinedAutocomplete;
1514

16-
@JAutocomplete(root = "//div[@id='style']/div[2]//div[3]/div[contains(@class, 'v-autocomplete')]",
17-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']")
15+
@UI("//div[@id='style']/div[2]//div[3]/div[contains(@class, 'v-autocomplete')]")
1816
public static Autocomplete lightDenseFilledRoundedAutocomplete;
1917

20-
@JAutocomplete(root = "//div[@id='style']/div[3]//div[4]/div[contains(@class, 'v-autocomplete')]",
21-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']")
18+
@UI("//div[@id='style']/div[3]//div[4]/div[contains(@class, 'v-autocomplete')]")
2219
public static Autocomplete darkSoloAutocomplete;
2320

24-
@JAutocomplete(root = "//div[@id='style']/div[3]//div[5]/div[contains(@class, 'v-autocomplete')]",
25-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']")
21+
@UI("//div[@id='style']/div[3]//div[5]/div[contains(@class, 'v-autocomplete')]")
2622
public static Autocomplete darkSoloInvertedAutocomplete;
2723

28-
@JAutocomplete(root = "//div[@id='functionality']//div[1]/div[contains(@class, 'v-autocomplete')]",
29-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']")
24+
@UI("//div[@id='functionality']//div[1]/div[contains(@class, 'v-autocomplete')]")
3025
public static Autocomplete disabledAutocomplete;
3126

32-
@JAutocomplete(root = "//div[@id='functionality']//div[2]/div[contains(@class, 'v-autocomplete')]",
33-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']")
27+
@UI("//div[@id='functionality']//div[2]/div[contains(@class, 'v-autocomplete')]")
3428
public static Autocomplete clearableAutocomplete;
3529

36-
@JAutocomplete(root = "//div[@id='functionality']//div[3]/div[contains(@class, 'v-autocomplete')]",
37-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[contains(@class,'v-list-item')]")
30+
@UI("//div[@id='functionality']//div[3]/div[contains(@class, 'v-autocomplete')]")
3831
public static Autocomplete autoselectAutocomplete;
3932

4033
@UI("#filter .v-btn--round")
@@ -43,21 +36,16 @@ public class AutocompletesPage extends VuetifyPage {
4336
@UI("#filter .v-input")
4437
public static Input filterName;
4538

46-
@JAutocomplete(
47-
root = "#filter .v-autocomplete",
48-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[@class='v-list-item__title']"
49-
)
39+
@UI("#filter .v-autocomplete")
5040
public static Autocomplete filterStateAutocomplete;
5141

5242
@UI("#filter .v-btn.success")
5343
public static Button filterSaveButton;
5444

55-
@JAutocomplete(root = "#slots .v-autocomplete",
56-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[contains(@class,'v-list-item')]")
45+
@UI("#slots .v-autocomplete")
5746
public static Autocomplete selectAutocomplete;
5847

59-
@JAutocomplete(root = "#api .v-autocomplete",
60-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[contains(@class,'v-list-item')]")
48+
@UI("#api .v-autocomplete")
6149
public static Autocomplete publicApiAutocomplete;
6250

6351
@UI("#api .v-list-item__title")
@@ -66,7 +54,6 @@ public class AutocompletesPage extends VuetifyPage {
6654
@UI("//span[text()[contains(.,'Clear')]]")
6755
public static Button clearApiButton;
6856

69-
@JAutocomplete(root = "#async .v-autocomplete",
70-
listItems = "//div[contains(@class, 'v-autocomplete__content') and not(contains(@style, 'display'))]//div[contains(@class,'v-list-item')]")
57+
@UI("#async .v-autocomplete")
7158
public static Autocomplete asynchronousItemsAutocomplete;
7259
}

0 commit comments

Comments
 (0)