Skip to content

Commit 84d4439

Browse files
committed
Merge branch 'master' into angular_rework_development
2 parents dff581e + 5a100ec commit 84d4439

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+249
-255
lines changed

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/AvatarAssert.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public class AvatarAssert extends UIAssert<AvatarAssert, Avatar> implements ITex
1818
HasImageAssert<AvatarAssert, Avatar> {
1919

2020
@Override
21-
@JDIAction("Assert that '{name}' text {0}")
21+
@JDIAction(value = "Assert that '{name}' text {0}", isAssert = true)
2222
public AvatarAssert text(Matcher<String> condition) {
2323
jdiAssert(element().getText(), condition);
2424
return this;
2525
}
2626

27-
@JDIAction("Assert that '{name}' variant is {0}")
27+
@JDIAction(value = "Assert that '{name}' variant is {0}", isAssert = true)
2828
public AvatarAssert variant(VariantType value) {
2929
jdiAssert(element().variant(), equalTo(value));
3030
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/BadgeAssert.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class BadgeAssert extends PositionAssert<BadgeAssert, Badge> implements ITextAssert<BadgeAssert> {
1616

1717
@Override
18-
@JDIAction("Assert that '{name}' text {0}")
18+
@JDIAction(value = "Assert that '{name}' text {0}", isAssert = true)
1919
public BadgeAssert text(Matcher<String> condition) {
2020
jdiAssert(element().text(), condition);
2121
return this;
@@ -26,13 +26,13 @@ public BadgeAssert text(Matcher<String> condition) {
2626
*
2727
* @return this {@link BadgeAssert} instance
2828
*/
29-
@JDIAction("Assert that '{name}' has a dot")
29+
@JDIAction(value = "Assert that '{name}' has a dot", isAssert = true)
3030
public BadgeAssert dot() {
3131
jdiAssert(element().hasDot(), Matchers.is(true), "Badge has not dot");
3232
return this;
3333
}
3434

35-
@JDIAction("Assert that '{name}' is without a dot")
35+
@JDIAction(value = "Assert that '{name}' is without a dot", isAssert = true)
3636
public BadgeAssert noDot() {
3737
jdiAssert(element().hasDot(), Matchers.is(false), "Badge has dot");
3838
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/ChipAssert.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class ChipAssert extends UIAssert<ChipAssert, Chip> {
1717
*
1818
* @return this {@link ChipAssert} instance
1919
*/
20-
@JDIAction("Assert that '{name}' is deletable")
20+
@JDIAction(value = "Assert that '{name}' is deletable", isAssert = true)
2121
public ChipAssert deletable() {
2222
jdiAssert(element().isDeletable(), Matchers.is(true), "Chip is not deletable");
2323
return this;
@@ -28,7 +28,7 @@ public ChipAssert deletable() {
2828
*
2929
* @return this {@link ChipAssert} instance
3030
*/
31-
@JDIAction("Assert that '{name}' is clickable")
31+
@JDIAction(value = "Assert that '{name}' is clickable", isAssert = true)
3232
public ChipAssert clickable() {
3333
jdiAssert(element().isClickable(), Matchers.is(true), "Chip is not clickable");
3434
return this;
@@ -39,7 +39,7 @@ public ChipAssert clickable() {
3939
*
4040
* @return this {@link ChipAssert} instance
4141
*/
42-
@JDIAction("Assert that '{name}' is a link")
42+
@JDIAction(value = "Assert that '{name}' is a link", isAssert = true)
4343
public ChipAssert link() {
4444
jdiAssert(element().isLink(), Matchers.is(true), "Chip is not a link");
4545
return this;
@@ -51,7 +51,7 @@ public ChipAssert link() {
5151
* @param href expected href
5252
* @return this {@link ChipAssert} instance
5353
*/
54-
@JDIAction("Assert that '{name}' has href '{0}'")
54+
@JDIAction(value = "Assert that '{name}' has href '{0}'", isAssert = true)
5555
public ChipAssert href(String href) {
5656
jdiAssert(element().href(), Matchers.is(href));
5757
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/DividerAssert.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class DividerAssert extends UIAssert<DividerAssert, Divider> {
1717
*
1818
* @return this {@link DividerAssert} instance
1919
*/
20-
@JDIAction("Assert that '{name}' is inset")
20+
@JDIAction(value = "Assert that '{name}' is inset", isAssert = true)
2121
public DividerAssert inset() {
2222
jdiAssert(element().isInset(), Matchers.is(true), "Divider is not inset");
2323
return this;
@@ -28,7 +28,7 @@ public DividerAssert inset() {
2828
*
2929
* @return this {@link Divider} instance
3030
*/
31-
@JDIAction("Assert that '{name}' is vertical")
31+
@JDIAction(value = "Assert that '{name}' is vertical", isAssert = true)
3232
public DividerAssert vertical() {
3333
jdiAssert(element().isVertical(), Matchers.is(true), "Divider is not vertical");
3434
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/IconAssert.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class IconAssert extends UIAssert<IconAssert, Icon> {
1818
* @param height expected icon height
1919
* @return this {@link IconAssert} instance
2020
*/
21-
@JDIAction("Assert that {name} height is {0}")
21+
@JDIAction(value = "Assert that {name} height is {0}", isAssert = true)
2222
public IconAssert height(int height) {
2323
jdiAssert(element().getSize().getHeight(), Matchers.is(height));
2424
return this;
@@ -30,7 +30,7 @@ public IconAssert height(int height) {
3030
* @param width expected icon width
3131
* @return this {@link IconAssert} instance
3232
*/
33-
@JDIAction("Assert that {name} width is {0}")
33+
@JDIAction(value = "Assert that {name} width is {0}", isAssert = true)
3434
public IconAssert width(int width) {
3535
jdiAssert(element().getSize().getWidth(), Matchers.is(width));
3636
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/ListCommonAssert.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public abstract class ListCommonAssert<A extends UIAssert<?, ?>, E extends IMUIL
2020
* @param size expected size
2121
* @return the same assert for chaining
2222
*/
23-
@JDIAction("Assert that '{name}' has size {0}")
23+
@JDIAction(value = "Assert that '{name}' has size {0}", isAssert = true)
2424
public A size(int size) {
2525
jdiAssert(element().size(), Matchers.is(size));
2626
return (A) this;
@@ -30,7 +30,7 @@ public A size(int size) {
3030
* Checks that list is empty.
3131
* @return the same assert for chaining
3232
*/
33-
@JDIAction("Assert that '{name}' is empty")
33+
@JDIAction(value = "Assert that '{name}' is empty", isAssert = true)
3434
public A empty() {
3535
jdiAssert(element().isEmpty(), Matchers.is(true), "List is not empty");
3636
return (A) this;
@@ -40,7 +40,7 @@ public A empty() {
4040
* Checks that list is not empty.
4141
* @return the same assert for chaining
4242
*/
43-
@JDIAction("Assert that '{name}' is not empty")
43+
@JDIAction(value = "Assert that '{name}' is not empty", isAssert = true)
4444
public A notEmpty() {
4545
jdiAssert(element().isEmpty(), Matchers.is(false), "List is empty");
4646
return (A) this;
@@ -50,7 +50,7 @@ public A notEmpty() {
5050
* Checks that list has headers.
5151
* @return the same assert for chaining
5252
*/
53-
@JDIAction("Assert that '{name}' has headers")
53+
@JDIAction(value = "Assert that '{name}' has headers", isAssert = true)
5454
public A headers() {
5555
jdiAssert(element().hasHeaders(), Matchers.is(true), "List has no headers");
5656
return (A) this;
@@ -60,7 +60,7 @@ public A headers() {
6060
* Checks that list has headers.
6161
* @return the same assert for chaining
6262
*/
63-
@JDIAction("Assert that '{name}' has no headers")
63+
@JDIAction(value = "Assert that '{name}' has no headers", isAssert = true)
6464
public A noHeaders() {
6565
jdiAssert(!element().hasHeaders(), Matchers.is(true), "List has headers");
6666
return (A) this;
@@ -72,7 +72,7 @@ public A noHeaders() {
7272
* @param itemTexts expected items
7373
* @return the same assert for chaining
7474
*/
75-
@JDIAction("Assert that '{name}' contains all items with texts '{0}'")
75+
@JDIAction(value = "Assert that '{name}' contains all items with texts '{0}'", isAssert = true)
7676
public A itemsWithTexts(String... itemTexts) {
7777
if (itemTexts.length == 0) {
7878
throw runtimeException("Set containing expected item names should not be empty");

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/ListItemAssert.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class ListItemAssert extends UIAssert<ListItemAssert, ListItem> implements ITextAssert<ListItemAssert> {
1919

2020
@Override
21-
@JDIAction("Assert that '{name}' text {0}")
21+
@JDIAction(value = "Assert that '{name}' text {0}", isAssert = true)
2222
public ListItemAssert text(Matcher<String> condition) {
2323
jdiAssert(element().getText(), condition);
2424
return this;
@@ -30,7 +30,7 @@ public ListItemAssert text(Matcher<String> condition) {
3030
* @param text expected primary text
3131
* @return this {@link ListItemAssert} instance
3232
*/
33-
@JDIAction("Assert that '{name}' has primary text '{0}'")
33+
@JDIAction(value = "Assert that '{name}' has primary text '{0}'", isAssert = true)
3434
public ListItemAssert primaryText(String text) {
3535
jdiAssert(element().getPrimaryText().text(), Matchers.is(text));
3636
return this;
@@ -42,7 +42,7 @@ public ListItemAssert primaryText(String text) {
4242
* @param text expected secondary text
4343
* @return this {@link ListItemAssert} instance
4444
*/
45-
@JDIAction("Assert that '{name}' has secondary text '{0}'")
45+
@JDIAction(value = "Assert that '{name}' has secondary text '{0}'", isAssert = true)
4646
public ListItemAssert secondaryText(String text) {
4747
jdiAssert(element().getSecondaryText().text(), Matchers.is(text));
4848
return this;
@@ -53,7 +53,7 @@ public ListItemAssert secondaryText(String text) {
5353
*
5454
* @return this {@link ListItemAssert} instance
5555
*/
56-
@JDIAction("Assert that '{name}' is selected")
56+
@JDIAction(value = "Assert that '{name}' is selected", isAssert = true)
5757
public ListItemAssert selected() {
5858
jdiAssert(element().isSelected(), Matchers.is(true), "Item is not selected");
5959
return this;
@@ -64,7 +64,7 @@ public ListItemAssert selected() {
6464
*
6565
* @return this {@link ListItemAssert} instance
6666
*/
67-
@JDIAction("Assert that '{name}' is not selected")
67+
@JDIAction(value = "Assert that '{name}' is not selected", isAssert = true)
6868
public ListItemAssert notSelected() {
6969
jdiAssert(!element().isSelected(), Matchers.is(false), "Item is selected");
7070
return this;
@@ -75,7 +75,7 @@ public ListItemAssert notSelected() {
7575
*
7676
* @return this {@link ListItemAssert} instance
7777
*/
78-
@JDIAction("Assert that '{name}' is checked")
78+
@JDIAction(value = "Assert that '{name}' is checked", isAssert = true)
7979
public ListItemAssert checked() {
8080
jdiAssert(element().checkbox().isChecked(), Matchers.is(true), "Item is not checked");
8181
return this;
@@ -86,7 +86,7 @@ public ListItemAssert checked() {
8686
*
8787
* @return this {@link ListItemAssert} instance
8888
*/
89-
@JDIAction("Assert that '{name}' is unchecked")
89+
@JDIAction(value = "Assert that '{name}' is unchecked", isAssert = true)
9090
public ListItemAssert unchecked() {
9191
jdiAssert(!element().checkbox().isChecked(), Matchers.is(false), "Item is unchecked");
9292
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/TooltipAssert.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class TooltipAssert extends UIAssert<TooltipAssert, Tooltip> implements ITextAssert<TooltipAssert> {
1616

1717
@Override
18-
@JDIAction("Assert that '{name}' text {0}")
18+
@JDIAction(value = "Assert that '{name}' text {0}", isAssert = true)
1919
public TooltipAssert text(Matcher<String> condition) {
2020
jdiAssert(element().getValue(), condition);
2121
return this;
@@ -26,13 +26,13 @@ public TooltipAssert text(Matcher<String> condition) {
2626
*
2727
* @return this {@link TooltipAssert} instance
2828
*/
29-
@JDIAction("Assert that '{name}' is interactive")
29+
@JDIAction(value = "Assert that '{name}' is interactive", isAssert = true)
3030
public TooltipAssert interactive() {
3131
jdiAssert(element().isInteractive(), Matchers.is(true), "Tooltip is not interactive");
3232
return this;
3333
}
3434

35-
@JDIAction("Assert that '{name}' is not interactive")
35+
@JDIAction(value = "Assert that '{name}' is not interactive", isAssert = true)
3636
public TooltipAssert notInteractive() {
3737
jdiAssert(element().isInteractive(), Matchers.is(false), "Tooltip is interactive");
3838
return this;

jdi-light-material-ui/src/main/java/com/epam/jdi/light/material/asserts/displaydata/TypographyAssert.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class TypographyAssert extends UIAssert<TypographyAssert, Typography>
1717
implements ITextAssert<TypographyAssert> {
1818

1919
@Override
20-
@JDIAction("Assert that '{name}' text {0}")
20+
@JDIAction(value = "Assert that '{name}' text {0}", isAssert = true)
2121
public TypographyAssert text(Matcher<String> condition) {
2222
jdiAssert(element().getText(), condition);
2323
return this;
@@ -29,7 +29,7 @@ public TypographyAssert text(Matcher<String> condition) {
2929
* @param style given style
3030
* @return this {@link TypographyAssert} instance
3131
*/
32-
@JDIAction("Assert that '{name}' has '{0}' style")
32+
@JDIAction(value = "Assert that '{name}' has '{0}' style", isAssert = true)
3333
public TypographyAssert style(TypographyComponentStyle style) {
3434
jdiAssert(element().getStyle(), Matchers.is(style));
3535
return this;

0 commit comments

Comments
 (0)