Merge branch 'master' into angular_rework_development

Author: pnatashap

config/checkstyle/checkstyle.xml

@@ -339,4 +339,10 @@
     <property name="message" value="core() should be used with these methods" />
     <property name="id" value="CoreMethodsUnused_Error" />
   </module>
+  <module name="RegexpSingleline">
+    <property name="severity" value="error" />
+    <property name="format" value="\.is\((true|false)\)\)" />
+    <property name="message" value="Matcher.is(true/false) should be used with error message" />
+    <property name="id" value="MatcherBooleanWithoutMessage_Error" />
+  </module>
 </module>

jdi-light-material-ui/pom.xml

@@ -6,7 +6,7 @@
 
     <artifactId>jdi-light-material-ui</artifactId>
     <packaging>jar</packaging>
-    <name>JDI Material UI Elements v4</name>
+    <name>JDI Light Material UI Elements v4</name>
     <version>1.5.3-SNAPSHOT</version>
     <groupId>com.epam.jdi</groupId>
     <url>https://github.com/jdi-testing</url>

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

@@ -62,7 +62,7 @@ public TextFieldAssert helperText(Matcher<String> condition) {
      */
     @JDIAction("Assert that '{name}' has helper text")
     public TextFieldAssert hasHelperText() {
-        jdiAssert(element().hasHelperText(), Matchers.is(true));
+        jdiAssert(element().hasHelperText(), Matchers.is(true), "TextField doesn't have helper text");
         return this;
     }
 

jdi-light-vuetify/pom.xml

@@ -6,7 +6,7 @@
 
     <artifactId>jdi-light-vuetify</artifactId>
     <packaging>jar</packaging>
-    <name>JDI Vuetify</name>
+    <name>JDI Light Vuetify</name>
     <version>1.5.3-SNAPSHOT</version>
     <groupId>com.epam.jdi</groupId>
     <url>https://github.com/jdi-testing</url>

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AutocompleteAssert.java

@@ -16,63 +16,69 @@ public class AutocompleteAssert extends UIAssert<AutocompleteAssert, Autocomplet
     public AutocompleteAssert expanded() {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().listItems().isDisplayed());
-        jdiAssert(element().isExpanded(), Matchers.is(true));
+        jdiAssert(element().isExpanded(), Matchers.is(true), "Autocomplete is not expanded");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is closed")
     public AutocompleteAssert closed() {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().root().isDisplayed());
-        jdiAssert(element().isExpanded(), Matchers.is(false));
+        jdiAssert(element().isExpanded(), Matchers.is(false), "Autocomplete is not closed");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is selected")
     public AutocompleteAssert selected(String value) {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().value().isDisplayed());
-        jdiAssert(element().isSelected(value), Matchers.is(true));
+        jdiAssert(element().isSelected(value), Matchers.is(true),
+                "Autocomplete value " + value + " is not selected");
         return this;
     }
 
+    // TODO fix this assertion and create a method to get the list of selected elements
     @JDIAction("Assert that '{name}' is selected")
     public AutocompleteAssert selected(List<String> values) {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().value().isDisplayed());
-        jdiAssert(element().isSelected(values), Matchers.is(true));
+        jdiAssert(element().isSelected(values), Matchers.is(true), "Autocomplete doesn't have selected value");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is not selected")
     public AutocompleteAssert notSelected(String value) {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().isDisplayed());
-        jdiAssert(element().isSelected(value), Matchers.is(false));
+        jdiAssert(element().isSelected(value), Matchers.is(false),
+                "Autocomplete doesn't have selected value " + value);
         return this;
     }
 
     @JDIAction("Assert that '{name}' is not selected")
     public AutocompleteAssert notSelected(List<String> values) {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().isDisplayed());
-        jdiAssert(element().isSelected(values), Matchers.is(false));
+        jdiAssert(element().isSelected(values), Matchers.is(false),
+                "Autocomplete doesn't have selected values ");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is disabled")
     public AutocompleteAssert disabled() {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().isDisplayed());
-        jdiAssert(element().isDisabled(), Matchers.is(true));
+        jdiAssert(element().isDisabled(), Matchers.is(true),
+                "Autocomplete is not disabled");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is expanded")
     public AutocompleteAssert active() {
         new Timer(base().getTimeout() * 1000L)
                 .wait(() -> element().isDisplayed());
-        jdiAssert(element().isDisabled(), Matchers.is(false));
+        jdiAssert(element().isDisabled(), Matchers.is(false),
+                "Autocomplete is not active");
         return this;
     }
 

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/IconAssert.java

@@ -18,18 +18,11 @@ public class IconAssert extends UIAssert<IconAssert, Icon> implements
     AlignmentAssert<IconAssert, Icon>, ThemeAssert<IconAssert, Icon>,
     MeasurementAssert<IconAssert, Icon>, ColorAssert<IconAssert, Icon> {
 
-    @JDIAction("Assert that '{name}' is displayed")
-    public IconAssert displayed() {
-        Timer.waitCondition(element()::isDisplayed);
-        jdiAssert(element().isDisplayed(), Matchers.is(true));
-        return this;
-    }
-
     @JDIAction("Assert that '{name}' is clickable")
     public IconAssert clickable() {
         Timer.waitCondition(element()::isDisplayed);
-        jdiAssert(element().core().isClickable() ? "is clickable" : "is not clickable",
-            Matchers.is("is clickable"));
+        jdiAssert(element().core().isClickable(),
+            Matchers.is(true), "Icon is not clickable");
         return this;
     }
 

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/MenuAssert.java

@@ -16,7 +16,7 @@ public class MenuAssert extends UIAssert<MenuAssert, Menu> implements ThemeAsser
     @JDIAction("Assert that '{name}' is displayed")
     public MenuAssert displayed() {
         Timer.waitCondition(element()::isDisplayed);
-        jdiAssert(element().isDisplayed(), Matchers.is(true));
+        jdiAssert(element().isDisplayed(), Matchers.is(true), "Menu is not displayed");
         return this;
     }
 

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/NavigationDrawerAssert.java

@@ -5,6 +5,7 @@
 import com.epam.jdi.light.vuetify.elements.complex.NavigationDrawer;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import com.jdiai.tools.Timer;
+import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 
 import java.util.List;
@@ -14,13 +15,6 @@
 public class NavigationDrawerAssert extends UIAssert<NavigationDrawerAssert, NavigationDrawer>
         implements ThemeAssert<NavigationDrawerAssert, NavigationDrawer> {
 
-    @JDIAction("Assert that '{name}' is displayed")
-    public NavigationDrawerAssert displayed() {
-        Timer.waitCondition(element()::isDisplayed);
-        jdiAssert(element().isDisplayed(), Matchers.is(true));
-        return this;
-    }
-
     @JDIAction("Assert that '{name}' has expected number of items")
     public NavigationDrawerAssert itemSize(int value) {
         jdiAssert(element().size(), Matchers.is(value));
@@ -30,39 +24,39 @@ public NavigationDrawerAssert itemSize(int value) {
     @JDIAction("Assert that '{name}' is collapsed")
     public NavigationDrawerAssert collapsed() {
         Timer.waitCondition(element()::isCollapsed);
-        jdiAssert(element().isCollapsed() ? "is collapsed" : "is expanded",
-                Matchers.is("is collapsed"));
+        jdiAssert(element().isCollapsed(),
+                Matchers.is(true), "NavigationDrawer is not collapsed");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is expanded")
     public NavigationDrawerAssert expanded() {
         Timer.waitCondition(element()::isExpanded);
-        jdiAssert(element().isExpanded() ? "is expanded" : "is collapsed",
-                Matchers.is("is expanded"));
+        jdiAssert(element().isExpanded(),
+                Matchers.is(true), "NavigationDrawer is not expanded");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is opened")
     public NavigationDrawerAssert opened() {
         Timer.waitCondition(element()::isOpened);
-        jdiAssert(element().isOpened() ? "is opened" : "is closed",
-                Matchers.is("is opened"));
+        jdiAssert(element().isOpened(),
+                Matchers.is(true), "NavigationDrawer is not opened");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is closed")
     public NavigationDrawerAssert closed() {
         Timer.waitCondition(element()::isClosed);
-        jdiAssert(element().isClosed() ? "is closed" : "is opened",
-                Matchers.is("is closed"));
+        jdiAssert(element().isClosed(),
+                Matchers.is(true), "NavigationDrawer is not closed");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is located on the right side")
     public NavigationDrawerAssert right() {
-        jdiAssert(element().isRight() ? "is on the right side" : "is on the left side",
-                Matchers.is("is on the right side"));
+        jdiAssert(element().isRight(),
+                Matchers.is(true), "NavigationDrawer is not on right side");
         return this;
     }
 
@@ -74,32 +68,39 @@ public NavigationDrawerAssert backgroundColor(String color) {
 
     @JDIAction("Check '{name}' text of items")
     public NavigationDrawerAssert text(List<String> values) {
-        jdiAssert(element().itemsText().equals(values), Matchers.is(true));
+        text(Matchers.containsInAnyOrder(values));
+        text(Matchers.hasSize(values.size()));
+        return this;
+    }
+
+    @JDIAction("Check '{name}' text of items using specific condition")
+    public NavigationDrawerAssert text(Matcher<? super List<String>> condition) {
+        jdiAssert(element().itemsText(), condition);
         return this;
     }
 
     @JDIAction("Assert that '{name}' is absolute")
     public NavigationDrawerAssert absolute() {
-        jdiAssert(element().isAbsolute() ? "is absolute" : "is not absolute", Matchers.is("is absolute"));
+        jdiAssert(element().isAbsolute(), Matchers.is(true), "NavigationDrawer is not absolute");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is bottom")
     public NavigationDrawerAssert bottom() {
-        jdiAssert(element().isBottom() ? "is bottom" : "is not bottom", Matchers.is("is bottom"));
+        jdiAssert(element().isBottom(), Matchers.is(true), "NavigationDrawer is not in bottom");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is clipped")
     public NavigationDrawerAssert clipped() {
-        jdiAssert(element().isClipped() ? "is clipped" : "is not clipped", Matchers.is("is clipped"));
+        jdiAssert(element().isClipped(), Matchers.is(true), "NavigationDrawer is not clipped");
         return this;
     }
 
     @JDIAction("Assert that theme of '{name}' is floating")
     public NavigationDrawerAssert floating() {
-        jdiAssert(element().isFloating() ? "is floating" : "is not floating",
-                Matchers.is("is floating"));
+        jdiAssert(element().isFloating(),
+                Matchers.is(true), "NavigationDrawer is not floating");
         return this;
     }
 
@@ -117,20 +118,20 @@ public NavigationDrawerAssert width(int width) {
 
     @JDIAction("Assert that theme of '{name}' is temporary")
     public NavigationDrawerAssert temporary() {
-        jdiAssert(element().isTemporary() ? "is temporary" : "permanent", Matchers.is("is temporary"));
+        jdiAssert(element().isTemporary(), Matchers.is(true), "NavigationDrawer is not temporary");
         return this;
     }
 
     @JDIAction("Assert that theme of '{name}' is permanent")
     public NavigationDrawerAssert permanent() {
-        jdiAssert(element().isTemporary() ? "is temporary" : "permanent", Matchers.is("permanent"));
+        jdiAssert(element().isTemporary(), Matchers.is(false), "NavigationDrawer is temporary");
         return this;
     }
 
     @JDIAction("Assert that theme of '{name}' is mini-variant")
     public NavigationDrawerAssert miniVariant() {
-        jdiAssert(element().isMiniVariant() ? "is mini-variant" : "is not mini-variant",
-                Matchers.is("is mini-variant"));
+        jdiAssert(element().isMiniVariant(),
+                Matchers.is(true), "NavigationDrawer is not mini-variant");
         return this;
     }
 
@@ -150,8 +151,8 @@ public NavigationDrawerAssert noOverlay() {
 
     @JDIAction("Assert that theme of '{name}' is expanded on hover")
     public NavigationDrawerAssert expandedOnHover() {
-        jdiAssert(element().isExpandedOnHover() ? "is expanded on hover" : "is not expanded on hover",
-                Matchers.is("is expanded on hover"));
+        jdiAssert(element().isExpandedOnHover(),
+                Matchers.is(true), "NavigationDrawer is not expanded on hover");
         return this;
     }
 

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationAssert.java

@@ -31,13 +31,13 @@ public PaginationAssert atEnd() {
 
     @JDIAction("Assert that '{name}' is circle")
     public PaginationAssert circle() {
-        jdiAssert(element().isCircle() ? "circle" : "not circle", Matchers.is("circle"));
+        jdiAssert(element().isCircle(), Matchers.is(true), "Pagination is not circle");
         return this;
     }
 
     @JDIAction("Assert that '{name}' is not circle")
     public PaginationAssert notCircle() {
-        jdiAssert(element().isCircle() ? "circle" : "not circle", Matchers.is("not circle"));
+        jdiAssert(element().isCircle(), Matchers.is(false), "Pagination is circle");
         return this;
     }
 
@@ -65,14 +65,14 @@ public PaginationAssert nextAriaLabel() {
     @JDIAction("Assert that '{name}' next icon has value '{0}'")
     public PaginationAssert nextIcon(String icon) {
         jdiAssert(element().nextIcon().hasClass(icon),
-                Matchers.is(true));
+                Matchers.is(true), "Paginator next icon is not " + icon);
         return this;
     }
 
     @JDIAction("Assert that '{name}' next icon has value '{0}'")
     public PaginationAssert previousIcon(String icon) {
         jdiAssert(element().previousIcon().hasClass(icon),
-                Matchers.is(true));
+                Matchers.is(true), "Paginator previous icon is not " + icon);
         return this;
     }
 

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/RangeSliderAssert.java

@@ -68,13 +68,15 @@ public RangeSliderAssert thumbLabelValue(String leftValue, String rightValue) {
 
     @JDIAction("Assert that thumb label {name} is displayed")
     public RangeSliderAssert thumbLabelDisplayed() {
-        jdiAssert(element().isThumbLabelDisplayed(), Matchers.is(true));
+        jdiAssert(element().isThumbLabelDisplayed(), Matchers.is(true),
+                "RangeSlider's thumb label is not displayed");
         return this;
     }
 
     @JDIAction("Assert that thumb label {name} is not displayed")
     public RangeSliderAssert thumbLabelNotDisplayed() {
-        jdiAssert(element().isThumbLabelDisplayed(), Matchers.is(false));
+        jdiAssert(element().isThumbLabelDisplayed(), Matchers.is(false),
+                "RangeSlider's thumb label is displayed");
         return this;
     }