Merge branch 'master' into angular_rework_development

jdi-testing · Nov 24, 2023 · 56d22a0 · 56d22a0
2 parents edfcbce + 2cf7dd3
commit 56d22a0
Show file tree

Hide file tree

Showing 87 changed files with 99 additions and 92 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -50,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 13, 14, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18]
+        java: [11, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/Documents/1.txt b/Documents/1.txt
@@ -0,0 +1 @@
+dummy file, please ignore me
diff --git a/Documents/Инструктаж для новичков.docx b/Documents/Инструктаж для новичков.docx
diff --git a/...etify/interfaces/asserts/ColorAssert.java → ...di/light/asserts/generic/ColorAssert.java b/...etify/interfaces/asserts/ColorAssert.java → ...di/light/asserts/generic/ColorAssert.java
@@ -1,7 +1,7 @@
-package com.epam.jdi.light.vuetify.interfaces.asserts;
+package com.epam.jdi.light.asserts.generic;
 
 import com.epam.jdi.light.common.JDIAction;
-import com.epam.jdi.light.vuetify.interfaces.HasColor;
+import com.epam.jdi.light.elements.interfaces.base.HasColor;
 import com.epam.jdi.light.asserts.generic.IBaseAssert;
 import org.hamcrest.Matchers;
 

diff --git a/...di/light/vuetify/interfaces/HasColor.java → ...ht/elements/interfaces/base/HasColor.java b/...di/light/vuetify/interfaces/HasColor.java → ...ht/elements/interfaces/base/HasColor.java
@@ -1,11 +1,7 @@
-package com.epam.jdi.light.vuetify.interfaces;
+package com.epam.jdi.light.elements.interfaces.base;
 
 import com.epam.jdi.light.common.JDIAction;
-import com.epam.jdi.light.elements.interfaces.base.ICoreElement;
 
-/**
- * Interface <code>HasColor</code> includes methods to check element color and background color.
- */
 public interface HasColor extends ICoreElement {
 
     /**
@@ -14,7 +10,7 @@ public interface HasColor extends ICoreElement {
      * @return color value
      */
 
-    @JDIAction("Get '{name}' color")
+    @JDIAction("Get '{name}'s color")
     default String color() {
         return core().css("color");
     }
@@ -25,7 +21,7 @@ default String color() {
      * @return background color value
      */
 
-    @JDIAction("Get '{name}' background color")
+    @JDIAction("Get '{name}'s background color")
     default String backgroundColor() {
         return core().css("background-color");
     }

diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/ColorPicker.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/ColorPicker.java
@@ -2,6 +2,7 @@
 
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.elements.base.UIBaseElement;
+import com.epam.jdi.light.elements.interfaces.base.HasColor;
 import com.epam.jdi.light.elements.interfaces.base.HasLabel;
 import com.epam.jdi.light.elements.interfaces.base.SetValue;
 import com.epam.jdi.light.ui.html.asserts.ColorAssert;
@@ -10,8 +11,9 @@
  * Created by Roman Iovlev on 26.09.2019
  * Email: [email protected]; Skype: roman.iovlev
  */
-public class ColorPicker extends UIBaseElement<ColorAssert> implements HasLabel, SetValue {
+public class ColorPicker extends UIBaseElement<ColorAssert> implements HasLabel, SetValue, HasColor {
     // region Actions
+    @Override
     @JDIAction("Get '{name}' color")
     public String color() { return core().attr("value"); }
     @JDIAction("Set color '{0}' for '{name}'")

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AlertAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AlertAssert.java
@@ -6,7 +6,7 @@
 import com.epam.jdi.light.vuetify.elements.common.Alert;
 import com.epam.jdi.light.vuetify.enums.AlertType;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.TileAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AvatarAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AvatarAssert.java
@@ -5,7 +5,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Avatar;
 import com.epam.jdi.light.vuetify.interfaces.asserts.AlignmentAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.RoundedAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.TileAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/BadgeAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/BadgeAssert.java
@@ -5,7 +5,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Badge;
 import com.epam.jdi.light.vuetify.interfaces.asserts.AlignmentAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.TileAssert;
 import org.hamcrest.Matcher;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/BannerAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/BannerAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.Banner;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.RoundedAssert;

diff --git a/...ight-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/BottomNavigationAssert.java b/...ight-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/BottomNavigationAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.BottomNavigation;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ButtonGroupAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ButtonGroupAssert.java
@@ -5,7 +5,7 @@
 import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.ButtonGroup;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.RoundedAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/CardAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/CardAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.Card;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/CarouselAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/CarouselAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.Carousel;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ChipAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ChipAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Chip;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ChipGroupAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ChipGroupAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.ChipGroup;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;
 

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ComboboxAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ComboboxAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.Combobox;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ClearableAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FilledAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;

diff --git a/...light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/DatePickerMonthAssert.java b/...light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/DatePickerMonthAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.DatePickerMonth;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FileInputAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FileInputAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.FileInput;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ClearableAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FilledAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FooterAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FooterAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.composite.Footer;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/IconAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/IconAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Icon;
 import com.epam.jdi.light.vuetify.interfaces.asserts.AlignmentAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.CursorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/InputAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/InputAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Input;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.HideDetailsAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ListItemGroupsAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ListItemGroupsAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.ListItemGroups;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/OverlayAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/OverlayAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Overlay;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;
 

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationPageAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationPageAssert.java
@@ -2,7 +2,7 @@
 
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.vuetify.elements.complex.PaginationPage;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 
 public class PaginationPageAssert extends UIAssert<PaginationPageAssert, PaginationPage> implements ColorAssert<PaginationPageAssert, PaginationPage> {
 

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ProgressLinearAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ProgressLinearAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.ProgressLinear;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ReverseAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/RangeSliderAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/RangeSliderAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.RangeSlider;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.HideDetailsAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/RatingAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/RatingAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.Rating;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ReadOnlyAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SheetAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SheetAssert.java
@@ -4,7 +4,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Sheet;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.TileAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SliderAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SliderAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.Slider;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.HideDetailsAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SnackbarAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SnackbarAssert.java
@@ -6,7 +6,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Snackbar;
 
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.AlignmentAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SwitchAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SwitchAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.Switch;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.HideDetailsAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TextAreaAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TextAreaAssert.java
@@ -5,7 +5,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.TextArea;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ClearableAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FilledAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TextFieldAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TextFieldAssert.java
@@ -5,7 +5,7 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.TextField;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ClearableAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FilledAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TimePickerAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TimePickerAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.TimePicker;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ReadOnlyAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewNodeAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewNodeAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.TreeViewNode;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.RoundedAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ShapedAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VueCheckboxAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VueCheckboxAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.VueCheckbox;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MessagesAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ReadOnlyAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyButtonAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyButtonAssert.java
@@ -5,7 +5,7 @@
 import com.epam.jdi.light.asserts.generic.TextAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.common.VuetifyButton;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyTabsAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyTabsAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.VuetifyTabs;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/bars/BasicBarAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/bars/BasicBarAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.bars.BasicBar;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;

diff --git a/...vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/panels/ExpansionPanelAssert.java b/...vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/panels/ExpansionPanelAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.panels.ExpansionPanel;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import org.hamcrest.Matchers;
 
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;

diff --git a/...tify/src/main/java/com/epam/jdi/light/vuetify/asserts/radiobuttons/RadioButtonAssert.java b/...tify/src/main/java/com/epam/jdi/light/vuetify/asserts/radiobuttons/RadioButtonAssert.java
@@ -3,7 +3,7 @@
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.radiobuttons.RadioButton;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;