Skip to content

Commit 32467b6

Browse files
pnatashappnatashap
committed
Add rule to use Matcher.is(true|false) with error message
1 parent eeed135 commit 32467b6

15 files changed

+68
-68
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ public class AutoCompleteAssert extends UIAssert<AutoCompleteAssert, AutoComplet
1616

1717
@JDIAction("Assert that '{name}' is expanded")
1818
public AutoCompleteAssert expanded() {
19-
jdiAssert(element().expanded(), Matchers.is(true));
19+
jdiAssert(element().expanded(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2020
return this;
2121
}
2222

2323
@JDIAction("Assert that '{name}' is collapsed")
2424
public AutoCompleteAssert collapsed() {
25-
jdiAssert(element().collapsed(), Matchers.is(true));
25+
jdiAssert(element().collapsed(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2626
return this;
2727
}
2828

@@ -48,13 +48,13 @@ public AutoCompleteAssert placeholder(String expected) {
4848

4949
@JDIAction("Assert that '{name} is mandatory")
5050
public AutoCompleteAssert mandatory() {
51-
jdiAssert(element().isMandatory(), Matchers.is(true));
51+
jdiAssert(element().isMandatory(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
5252
return this;
5353
}
5454

5555
@JDIAction("Assert that '{name} is not mandatory")
5656
public AutoCompleteAssert notMandatory() {
57-
jdiAssert(element().isMandatory(), Matchers.is(false));
57+
jdiAssert(element().isMandatory(), Matchers.is(false), "ERROR MESSAGE IS REQUIRED");
5858
return this;
5959
}
6060

@@ -67,13 +67,13 @@ public AutoCompleteAssert empty() {
6767

6868
@JDIAction("Assert that '{name} is invalid")
6969
public AutoCompleteAssert invalid() {
70-
jdiAssert(element().isInvalidated(), Matchers.is(true));
70+
jdiAssert(element().isInvalidated(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
7171
return this;
7272
}
7373

7474
@JDIAction("Assert that '{name} is valid")
7575
public AutoCompleteAssert valid() {
76-
jdiAssert(element().isInvalidated(), Matchers.is(false));
76+
jdiAssert(element().isInvalidated(), Matchers.is(false), "ERROR MESSAGE IS REQUIRED");
7777
return this;
7878
}
7979

@@ -103,13 +103,13 @@ public AutoCompleteAssert groupsAndOptions(Map<String, List<String>> expectedGro
103103

104104
@JDIAction("Assert that '{name}' has the {0} option being highlighted")
105105
public AutoCompleteAssert optionHighlighted(String option) {
106-
jdiAssert(element().isOptionHighlighted(option), Matchers.is(true));
106+
jdiAssert(element().isOptionHighlighted(option), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
107107
return this;
108108
}
109109

110110
@JDIAction("Assert that '{name}' has the {0} option being not highlighted")
111111
public AutoCompleteAssert optionNotHighlighted(String option) {
112-
jdiAssert(element().isOptionHighlighted(option), Matchers.is(false));
112+
jdiAssert(element().isOptionHighlighted(option), Matchers.is(false), "ERROR MESSAGE IS REQUIRED");
113113
return this;
114114
}
115115

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ public BottomSheetAssert values(final List<String> values) {
2929
}
3030

3131
public BottomSheetAssert opened() {
32-
jdiAssert(element().isOpened(), Matchers.is(true));
32+
jdiAssert(element().isOpened(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
3333
return this;
3434
}
3535

3636
public BottomSheetAssert closed() {
37-
jdiAssert(element().isClosed(), Matchers.is(true));
37+
jdiAssert(element().isClosed(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
3838
return this;
3939
}
4040
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010
public class CardAssert extends UIAssert<CardAssert, Card> {
1111
@JDIAction("Assert that '{name}' has text '{0}'")
1212
public CardAssert assertCardText(String value) {
13-
jdiAssert(element().getCardText().equals(value), Matchers.is(true));
13+
jdiAssert(element().getCardText().equals(value), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
1414
return this;
1515
}
1616

1717
@JDIAction("Assert that '{name}' alt image attribute has text '{0}'")
1818
public CardAssert assertAltImageAttribute(String value) {
19-
jdiAssert(element().getImage().getAttribute("alt").contains(value), Matchers.is(true));
19+
jdiAssert(element().getImage().getAttribute("alt").contains(value), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2020
return this;
2121
}
2222

2323
@JDIAction("Assert that '{name}' src image attribute has text '{0}'")
2424
public CardAssert assertSrcImageAttribute(String value) {
25-
jdiAssert(element().getImage().getAttribute("src").contains(value), Matchers.is(true));
25+
jdiAssert(element().getImage().getAttribute("src").contains(value), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2626
return this;
2727
}
2828

2929
@JDIAction("Assert that '{name}' has '{0}' buttons")
3030
public CardAssert assertNumberOfButtonsOnCard(int number) {
31-
jdiAssert(element().getButtons().size() == number, Matchers.is(true));
31+
jdiAssert(element().getButtons().size() == number, Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
3232
return this;
3333
}
3434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ChipsAssert extends UIAssert<ChipsAssert, Chips> {
1414

1515
@JDIAction("Assert that '{name}' enabled")
1616
public ChipsAssert assertChipsIsEnabled() {
17-
jdiAssert(element().enabled(), Matchers.is(true));
17+
jdiAssert(element().enabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
1818
return this;
1919
}
2020

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,109 +18,109 @@
1818
public class DatepickerAssert extends UIAssert<DatepickerAssert, Datepicker> implements ITextAssert<DatepickerAssert> {
1919
@JDIAction("Assert that '{name}' expanded")
2020
public DatepickerAssert expanded() {
21-
jdiAssert(element().isExpanded(), Matchers.is(true));
21+
jdiAssert(element().isExpanded(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2222
return this;
2323
}
2424

2525
@JDIAction("Assert that '{name}' collapsed")
2626
public DatepickerAssert collapsed() {
27-
jdiAssert(element().isCollapsed(), Matchers.is(true));
27+
jdiAssert(element().isCollapsed(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2828
return this;
2929
}
3030

3131
@JDIAction("Assert that '{name}' focused")
3232
public DatepickerAssert focused() {
33-
jdiAssert(element().isFocused(), Matchers.is(true));
33+
jdiAssert(element().isFocused(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
3434
return this;
3535
}
3636

3737
@JDIAction("Assert that '{name}' has locale '{0}'")
3838
public DatepickerAssert locale(final Locale locale) {
39-
jdiAssert(element().isSelectedLocale(locale), Matchers.is(true));
39+
jdiAssert(element().isSelectedLocale(locale), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
4040
return this;
4141
}
4242

4343
@JDIAction("Assert that '{name}' has first input & change events '{0}'")
4444
public DatepickerAssert firstInputChangeEvents(final List<String> firstInputChangeEvents) {
45-
jdiAssert(element().isFirstInputChangeEvents(firstInputChangeEvents), Matchers.is(true));
45+
jdiAssert(element().isFirstInputChangeEvents(firstInputChangeEvents), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
4646
return this;
4747
}
4848

4949
@JDIAction("Assert that '{name}' has last input & change events '{0}'")
5050
public DatepickerAssert lastInputChangeEvents(final List<String> lastInputChangeEvents) {
51-
jdiAssert(element().isLastInputChangeEvents(lastInputChangeEvents), Matchers.is(true));
51+
jdiAssert(element().isLastInputChangeEvents(lastInputChangeEvents), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
5252
return this;
5353
}
5454

5555
@JDIAction("Assert that '{name}' has last change event '{0}'")
5656
public DatepickerAssert lastChangeEvent(final String lastChangeEvent) {
57-
jdiAssert(element().isLastChangeEvent(lastChangeEvent), Matchers.is(true));
57+
jdiAssert(element().isLastChangeEvent(lastChangeEvent), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
5858
return this;
5959
}
6060

6161
@JDIAction("Assert that '{name}' has last input event '{0}'")
6262
public DatepickerAssert lastInputEvent(final String lastInputEvent) {
63-
jdiAssert(element().isLastInputEvent(lastInputEvent), Matchers.is(true));
63+
jdiAssert(element().isLastInputEvent(lastInputEvent), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
6464
return this;
6565
}
6666

6767
@JDIAction("Assert that '{name}' has valid value")
6868
public DatepickerAssert valid() {
69-
jdiAssert(element().isValid(), Matchers.is(true));
69+
jdiAssert(element().isValid(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
7070
return this;
7171
}
7272

7373
@JDIAction("Assert that '{name}' has invalid value")
7474
public DatepickerAssert invalid() {
75-
jdiAssert(element().isInvalid(), Matchers.is(true));
75+
jdiAssert(element().isInvalid(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
7676
return this;
7777
}
7878

7979
@JDIAction("Assert that '{name}' enabled")
8080
public DatepickerAssert enabled() {
81-
jdiAssert(element().isEnabled(), Matchers.is(true));
81+
jdiAssert(element().isEnabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
8282
return this;
8383
}
8484

8585
@JDIAction("Assert that '{name}' disabled")
8686
public DatepickerAssert disabled() {
87-
jdiAssert(element().isDisabled(), Matchers.is(true));
87+
jdiAssert(element().isDisabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
8888
return this;
8989
}
9090

9191
@JDIAction("Assert that '{name}' has enabled toggle")
9292
public DatepickerAssert enabledToggle() {
93-
jdiAssert(element().isToggleEnabled(), Matchers.is(true));
93+
jdiAssert(element().isToggleEnabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
9494
return this;
9595
}
9696

9797
@JDIAction("Assert that '{name}' has disabled toggle")
9898
public DatepickerAssert disabledToggle() {
99-
jdiAssert(element().isToggleDisabled(), Matchers.is(true));
99+
jdiAssert(element().isToggleDisabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
100100
return this;
101101
}
102102

103103
@JDIAction("Assert that '{name}' has enabled input")
104104
public DatepickerAssert enabledInput() {
105-
jdiAssert(element().isInputEnabled(), Matchers.is(true));
105+
jdiAssert(element().isInputEnabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
106106
return this;
107107
}
108108

109109
@JDIAction("Assert that '{name}' has disabled input")
110110
public DatepickerAssert disabledInput() {
111-
jdiAssert(element().isInputDisabled(), Matchers.is(true));
111+
jdiAssert(element().isInputDisabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
112112
return this;
113113
}
114114

115115
@JDIAction("Assert that '{name}' has enabled values '{0}'")
116116
public DatepickerAssert enabledNavigation(final String... navigationElements) {
117-
jdiAssert(element().isEnabledNavigationElements(navigationElements), Matchers.is(true));
117+
jdiAssert(element().isEnabledNavigationElements(navigationElements), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
118118
return this;
119119
}
120120

121121
@JDIAction("Assert that '{name}' has disabled values '{0}'")
122122
public DatepickerAssert disabledNavigation(final String... navigationElements) {
123-
jdiAssert(element().isDisabledNavigationElements(navigationElements), Matchers.is(true));
123+
jdiAssert(element().isDisabledNavigationElements(navigationElements), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
124124
return this;
125125
}
126126

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88

99
public class DialogAssert extends UIAssert<DialogAssert, Dialog> {
1010
public DialogAssert opened() {
11-
jdiAssert(element().isOpened(), Matchers.is(true));
11+
jdiAssert(element().isOpened(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
1212
return this;
1313
}
1414

1515
public DialogAssert closed() {
16-
jdiAssert(element().isClosed(), Matchers.is(true));
16+
jdiAssert(element().isClosed(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
1717
return this;
1818
}
1919

2020
public DialogAssert nameText(String name) {
21-
jdiAssert(element().nameText(name), Matchers.is(true));
21+
jdiAssert(element().nameText(name), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2222
return this;
2323
}
2424

2525
public DialogAssert answerText(String answer) {
26-
jdiAssert(element().answerText(answer), Matchers.is(true));
26+
jdiAssert(element().answerText(answer), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2727
return this;
2828
}
2929
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
public class ExpansionPanelAssert extends UIAssert<ExpansionPanelAssert, ExpansionPanel> {
1212
@JDIAction("Assert that '{name}' expanded")
1313
public ExpansionPanelAssert expanded(final int indexNumber) {
14-
jdiAssert(element().isExpanded(indexNumber), Matchers.is(true));
14+
jdiAssert(element().isExpanded(indexNumber), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
1515
return this;
1616
}
1717

1818
@JDIAction("Assert that '{name}' collapsed")
1919
public ExpansionPanelAssert collapsed(final int indexNumber) {
20-
jdiAssert(element().isCollapsed(indexNumber), Matchers.is(true));
20+
jdiAssert(element().isCollapsed(indexNumber), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2121
return this;
2222
}
2323

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public InputAssert value(String text) {
1818

1919
@JDIAction("Assert that '{name}' is readonly")
2020
public InputAssert readonly() {
21-
jdiAssert(element().isReadonly(), Matchers.is(true));
21+
jdiAssert(element().isReadonly(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2222
return this;
2323
}
2424

2525
@JDIAction("Assert that '{name}' is not readonly")
2626
public InputAssert notReadonly() {
27-
jdiAssert(element().isReadonly(), Matchers.is(false));
27+
jdiAssert(element().isReadonly(), Matchers.is(false), "ERROR MESSAGE IS REQUIRED");
2828
return this;
2929
}
3030

@@ -48,7 +48,7 @@ public InputAssert focused() {
4848

4949
@JDIAction("Assert that '{name}' is not focused")
5050
public InputAssert notFocused() {
51-
jdiAssert(element().isFocused(), Matchers.is(false));
51+
jdiAssert(element().isFocused(), Matchers.is(false), "ERROR MESSAGE IS REQUIRED");
5252
return this;
5353
}
5454

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
public class MaterialSelectorAssert extends UIAssert<MaterialSelectorAssert, MaterialSelector> {
1919
@JDIAction("Assert that '{name}' expanded")
2020
public MaterialSelectorAssert expanded() {
21-
jdiAssert(element().isExpanded(), Matchers.is(true));
21+
jdiAssert(element().isExpanded(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2222
return this;
2323
}
2424

2525
@JDIAction("Assert that '{name}' collapsed")
2626
public MaterialSelectorAssert collapsed() {
27-
jdiAssert(element().isCollapsed(), Matchers.is(true));
27+
jdiAssert(element().isCollapsed(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2828
return this;
2929
}
3030

@@ -122,7 +122,7 @@ public MaterialSelectorAssert listDisabled(final String... values) {
122122

123123
@JDIAction("Assert that rgba({0}, {1}, {2}, {3}) is the specified color")
124124
public MaterialSelectorAssert color(final int red, final int green, final int blue, final double a) {
125-
jdiAssert(element().color(red, green, blue, a), Matchers.is(true));
125+
jdiAssert(element().color(red, green, blue, a), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
126126
return this;
127127
}
128128
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@
1010
public class NestedDropdownMenuAssert extends UIAssert<NestedDropdownMenuAssert, NestedDropdownMenu> {
1111
@JDIAction("Assert that {name} is expanded")
1212
public NestedDropdownMenuAssert isExpanded() {
13-
jdiAssert(element().isExpanded(), Matchers.is(true));
13+
jdiAssert(element().isExpanded(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
1414
return this;
1515
}
1616

1717
@JDIAction("Assert that {name} is closed")
1818
public NestedDropdownMenuAssert isClosed() {
19-
jdiAssert(element().isClosed(), Matchers.is(true));
19+
jdiAssert(element().isClosed(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2020
return this;
2121
}
2222

2323
@JDIAction("Assert that {name} expected value '{0} and actual value '{1}' are equals")
2424
public NestedDropdownMenuAssert checkValue(String expectedValue, String actualValue) {
25-
jdiAssert(element().checkValue(expectedValue, actualValue), Matchers.is(true));
25+
jdiAssert(element().checkValue(expectedValue, actualValue), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
2626
return this;
2727
}
2828

2929
@JDIAction("Assert that {name} option '{0}' is disabled")
3030
public NestedDropdownMenuAssert isDisabledMenuWithIconsOption(String value) {
31-
jdiAssert(element().isDisabledMenuWithIconsOption(value), Matchers.is(true));
31+
jdiAssert(element().isDisabledMenuWithIconsOption(value), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
3232
return this;
3333
}
3434

3535
@JDIAction("Assert that {name} option '{0}' is disabled")
3636
public NestedDropdownMenuAssert isDisabledNestedMenuOption(String... values) {
37-
jdiAssert(element().isDisabledNestedMenuOption(values), Matchers.is(true));
37+
jdiAssert(element().isDisabledNestedMenuOption(values), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
3838
return this;
3939
}
4040
}

0 commit comments

Comments
 (0)