From a18ae08cec1926ab757562d5006547806c5dfbb7 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Tue, 27 Jun 2023 16:24:59 +0300
Subject: [PATCH 01/30] add grid list implementation and refactor tests

---
 .../main/java/io/github/com/StaticSite.java   |  7 ++++
 .../com/pages/sections/GridListSection.java   | 11 +++---
 .../tests/elements/complex/GridListTests.java | 39 ++++++++++---------
 .../light/angular/asserts/GridListAssert.java | 36 +++++++++++++++++
 .../angular/elements/complex/GridList.java    | 38 ++++++++++++++++++
 5 files changed, 107 insertions(+), 24 deletions(-)
 create mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
 create mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
index 25d5b152cc..54bc3dfeb6 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
@@ -1,7 +1,14 @@
 package io.github.com;
 
+import com.epam.jdi.light.elements.composite.Form;
 import com.epam.jdi.light.elements.pageobjects.annotations.JSite;
 import com.epam.jdi.light.elements.pageobjects.annotations.Url;
+import com.epam.jdi.light.elements.pageobjects.annotations.Url;
+import com.epam.jdi.light.elements.pageobjects.annotations.locators.Css;
+import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
+import com.epam.jdi.light.ui.html.elements.common.Button;
+import com.epam.jdi.light.ui.html.elements.common.Text;
+import com.jdiai.tools.DataClass;
 import io.github.com.pages.AngularPage;
 import io.github.com.pages.AutocompletePage;
 import io.github.com.pages.BadgePage;
diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java
index 8b74c5c2c2..54179ef62a 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java
@@ -1,14 +1,13 @@
 package io.github.com.pages.sections;
 
-import com.epam.jdi.light.elements.common.Label;
-import com.epam.jdi.light.elements.complex.JList;
+import com.epam.jdi.light.angular.elements.complex.GridList;
 import com.epam.jdi.light.elements.composite.Section;
 import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
 
 public class GridListSection extends Section {
-    @UI("#basic-grid-list mat-grid-tile")
-    public JList<Label> basicGridList;
+    @UI("#basic-grid-list")
+    public GridList basicGridList;
 
-    @UI("#dynamic-grid-list mat-grid-tile")
-    public JList<Label> dynamicGridList;
+    @UI("#dynamic-grid-list")
+    public GridList dynamicGridList;
 }
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 30ab082554..39adf19dc0 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -6,6 +6,10 @@
 import org.testng.annotations.Test;
 
 import static io.github.com.StaticSite.angularPage;
+import static io.github.com.enums.Colors.LIGHT_BLUE;
+import static io.github.com.enums.Colors.LIGHT_GREEN;
+import static io.github.com.enums.Colors.LIGHT_LILAC;
+import static io.github.com.enums.Colors.LIGHT_PINK;
 import static io.github.com.pages.AngularPage.gridListSection;
 import static io.github.epam.site.steps.States.shouldBeLoggedIn;
 
@@ -19,41 +23,40 @@ public void before() {
         angularPage.shouldBeOpened();
     }
 
-    @Test
+    @Test(description = "Test checks is grid tile displayed")
     public void basicGridListBasicTest() {
         gridListSection.basicGridList.is().displayed();
     }
 
-    @Test
+    @Test(description = "Test checks grid tile's text")
     public void basicGridListTextTest() {
-        gridListSection.basicGridList.get(1).is().text("1");
+        gridListSection.basicGridList.show();
+        gridListSection.basicGridList.has().tileText(1, "1");
     }
 
-    @Test
+    @Test(description = "Test checks grid tile's background color")
     public void basicGridListColorTest() {
-        gridListSection.basicGridList.get(1)
-                 .has().css("background-color", "rgba(" + 173 + ", " + 216 + ", " + 230 + ", 1)");
+        gridListSection.basicGridList.show();
+        gridListSection.basicGridList.has().tileBackgroundColor(1, LIGHT_BLUE.value());
     }
 
-    @Test
+    @Test(description = "Test checks is grid tile displayed")
     public void dynamicGridListBasicTest() {
         gridListSection.dynamicGridList.is().displayed();
     }
 
-    @Test
+    @Test(description = "Test checks grid tile's text")
     public void dynamicGridListTextTest() {
-        gridListSection.dynamicGridList.get(1).is().text("One");
+        gridListSection.dynamicGridList.show();
+        gridListSection.dynamicGridList.has().tileText(1, "One");
     }
 
-    @Test
+    @Test(description = "Test checks grid tile's background color")
     public void dynamicGridListColorTest() {
-        gridListSection.dynamicGridList.get(1)
-             .has().css("background-color", "rgba(" + 173 + ", " + 216 + ", " + 230 + ", 1)");
-        gridListSection.dynamicGridList.get(2)
-             .has().css("background-color", "rgba(" + 144 + ", " + 238 + ", " + 144 + ", 1)");
-        gridListSection.dynamicGridList.get(3)
-             .has().css("background-color", "rgba(" + 255 + ", " + 182 + ", " + 193 + ", 1)");
-        gridListSection.dynamicGridList.get(4)
-                 .has().css("background-color", "rgba(" + 221 + ", " + 189 + ", " + 241 + ", 1)");
+        gridListSection.dynamicGridList.show();
+        gridListSection.dynamicGridList.has().tileBackgroundColor(1, LIGHT_BLUE.value());
+        gridListSection.dynamicGridList.has().tileBackgroundColor(2, LIGHT_GREEN.value());
+        gridListSection.dynamicGridList.has().tileBackgroundColor(3, LIGHT_PINK.value());
+        gridListSection.dynamicGridList.has().tileBackgroundColor(4, LIGHT_LILAC.value());
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
new file mode 100644
index 0000000000..bc8263b880
--- /dev/null
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -0,0 +1,36 @@
+package com.epam.jdi.light.angular.asserts;
+
+import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
+
+import com.epam.jdi.light.angular.elements.complex.GridList;
+import com.epam.jdi.light.asserts.generic.UIAssert;
+import com.epam.jdi.light.common.JDIAction;
+import com.jdiai.tools.Timer;
+import org.hamcrest.Matchers;
+
+public class GridListAssert extends UIAssert<GridListAssert, GridList> {
+
+    @JDIAction("Assert that '{name}' is displayed")
+    public GridListAssert displayed() {
+        Timer.waitCondition(element()::isDisplayed);
+        jdiAssert(element().isDisplayed(), Matchers.is(true), "Element is not displayed");
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has text '{1}'")
+    public GridListAssert tileText(int tileIndex, String ExpectedText) {
+        String actualText = element().tileByIndex(tileIndex).text();
+        jdiAssert(actualText, Matchers.is(ExpectedText), String.format("Actual element's tile text '%s' " +
+                "is not equal to expected '%s'", actualText, ExpectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' tile has background color '{1}'")
+    public GridListAssert tileBackgroundColor(int tileIndex, String expectedColor) {
+        String actualTileBackgroundColor = element().tileBackgroundColor(tileIndex);
+        jdiAssert(actualTileBackgroundColor, Matchers.is(expectedColor),
+            String.format("Actual element's tile background color '%s'" +
+                "is not equal to expected '%s'", actualTileBackgroundColor, expectedColor));
+        return this;
+    }
+}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
new file mode 100644
index 0000000000..ae86f687ae
--- /dev/null
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -0,0 +1,38 @@
+package com.epam.jdi.light.angular.elements.complex;
+
+import com.epam.jdi.light.angular.asserts.GridListAssert;
+import com.epam.jdi.light.common.JDIAction;
+import com.epam.jdi.light.elements.base.UIBaseElement;
+import com.epam.jdi.light.elements.common.UIElement;
+
+/**
+ * To see an example of Grid web element please visit
+ * <a href="https://material.angular.io/components/grid-list/overview">Angular Grid list Web Page</a>
+ */
+public class GridList extends UIBaseElement<GridListAssert> {
+
+    @JDIAction("Get '{name}' cell by index")
+    public UIElement tileByIndex(int index) {
+        return finds(".mat-grid-tile").get(index);
+    }
+
+    @JDIAction("Get '{name}' ")
+    public String amountOfColumnsInTile(int index) {
+        return tileByIndex(index).getAttribute("colspan");
+    }
+
+    @JDIAction("Get '{name}' ")
+    public String amountOfRowsInTile(int index) {
+        return tileByIndex(index).getAttribute("rowspan");
+    }
+
+    @JDIAction("Get '{name}' tile background color")
+    public String tileBackgroundColor(int tileIndex) {
+        return tileByIndex(tileIndex).getCssValue("background-color");
+    }
+
+    @Override
+    public GridListAssert is() {
+        return new GridListAssert().set(this);
+    }
+}

From 95a155492f70e14d520c720f4abf4d7a27c33e3c Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Wed, 28 Jun 2023 14:53:49 +0300
Subject: [PATCH 02/30] add grid list implementation and add tests

---
 .../tests/elements/complex/GridListTests.java | 69 ++++++++++++++-----
 .../light/angular/asserts/GridListAssert.java | 57 ++++++++++++---
 .../angular/elements/complex/GridList.java    | 30 +++++---
 3 files changed, 119 insertions(+), 37 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 39adf19dc0..6b7eb2dd48 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -23,40 +23,75 @@ public void before() {
         angularPage.shouldBeOpened();
     }
 
-    @Test(description = "Test checks is grid tile displayed")
-    public void basicGridListBasicTest() {
-        gridListSection.basicGridList.is().displayed();
+    @Test(description = "Test checks basic grid's number of columns")
+    public void basicGridListNumberOfColumnsTest() {
+        gridListSection.basicGridList.show();
+        gridListSection.basicGridList.has().numberOfColumns("2");
+    }
+
+    @Test(description = "Test checks basic grid row's height")
+    public void basicGridListRowHeightTest() {
+        gridListSection.basicGridList.show();
+        gridListSection.basicGridList.has().rowHeight("2:1");
     }
 
-    @Test(description = "Test checks grid tile's text")
+    @Test(description = "Test checks basic grid cell's text")
     public void basicGridListTextTest() {
         gridListSection.basicGridList.show();
-        gridListSection.basicGridList.has().tileText(1, "1");
+        gridListSection.basicGridList.has().cellText(1, "1");
     }
 
-    @Test(description = "Test checks grid tile's background color")
+    @Test(description = "Test checks basic grid cell's background color")
     public void basicGridListColorTest() {
         gridListSection.basicGridList.show();
-        gridListSection.basicGridList.has().tileBackgroundColor(1, LIGHT_BLUE.value());
+        gridListSection.basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
+    }
+
+    @Test(description = "Test checks dynamic grid's number of columns")
+    public void dynamicGridListNumberOfColumnsTest() {
+        gridListSection.dynamicGridList.show();
+        gridListSection.dynamicGridList.has().numberOfColumns("4");
     }
 
-    @Test(description = "Test checks is grid tile displayed")
-    public void dynamicGridListBasicTest() {
-        gridListSection.dynamicGridList.is().displayed();
+    @Test(description = "Test checks dynamic grid row's height")
+    public void dynamicGridListRowHeight() {
+        gridListSection.dynamicGridList.show();
+        gridListSection.dynamicGridList.has().rowHeight("100px");
     }
 
-    @Test(description = "Test checks grid tile's text")
+    @Test(description = "Test checks dynamic grid cell's text")
     public void dynamicGridListTextTest() {
         gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has().tileText(1, "One");
+        gridListSection.dynamicGridList.has().cellText(1, "One");
     }
 
-    @Test(description = "Test checks grid tile's background color")
+    @Test(description = "Test checks dynamic grid cell's background color")
     public void dynamicGridListColorTest() {
         gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has().tileBackgroundColor(1, LIGHT_BLUE.value());
-        gridListSection.dynamicGridList.has().tileBackgroundColor(2, LIGHT_GREEN.value());
-        gridListSection.dynamicGridList.has().tileBackgroundColor(3, LIGHT_PINK.value());
-        gridListSection.dynamicGridList.has().tileBackgroundColor(4, LIGHT_LILAC.value());
+        gridListSection.dynamicGridList.has()
+                                       .cellBackgroundColor(1, LIGHT_BLUE.value())
+                                       .cellBackgroundColor(2, LIGHT_GREEN.value())
+                                       .cellBackgroundColor(3, LIGHT_PINK.value())
+                                       .cellBackgroundColor(4, LIGHT_LILAC.value());
+    }
+
+    @Test(description = "Test checks dynamic grid's cell number of columns")
+    public void dynamicGridListColumnsInCellTest() {
+        gridListSection.dynamicGridList.show();
+        gridListSection.dynamicGridList.has()
+                                       .numberOfColumnsInCell(1, "3")
+                                       .numberOfColumnsInCell(2, "1")
+                                       .numberOfColumnsInCell(3, "1")
+                                       .numberOfColumnsInCell(4, "2");
+    }
+
+    @Test(description = "Test checks dynamic grid's cell number of rows")
+    public void dynamicGridListRowsInCellTest() {
+        gridListSection.dynamicGridList.show();
+        gridListSection.dynamicGridList.has()
+                                       .numberOfRowsInCell(1, "1")
+                                       .numberOfRowsInCell(2, "2")
+                                       .numberOfRowsInCell(3, "1")
+                                       .numberOfRowsInCell(4, "1");
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index bc8263b880..4a77f39141 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -17,20 +17,57 @@ public GridListAssert displayed() {
         return this;
     }
 
-    @JDIAction("Assert that '{name}' has text '{1}'")
-    public GridListAssert tileText(int tileIndex, String ExpectedText) {
-        String actualText = element().tileByIndex(tileIndex).text();
-        jdiAssert(actualText, Matchers.is(ExpectedText), String.format("Actual element's tile text '%s' " +
+    @JDIAction("Assert that '{name}' has number of columns '{0}'")
+    public GridListAssert numberOfColumns(String expectedNumberOfColumns) {
+        String actualNumberOfColumns = element().numberOfColumnsInGridList();
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
+            String.format("Actual number of columns in element '%s' " +
+                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has row's height '{0}'")
+    public GridListAssert rowHeight(String expectedRowHeight) {
+        String actualRowHeight = element().rowHeight();
+        jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight),
+            String.format("Actual element's row height '%s' " +
+                "is not equal to expected '%s'", actualRowHeight, expectedRowHeight));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell has text '{1}'")
+    public GridListAssert cellText(int cellIndex, String ExpectedText) {
+        String actualText = element().cellByIndex(cellIndex).text();
+        jdiAssert(actualText, Matchers.is(ExpectedText),
+            String.format("Actual element's cell text '%s' " +
                 "is not equal to expected '%s'", actualText, ExpectedText));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' tile has background color '{1}'")
-    public GridListAssert tileBackgroundColor(int tileIndex, String expectedColor) {
-        String actualTileBackgroundColor = element().tileBackgroundColor(tileIndex);
-        jdiAssert(actualTileBackgroundColor, Matchers.is(expectedColor),
-            String.format("Actual element's tile background color '%s'" +
-                "is not equal to expected '%s'", actualTileBackgroundColor, expectedColor));
+    @JDIAction("Assert that '{name}' cell has background color '{1}'")
+    public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
+        String actualColor = element().cellBackgroundColor(cellIndex);
+        jdiAssert(actualColor, Matchers.is(expectedColor),
+            String.format("Actual element's cell background color '%s' " +
+                "is not equal to expected '%s'", actualColor, expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
+    public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumberOfColumns) {
+        String actualNumberOfColumns = element().amountOfColumnsInCell(cellIndex);
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
+            String.format("Actual number of columns in element's cell '%s' " +
+                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
+    public GridListAssert numberOfRowsInCell(int cellIndex, String expectedNumberOfRows) {
+        String actualNumberOfRows = element().amountOfRowsInCell(cellIndex);
+        jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows),
+            String.format("Actual number of rows in element's cell '%s' " +
+                "is not equal to expected '%s'", actualNumberOfRows, expectedNumberOfRows));
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
index ae86f687ae..fca8da66f9 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -11,24 +11,34 @@
  */
 public class GridList extends UIBaseElement<GridListAssert> {
 
+    @JDIAction("Get '{name}' number of columns")
+    public String numberOfColumnsInGridList() {
+        return core().getAttribute("cols");
+    }
+
+    @JDIAction("Get '{name}' row's height")
+    public String rowHeight() {
+        return core().getAttribute("rowheight");
+    }
+
     @JDIAction("Get '{name}' cell by index")
-    public UIElement tileByIndex(int index) {
+    public UIElement cellByIndex(int index) {
         return finds(".mat-grid-tile").get(index);
     }
 
-    @JDIAction("Get '{name}' ")
-    public String amountOfColumnsInTile(int index) {
-        return tileByIndex(index).getAttribute("colspan");
+    @JDIAction("Get '{name}' cell number of columns ")
+    public String amountOfColumnsInCell(int index) {
+        return cellByIndex(index).getAttribute("colspan");
     }
 
-    @JDIAction("Get '{name}' ")
-    public String amountOfRowsInTile(int index) {
-        return tileByIndex(index).getAttribute("rowspan");
+    @JDIAction("Get '{name}' cell number of rows")
+    public String amountOfRowsInCell(int index) {
+        return cellByIndex(index).getAttribute("rowspan");
     }
 
-    @JDIAction("Get '{name}' tile background color")
-    public String tileBackgroundColor(int tileIndex) {
-        return tileByIndex(tileIndex).getCssValue("background-color");
+    @JDIAction("Get '{name}' cell background color")
+    public String cellBackgroundColor(int index) {
+        return cellByIndex(index).getCssValue("background-color");
     }
 
     @Override

From e32700eff9b961f5440bf5a01d9960a0f6b3b896 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Mon, 10 Jul 2023 11:50:06 +0300
Subject: [PATCH 03/30] refactor code

---
 .../light/angular/asserts/GridListAssert.java  | 12 ++++++------
 .../angular/elements/complex/GridList.java     | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index 4a77f39141..fb3c18c89b 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -19,7 +19,7 @@ public GridListAssert displayed() {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridListAssert numberOfColumns(String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().numberOfColumnsInGridList();
+        String actualNumberOfColumns = element().getNumberOfColumnsInGridList();
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
             String.format("Actual number of columns in element '%s' " +
                 "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
@@ -28,7 +28,7 @@ public GridListAssert numberOfColumns(String expectedNumberOfColumns) {
 
     @JDIAction("Assert that '{name}' has row's height '{0}'")
     public GridListAssert rowHeight(String expectedRowHeight) {
-        String actualRowHeight = element().rowHeight();
+        String actualRowHeight = element().getRowHeight();
         jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight),
             String.format("Actual element's row height '%s' " +
                 "is not equal to expected '%s'", actualRowHeight, expectedRowHeight));
@@ -37,7 +37,7 @@ public GridListAssert rowHeight(String expectedRowHeight) {
 
     @JDIAction("Assert that '{name}' cell has text '{1}'")
     public GridListAssert cellText(int cellIndex, String ExpectedText) {
-        String actualText = element().cellByIndex(cellIndex).text();
+        String actualText = element().getCellByIndex(cellIndex).text();
         jdiAssert(actualText, Matchers.is(ExpectedText),
             String.format("Actual element's cell text '%s' " +
                 "is not equal to expected '%s'", actualText, ExpectedText));
@@ -46,7 +46,7 @@ public GridListAssert cellText(int cellIndex, String ExpectedText) {
 
     @JDIAction("Assert that '{name}' cell has background color '{1}'")
     public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
-        String actualColor = element().cellBackgroundColor(cellIndex);
+        String actualColor = element().getCellBackgroundColor(cellIndex);
         jdiAssert(actualColor, Matchers.is(expectedColor),
             String.format("Actual element's cell background color '%s' " +
                 "is not equal to expected '%s'", actualColor, expectedColor));
@@ -55,7 +55,7 @@ public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
 
     @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
     public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().amountOfColumnsInCell(cellIndex);
+        String actualNumberOfColumns = element().getAmountOfColumnsInCell(cellIndex);
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
             String.format("Actual number of columns in element's cell '%s' " +
                 "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
@@ -64,7 +64,7 @@ public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumber
 
     @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
     public GridListAssert numberOfRowsInCell(int cellIndex, String expectedNumberOfRows) {
-        String actualNumberOfRows = element().amountOfRowsInCell(cellIndex);
+        String actualNumberOfRows = element().getAmountOfRowsInCell(cellIndex);
         jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows),
             String.format("Actual number of rows in element's cell '%s' " +
                 "is not equal to expected '%s'", actualNumberOfRows, expectedNumberOfRows));
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
index fca8da66f9..66df28b42c 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -12,33 +12,33 @@
 public class GridList extends UIBaseElement<GridListAssert> {
 
     @JDIAction("Get '{name}' number of columns")
-    public String numberOfColumnsInGridList() {
+    public String getNumberOfColumnsInGridList() {
         return core().getAttribute("cols");
     }
 
     @JDIAction("Get '{name}' row's height")
-    public String rowHeight() {
+    public String getRowHeight() {
         return core().getAttribute("rowheight");
     }
 
     @JDIAction("Get '{name}' cell by index")
-    public UIElement cellByIndex(int index) {
+    public UIElement getCellByIndex(int index) {
         return finds(".mat-grid-tile").get(index);
     }
 
     @JDIAction("Get '{name}' cell number of columns ")
-    public String amountOfColumnsInCell(int index) {
-        return cellByIndex(index).getAttribute("colspan");
+    public String getAmountOfColumnsInCell(int index) {
+        return getCellByIndex(index).getAttribute("colspan");
     }
 
     @JDIAction("Get '{name}' cell number of rows")
-    public String amountOfRowsInCell(int index) {
-        return cellByIndex(index).getAttribute("rowspan");
+    public String getAmountOfRowsInCell(int index) {
+        return getCellByIndex(index).getAttribute("rowspan");
     }
 
     @JDIAction("Get '{name}' cell background color")
-    public String cellBackgroundColor(int index) {
-        return cellByIndex(index).getCssValue("background-color");
+    public String getCellBackgroundColor(int index) {
+        return getCellByIndex(index).getCssValue("background-color");
     }
 
     @Override

From eac88c8c9eda3a3ad1ead8e74bde6bebb9165674 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Wed, 12 Jul 2023 16:27:01 +0300
Subject: [PATCH 04/30] refactor code and implement using new page

---
 .../java/io/github/com/pages/AngularPage.java |  3 +
 ...GridListSection.java => GridListPage.java} |  6 +-
 .../tests/elements/complex/GridListTests.java | 87 ++++++++++---------
 .../angular/tests/unit/GridListUnitTests.java | 31 +++++++
 .../light/angular/asserts/GridListAssert.java | 46 ++++------
 .../angular/elements/complex/GridList.java    | 30 +++----
 6 files changed, 115 insertions(+), 88 deletions(-)
 rename jdi-light-angular-tests/src/main/java/io/github/com/pages/{sections/GridListSection.java => GridListPage.java} (65%)
 create mode 100644 jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
index 8aaf06a478..c2ee667798 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
@@ -24,6 +24,9 @@ public class AngularPage extends WebPage {
     public static SelectSection selectSection;
     public static ListSection listSection;
     public static GridListSection gridListSection;
+    public static BadgeSection badgeSection;
+    public static BasicButtonsSection basicButtonsSection;
+    public static AutocompleteSection autocompleteSection;
     public static SnackbarSection snackbarSection;
     public static MenuSection menuSection;
     public static PaginatorSection paginatorSection;
diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
similarity index 65%
rename from jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java
rename to jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
index 54179ef62a..6daf181e82 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/GridListSection.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
@@ -1,10 +1,10 @@
-package io.github.com.pages.sections;
+package io.github.com.pages;
 
 import com.epam.jdi.light.angular.elements.complex.GridList;
-import com.epam.jdi.light.elements.composite.Section;
 import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
 
-public class GridListSection extends Section {
+public class GridListPage extends NewAngularPage {
+
     @UI("#basic-grid-list")
     public GridList basicGridList;
 
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 6b7eb2dd48..c3716f2ccc 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -2,96 +2,103 @@
 
 import io.github.epam.TestsInit;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
-import static io.github.com.StaticSite.angularPage;
+import static com.jdiai.tools.Timer.waitCondition;
+import static io.github.com.StaticSite.gridListPage;
 import static io.github.com.enums.Colors.LIGHT_BLUE;
 import static io.github.com.enums.Colors.LIGHT_GREEN;
 import static io.github.com.enums.Colors.LIGHT_LILAC;
 import static io.github.com.enums.Colors.LIGHT_PINK;
-import static io.github.com.pages.AngularPage.gridListSection;
-import static io.github.epam.site.steps.States.shouldBeLoggedIn;
 
-// TODO Move to the new page
-@Ignore
 public class GridListTests extends TestsInit {
 
     @BeforeMethod
     public void before() {
-        shouldBeLoggedIn();
-        angularPage.shouldBeOpened();
+        gridListPage.open();
+        waitCondition(() -> gridListPage.isOpened());
+        gridListPage.checkOpened();
     }
 
     @Test(description = "Test checks basic grid's number of columns")
     public void basicGridListNumberOfColumnsTest() {
-        gridListSection.basicGridList.show();
-        gridListSection.basicGridList.has().numberOfColumns("2");
+        gridListPage.basicGridList.shouldBe().displayed();
+        gridListPage.basicGridList.show();
+        gridListPage.basicGridList.has().numberOfColumns("2");
     }
 
     @Test(description = "Test checks basic grid row's height")
     public void basicGridListRowHeightTest() {
-        gridListSection.basicGridList.show();
-        gridListSection.basicGridList.has().rowHeight("2:1");
+        gridListPage.basicGridList.shouldBe().displayed();
+        gridListPage.basicGridList.show();
+        gridListPage.basicGridList.has().rowHeight("2:1");
     }
 
     @Test(description = "Test checks basic grid cell's text")
     public void basicGridListTextTest() {
-        gridListSection.basicGridList.show();
-        gridListSection.basicGridList.has().cellText(1, "1");
+        gridListPage.basicGridList.shouldBe().displayed();
+        gridListPage.basicGridList.show();
+        gridListPage.basicGridList.has().cellText(1, "1");
     }
 
     @Test(description = "Test checks basic grid cell's background color")
     public void basicGridListColorTest() {
-        gridListSection.basicGridList.show();
-        gridListSection.basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
+        gridListPage.basicGridList.shouldBe().displayed();
+        gridListPage.basicGridList.show();
+        gridListPage.basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
     }
 
     @Test(description = "Test checks dynamic grid's number of columns")
     public void dynamicGridListNumberOfColumnsTest() {
-        gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has().numberOfColumns("4");
+        gridListPage.dynamicGridList.shouldBe().displayed();
+        gridListPage.dynamicGridList.show();
+        gridListPage.dynamicGridList.has().numberOfColumns("4");
     }
 
     @Test(description = "Test checks dynamic grid row's height")
     public void dynamicGridListRowHeight() {
-        gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has().rowHeight("100px");
+        gridListPage.dynamicGridList.shouldBe().displayed();
+        gridListPage.dynamicGridList.show();
+        gridListPage.dynamicGridList.has().rowHeight("100px");
     }
 
     @Test(description = "Test checks dynamic grid cell's text")
     public void dynamicGridListTextTest() {
-        gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has().cellText(1, "One");
+        gridListPage.dynamicGridList.shouldBe().displayed();
+        gridListPage.dynamicGridList.show();
+        gridListPage.dynamicGridList.has().cellText(1, "One");
     }
 
     @Test(description = "Test checks dynamic grid cell's background color")
     public void dynamicGridListColorTest() {
-        gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has()
-                                       .cellBackgroundColor(1, LIGHT_BLUE.value())
-                                       .cellBackgroundColor(2, LIGHT_GREEN.value())
-                                       .cellBackgroundColor(3, LIGHT_PINK.value())
-                                       .cellBackgroundColor(4, LIGHT_LILAC.value());
+        gridListPage.dynamicGridList.shouldBe().displayed();
+        gridListPage.dynamicGridList.show();
+        gridListPage.dynamicGridList.has()
+                                    .cellBackgroundColor(1, LIGHT_BLUE.value())
+                                    .cellBackgroundColor(2, LIGHT_GREEN.value())
+                                    .cellBackgroundColor(3, LIGHT_PINK.value())
+                                    .cellBackgroundColor(4, LIGHT_LILAC.value());
     }
 
     @Test(description = "Test checks dynamic grid's cell number of columns")
     public void dynamicGridListColumnsInCellTest() {
-        gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has()
-                                       .numberOfColumnsInCell(1, "3")
-                                       .numberOfColumnsInCell(2, "1")
-                                       .numberOfColumnsInCell(3, "1")
-                                       .numberOfColumnsInCell(4, "2");
+        gridListPage.dynamicGridList.shouldBe().displayed();
+        gridListPage.dynamicGridList.show();
+        gridListPage.dynamicGridList.has()
+                                    .numberOfColumnsInCell(1, "3")
+                                    .numberOfColumnsInCell(2, "1")
+                                    .numberOfColumnsInCell(3, "1")
+                                    .numberOfColumnsInCell(4, "2");
     }
 
     @Test(description = "Test checks dynamic grid's cell number of rows")
     public void dynamicGridListRowsInCellTest() {
-        gridListSection.dynamicGridList.show();
-        gridListSection.dynamicGridList.has()
-                                       .numberOfRowsInCell(1, "1")
-                                       .numberOfRowsInCell(2, "2")
-                                       .numberOfRowsInCell(3, "1")
-                                       .numberOfRowsInCell(4, "1");
+        gridListPage.dynamicGridList.shouldBe().displayed();
+        gridListPage.dynamicGridList.show();
+        gridListPage.dynamicGridList.has()
+                                    .numberOfRowsInCell(1, "1")
+                                    .numberOfRowsInCell(2, "2")
+                                    .numberOfRowsInCell(3, "1")
+                                    .numberOfRowsInCell(4, "1");
     }
 }
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
new file mode 100644
index 0000000000..73c4ac6039
--- /dev/null
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
@@ -0,0 +1,31 @@
+package io.github.epam.angular.tests.unit;
+
+import static com.jdiai.tools.Timer.waitCondition;
+import static io.github.com.StaticSite.gridListPage;
+import static org.testng.Assert.assertTrue;
+
+import io.github.epam.TestsInit;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class GridListUnitTests extends TestsInit {
+
+    @BeforeMethod
+    public void before() {
+        gridListPage.open();
+        waitCondition(() -> gridListPage.isOpened());
+        gridListPage.checkOpened();
+    }
+
+    @Test
+    public void isDisplayedTest() {
+        assertTrue(gridListPage.basicGridList.isDisplayed());
+        assertTrue(gridListPage.dynamicGridList.isDisplayed());
+    }
+
+    @Test
+    public void isVisibleTest() {
+        assertTrue(gridListPage.basicGridList.isVisible());
+        assertTrue(gridListPage.dynamicGridList.isVisible());
+    }
+}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index fb3c18c89b..7b9aac5a1c 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -5,69 +5,55 @@
 import com.epam.jdi.light.angular.elements.complex.GridList;
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
-import com.jdiai.tools.Timer;
 import org.hamcrest.Matchers;
 
 public class GridListAssert extends UIAssert<GridListAssert, GridList> {
 
-    @JDIAction("Assert that '{name}' is displayed")
-    public GridListAssert displayed() {
-        Timer.waitCondition(element()::isDisplayed);
-        jdiAssert(element().isDisplayed(), Matchers.is(true), "Element is not displayed");
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' has number of columns '{0}'")
+    @JDIAction("Assert that '{name}''s number of columns is '{0}'")
     public GridListAssert numberOfColumns(String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().getNumberOfColumnsInGridList();
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            String.format("Actual number of columns in element '%s' " +
-                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+        String actualNumberOfColumns = element().numberOfColumns();
+        jdiAssert(actualNumberOfColumns, Matchers.equalTo(expectedNumberOfColumns),
+            actualNumberOfColumns + "is not equal to" + expectedNumberOfColumns);
         return this;
     }
 
     @JDIAction("Assert that '{name}' has row's height '{0}'")
     public GridListAssert rowHeight(String expectedRowHeight) {
-        String actualRowHeight = element().getRowHeight();
+        String actualRowHeight = element().rowHeight();
         jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight),
-            String.format("Actual element's row height '%s' " +
-                "is not equal to expected '%s'", actualRowHeight, expectedRowHeight));
+            actualRowHeight + "is not equal to" + expectedRowHeight);
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has text '{1}'")
     public GridListAssert cellText(int cellIndex, String ExpectedText) {
-        String actualText = element().getCellByIndex(cellIndex).text();
+        String actualText = element().cellByIndex(cellIndex).text();
         jdiAssert(actualText, Matchers.is(ExpectedText),
-            String.format("Actual element's cell text '%s' " +
-                "is not equal to expected '%s'", actualText, ExpectedText));
+            actualText + "is not equal to" + ExpectedText);
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has background color '{1}'")
     public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
-        String actualColor = element().getCellBackgroundColor(cellIndex);
+        String actualColor = element().cellBackgroundColorByIndex(cellIndex);
         jdiAssert(actualColor, Matchers.is(expectedColor),
-            String.format("Actual element's cell background color '%s' " +
-                "is not equal to expected '%s'", actualColor, expectedColor));
+            actualColor + "is not equal to" + expectedColor);
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
+    @JDIAction("Assert that '{name}' cell's number of columns is '{1}'")
     public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().getAmountOfColumnsInCell(cellIndex);
+        String actualNumberOfColumns = element().numberOfColumnsInCellByIndex(cellIndex);
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            String.format("Actual number of columns in element's cell '%s' " +
-                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+            actualNumberOfColumns + "is not equal to" + expectedNumberOfColumns);
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
+    @JDIAction("Assert that '{name}' cell's number of rows is '{1}'")
     public GridListAssert numberOfRowsInCell(int cellIndex, String expectedNumberOfRows) {
-        String actualNumberOfRows = element().getAmountOfRowsInCell(cellIndex);
+        String actualNumberOfRows = element().numberOfRowsInCellByIndex(cellIndex);
         jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows),
-            String.format("Actual number of rows in element's cell '%s' " +
-                "is not equal to expected '%s'", actualNumberOfRows, expectedNumberOfRows));
+            actualNumberOfRows + "is not equal to" + expectedNumberOfRows);
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
index 66df28b42c..d52f5080d8 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -11,34 +11,34 @@
  */
 public class GridList extends UIBaseElement<GridListAssert> {
 
-    @JDIAction("Get '{name}' number of columns")
-    public String getNumberOfColumnsInGridList() {
+    @JDIAction(value = "Get '{name}' number of columns")
+    public String numberOfColumns() {
         return core().getAttribute("cols");
     }
 
-    @JDIAction("Get '{name}' row's height")
-    public String getRowHeight() {
+    @JDIAction(value = "Get '{name}' row's height")
+    public String rowHeight() {
         return core().getAttribute("rowheight");
     }
 
-    @JDIAction("Get '{name}' cell by index")
-    public UIElement getCellByIndex(int index) {
+    @JDIAction(value = "Get '{name}' cell by index '{0}'")
+    public UIElement cellByIndex(int index) {
         return finds(".mat-grid-tile").get(index);
     }
 
-    @JDIAction("Get '{name}' cell number of columns ")
-    public String getAmountOfColumnsInCell(int index) {
-        return getCellByIndex(index).getAttribute("colspan");
+    @JDIAction(value = "Get '{name}' cell number of columns by index '{0}'")
+    public String numberOfColumnsInCellByIndex(int index) {
+        return cellByIndex(index).getAttribute("colspan");
     }
 
-    @JDIAction("Get '{name}' cell number of rows")
-    public String getAmountOfRowsInCell(int index) {
-        return getCellByIndex(index).getAttribute("rowspan");
+    @JDIAction(value = "Get '{name}' cell number of rows by index '{0}'")
+    public String numberOfRowsInCellByIndex(int index) {
+        return cellByIndex(index).getAttribute("rowspan");
     }
 
-    @JDIAction("Get '{name}' cell background color")
-    public String getCellBackgroundColor(int index) {
-        return getCellByIndex(index).getCssValue("background-color");
+    @JDIAction(value = "Get '{name}' cell background color by index '{0}'")
+    public String cellBackgroundColorByIndex(int index) {
+        return cellByIndex(index).getCssValue("background-color");
     }
 
     @Override

From 854d3a2b803fa458b9863d54bd60c787e6b88876 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Thu, 13 Jul 2023 17:22:44 +0300
Subject: [PATCH 05/30] implement grid list class and refactor tests

---
 .../main/java/io/github/com/StaticSite.java   |  5 ++-
 .../tests/elements/complex/GridListTests.java | 30 +++++----------
 .../angular/tests/unit/GridListUnitTests.java |  2 +-
 .../light/angular/asserts/GridListAssert.java | 38 +++++++++++--------
 .../angular/elements/complex/GridList.java    | 24 ++++++------
 5 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
index 54bc3dfeb6..b43b9040d6 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
@@ -1,6 +1,5 @@
 package io.github.com;
 
-import com.epam.jdi.light.elements.composite.Form;
 import com.epam.jdi.light.elements.pageobjects.annotations.JSite;
 import com.epam.jdi.light.elements.pageobjects.annotations.Url;
 import com.epam.jdi.light.elements.pageobjects.annotations.Url;
@@ -16,6 +15,8 @@
 import io.github.com.pages.ButtonsPage;
 import io.github.com.pages.ProgressBarPage;
 import io.github.com.pages.ProgressSpinnerPage;
+import io.github.com.pages.GridListPage;
+import io.github.com.pages.ProgressBarPage;
 
 @JSite("https://jdi-testing.github.io/jdi-light/angular-page/#/")
 public class StaticSite {
@@ -34,6 +35,8 @@ public class StaticSite {
 
     @Url("badges")
     public static BadgePage badgePage;
+    @Url("grid_list")
+    public static GridListPage gridListPage;
 
     @Url("buttons_toggle")
     public  static ButtonTogglePage buttonTogglePage;
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index c3716f2ccc..2ed24e153a 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -20,58 +20,50 @@ public void before() {
         gridListPage.checkOpened();
     }
 
-    @Test(description = "Test checks basic grid's number of columns")
+    @Test(description = "Test checks basic grid list's number of columns")
     public void basicGridListNumberOfColumnsTest() {
-        gridListPage.basicGridList.shouldBe().displayed();
         gridListPage.basicGridList.show();
         gridListPage.basicGridList.has().numberOfColumns("2");
     }
 
-    @Test(description = "Test checks basic grid row's height")
+    @Test(description = "Test checks basic grid list row's height")
     public void basicGridListRowHeightTest() {
-        gridListPage.basicGridList.shouldBe().displayed();
         gridListPage.basicGridList.show();
         gridListPage.basicGridList.has().rowHeight("2:1");
     }
 
-    @Test(description = "Test checks basic grid cell's text")
+    @Test(description = "Test checks basic grid list cell's text")
     public void basicGridListTextTest() {
-        gridListPage.basicGridList.shouldBe().displayed();
         gridListPage.basicGridList.show();
         gridListPage.basicGridList.has().cellText(1, "1");
     }
 
-    @Test(description = "Test checks basic grid cell's background color")
+    @Test(description = "Test checks basic grid list cell's background color")
     public void basicGridListColorTest() {
-        gridListPage.basicGridList.shouldBe().displayed();
         gridListPage.basicGridList.show();
         gridListPage.basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
     }
 
-    @Test(description = "Test checks dynamic grid's number of columns")
+    @Test(description = "Test checks dynamic grid list's number of columns")
     public void dynamicGridListNumberOfColumnsTest() {
-        gridListPage.dynamicGridList.shouldBe().displayed();
         gridListPage.dynamicGridList.show();
         gridListPage.dynamicGridList.has().numberOfColumns("4");
     }
 
-    @Test(description = "Test checks dynamic grid row's height")
+    @Test(description = "Test checks dynamic grid list row's height")
     public void dynamicGridListRowHeight() {
-        gridListPage.dynamicGridList.shouldBe().displayed();
         gridListPage.dynamicGridList.show();
         gridListPage.dynamicGridList.has().rowHeight("100px");
     }
 
-    @Test(description = "Test checks dynamic grid cell's text")
+    @Test(description = "Test checks dynamic grid list cell's text")
     public void dynamicGridListTextTest() {
-        gridListPage.dynamicGridList.shouldBe().displayed();
         gridListPage.dynamicGridList.show();
         gridListPage.dynamicGridList.has().cellText(1, "One");
     }
 
-    @Test(description = "Test checks dynamic grid cell's background color")
+    @Test(description = "Test checks dynamic grid list cell's background color")
     public void dynamicGridListColorTest() {
-        gridListPage.dynamicGridList.shouldBe().displayed();
         gridListPage.dynamicGridList.show();
         gridListPage.dynamicGridList.has()
                                     .cellBackgroundColor(1, LIGHT_BLUE.value())
@@ -80,9 +72,8 @@ public void dynamicGridListColorTest() {
                                     .cellBackgroundColor(4, LIGHT_LILAC.value());
     }
 
-    @Test(description = "Test checks dynamic grid's cell number of columns")
+    @Test(description = "Test checks dynamic grid list cell's number of columns")
     public void dynamicGridListColumnsInCellTest() {
-        gridListPage.dynamicGridList.shouldBe().displayed();
         gridListPage.dynamicGridList.show();
         gridListPage.dynamicGridList.has()
                                     .numberOfColumnsInCell(1, "3")
@@ -91,9 +82,8 @@ public void dynamicGridListColumnsInCellTest() {
                                     .numberOfColumnsInCell(4, "2");
     }
 
-    @Test(description = "Test checks dynamic grid's cell number of rows")
+    @Test(description = "Test checks dynamic grid list cell's number of rows")
     public void dynamicGridListRowsInCellTest() {
-        gridListPage.dynamicGridList.shouldBe().displayed();
         gridListPage.dynamicGridList.show();
         gridListPage.dynamicGridList.has()
                                     .numberOfRowsInCell(1, "1")
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
index 73c4ac6039..f9e8578f4e 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
@@ -24,7 +24,7 @@ public void isDisplayedTest() {
     }
 
     @Test
-    public void isVisibleTest() {
+    public void isVisible() {
         assertTrue(gridListPage.basicGridList.isVisible());
         assertTrue(gridListPage.dynamicGridList.isVisible());
     }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index 7b9aac5a1c..b5dbafa3a0 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -9,51 +9,57 @@
 
 public class GridListAssert extends UIAssert<GridListAssert, GridList> {
 
-    @JDIAction("Assert that '{name}''s number of columns is '{0}'")
+    @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridListAssert numberOfColumns(String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().numberOfColumns();
-        jdiAssert(actualNumberOfColumns, Matchers.equalTo(expectedNumberOfColumns),
-            actualNumberOfColumns + "is not equal to" + expectedNumberOfColumns);
+        String actualNumberOfColumns = element().getNumberOfColumnsInGridList();
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
+            String.format("Actual number of columns in element '%s' " +
+                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has row's height '{0}'")
     public GridListAssert rowHeight(String expectedRowHeight) {
-        String actualRowHeight = element().rowHeight();
+        String actualRowHeight = element().getRowHeight();
         jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight),
-            actualRowHeight + "is not equal to" + expectedRowHeight);
+            String.format("Actual element's row height '%s' " +
+                "is not equal to expected '%s'", actualRowHeight, expectedRowHeight));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has text '{1}'")
     public GridListAssert cellText(int cellIndex, String ExpectedText) {
-        String actualText = element().cellByIndex(cellIndex).text();
+        String actualText = element().getCellByIndex(cellIndex).text();
         jdiAssert(actualText, Matchers.is(ExpectedText),
-            actualText + "is not equal to" + ExpectedText);
+            String.format("Actual element's cell text '%s' " +
+                "is not equal to expected '%s'", actualText, ExpectedText));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has background color '{1}'")
     public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
-        String actualColor = element().cellBackgroundColorByIndex(cellIndex);
+        String actualColor = element().getCellBackgroundColorByIndex(cellIndex);
         jdiAssert(actualColor, Matchers.is(expectedColor),
-            actualColor + "is not equal to" + expectedColor);
+            String.format("Actual element's cell background color '%s' " +
+                "is not equal to expected '%s'", actualColor, expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell's number of columns is '{1}'")
+    @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
     public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().numberOfColumnsInCellByIndex(cellIndex);
+        String actualNumberOfColumns = element().getNumberOfColumnsInCellByIndex(cellIndex);
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            actualNumberOfColumns + "is not equal to" + expectedNumberOfColumns);
+            String.format("Actual number of columns in element's cell '%s' " +
+                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell's number of rows is '{1}'")
+    @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
     public GridListAssert numberOfRowsInCell(int cellIndex, String expectedNumberOfRows) {
-        String actualNumberOfRows = element().numberOfRowsInCellByIndex(cellIndex);
+        String actualNumberOfRows = element().getNumberOfRowsInCellByIndex(cellIndex);
         jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows),
-            actualNumberOfRows + "is not equal to" + expectedNumberOfRows);
+            String.format("Actual number of rows in element's cell '%s' " +
+                "is not equal to expected '%s'", actualNumberOfRows, expectedNumberOfRows));
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
index d52f5080d8..5d5665d43a 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -12,33 +12,33 @@
 public class GridList extends UIBaseElement<GridListAssert> {
 
     @JDIAction(value = "Get '{name}' number of columns")
-    public String numberOfColumns() {
+    public String getNumberOfColumnsInGridList() {
         return core().getAttribute("cols");
     }
 
     @JDIAction(value = "Get '{name}' row's height")
-    public String rowHeight() {
+    public String getRowHeight() {
         return core().getAttribute("rowheight");
     }
 
     @JDIAction(value = "Get '{name}' cell by index '{0}'")
-    public UIElement cellByIndex(int index) {
+    public UIElement getCellByIndex(int index) {
         return finds(".mat-grid-tile").get(index);
     }
 
-    @JDIAction(value = "Get '{name}' cell number of columns by index '{0}'")
-    public String numberOfColumnsInCellByIndex(int index) {
-        return cellByIndex(index).getAttribute("colspan");
+    @JDIAction(value = "Get '{name}' cell's number of columns by index '{0}'")
+    public String getNumberOfColumnsInCellByIndex(int index) {
+        return getCellByIndex(index).getAttribute("colspan");
     }
 
-    @JDIAction(value = "Get '{name}' cell number of rows by index '{0}'")
-    public String numberOfRowsInCellByIndex(int index) {
-        return cellByIndex(index).getAttribute("rowspan");
+    @JDIAction(value = "Get '{name}' cell's number of rows by index '{0}'")
+    public String getNumberOfRowsInCellByIndex(int index) {
+        return getCellByIndex(index).getAttribute("rowspan");
     }
 
-    @JDIAction(value = "Get '{name}' cell background color by index '{0}'")
-    public String cellBackgroundColorByIndex(int index) {
-        return cellByIndex(index).getCssValue("background-color");
+    @JDIAction(value = "Get '{name}' cell's background color by index '{0}'")
+    public String getCellBackgroundColorByIndex(int index) {
+        return getCellByIndex(index).getCssValue("background-color");
     }
 
     @Override

From 4478d368e091822039a816e4e930ef925cb83089 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Fri, 14 Jul 2023 16:43:20 +0300
Subject: [PATCH 06/30] refactor imports and enum

---
 .../io/github/com/pages/GridListPage.java     |  4 +-
 .../tests/elements/complex/GridListTests.java | 94 ++++++++++++-------
 .../elements/enums/GridListColors.java        |  0
 3 files changed, 60 insertions(+), 38 deletions(-)
 rename jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java => jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/GridListColors.java (100%)

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
index 6daf181e82..fb6f2f8252 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
@@ -6,8 +6,8 @@
 public class GridListPage extends NewAngularPage {
 
     @UI("#basic-grid-list")
-    public GridList basicGridList;
+    public static GridList basicGridList;
 
     @UI("#dynamic-grid-list")
-    public GridList dynamicGridList;
+    public static GridList dynamicGridList;
 }
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 2ed24e153a..0cd2dc7689 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -6,10 +6,12 @@
 
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.gridListPage;
-import static io.github.com.enums.Colors.LIGHT_BLUE;
-import static io.github.com.enums.Colors.LIGHT_GREEN;
-import static io.github.com.enums.Colors.LIGHT_LILAC;
-import static io.github.com.enums.Colors.LIGHT_PINK;
+import static io.github.com.pages.GridListPage.basicGridList;
+import static io.github.com.pages.GridListPage.dynamicGridList;
+import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_BLUE;
+import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_GREEN;
+import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_LILAC;
+import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_PINK;
 
 public class GridListTests extends TestsInit {
 
@@ -22,73 +24,93 @@ public void before() {
 
     @Test(description = "Test checks basic grid list's number of columns")
     public void basicGridListNumberOfColumnsTest() {
-        gridListPage.basicGridList.show();
-        gridListPage.basicGridList.has().numberOfColumns("2");
+        basicGridList.shouldBe().displayed();
+        basicGridList.show();
+        basicGridList.shouldBe().visible();
+        basicGridList.has().numberOfColumns("2");
     }
 
     @Test(description = "Test checks basic grid list row's height")
     public void basicGridListRowHeightTest() {
-        gridListPage.basicGridList.show();
-        gridListPage.basicGridList.has().rowHeight("2:1");
+        basicGridList.shouldBe().displayed();
+        basicGridList.show();
+        basicGridList.shouldBe().visible();
+        basicGridList.has().rowHeight("2:1");
     }
 
     @Test(description = "Test checks basic grid list cell's text")
     public void basicGridListTextTest() {
-        gridListPage.basicGridList.show();
-        gridListPage.basicGridList.has().cellText(1, "1");
+        basicGridList.shouldBe().displayed();
+        basicGridList.show();
+        basicGridList.shouldBe().visible();
+        basicGridList.has().cellText(1, "1");
     }
 
     @Test(description = "Test checks basic grid list cell's background color")
     public void basicGridListColorTest() {
-        gridListPage.basicGridList.show();
-        gridListPage.basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
+        basicGridList.shouldBe().displayed();
+        basicGridList.show();
+        basicGridList.shouldBe().visible();
+        basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
     }
 
     @Test(description = "Test checks dynamic grid list's number of columns")
     public void dynamicGridListNumberOfColumnsTest() {
-        gridListPage.dynamicGridList.show();
-        gridListPage.dynamicGridList.has().numberOfColumns("4");
+        dynamicGridList.shouldBe().displayed();
+        dynamicGridList.show();
+        dynamicGridList.shouldBe().visible();
+        dynamicGridList.has().numberOfColumns("4");
     }
 
     @Test(description = "Test checks dynamic grid list row's height")
     public void dynamicGridListRowHeight() {
-        gridListPage.dynamicGridList.show();
-        gridListPage.dynamicGridList.has().rowHeight("100px");
+        dynamicGridList.shouldBe().displayed();
+        dynamicGridList.show();
+        dynamicGridList.shouldBe().visible();
+        dynamicGridList.has().rowHeight("100px");
     }
 
     @Test(description = "Test checks dynamic grid list cell's text")
     public void dynamicGridListTextTest() {
-        gridListPage.dynamicGridList.show();
-        gridListPage.dynamicGridList.has().cellText(1, "One");
+        dynamicGridList.shouldBe().displayed();
+        dynamicGridList.show();
+        dynamicGridList.shouldBe().visible();
+        dynamicGridList.has().cellText(1, "One");
     }
 
     @Test(description = "Test checks dynamic grid list cell's background color")
     public void dynamicGridListColorTest() {
-        gridListPage.dynamicGridList.show();
-        gridListPage.dynamicGridList.has()
-                                    .cellBackgroundColor(1, LIGHT_BLUE.value())
-                                    .cellBackgroundColor(2, LIGHT_GREEN.value())
-                                    .cellBackgroundColor(3, LIGHT_PINK.value())
-                                    .cellBackgroundColor(4, LIGHT_LILAC.value());
+        dynamicGridList.shouldBe().displayed();
+        dynamicGridList.show();
+        dynamicGridList.shouldBe().visible();
+        dynamicGridList.has()
+                       .cellBackgroundColor(1, LIGHT_BLUE.value())
+                       .cellBackgroundColor(2, LIGHT_GREEN.value())
+                       .cellBackgroundColor(3, LIGHT_PINK.value())
+                       .cellBackgroundColor(4, LIGHT_LILAC.value());
     }
 
     @Test(description = "Test checks dynamic grid list cell's number of columns")
     public void dynamicGridListColumnsInCellTest() {
-        gridListPage.dynamicGridList.show();
-        gridListPage.dynamicGridList.has()
-                                    .numberOfColumnsInCell(1, "3")
-                                    .numberOfColumnsInCell(2, "1")
-                                    .numberOfColumnsInCell(3, "1")
-                                    .numberOfColumnsInCell(4, "2");
+        dynamicGridList.shouldBe().displayed();
+        dynamicGridList.show();
+        dynamicGridList.shouldBe().visible();
+        dynamicGridList.has()
+                       .numberOfColumnsInCell(1, "3")
+                       .numberOfColumnsInCell(2, "1")
+                       .numberOfColumnsInCell(3, "1")
+                       .numberOfColumnsInCell(4, "2");
     }
 
     @Test(description = "Test checks dynamic grid list cell's number of rows")
     public void dynamicGridListRowsInCellTest() {
-        gridListPage.dynamicGridList.show();
-        gridListPage.dynamicGridList.has()
-                                    .numberOfRowsInCell(1, "1")
-                                    .numberOfRowsInCell(2, "2")
-                                    .numberOfRowsInCell(3, "1")
-                                    .numberOfRowsInCell(4, "1");
+        dynamicGridList.shouldBe().displayed();
+        dynamicGridList.show();
+        dynamicGridList.shouldBe().visible();
+        dynamicGridList.has()
+                       .numberOfRowsInCell(1, "1")
+                       .numberOfRowsInCell(2, "2")
+                       .numberOfRowsInCell(3, "1")
+                       .numberOfRowsInCell(4, "1");
     }
 }
diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/GridListColors.java
similarity index 100%
rename from jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java
rename to jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/GridListColors.java

From 260fab6f03d921137689a4ef5bcbc7193d5bb693 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Fri, 14 Jul 2023 16:46:54 +0300
Subject: [PATCH 07/30] refactor unit tests

---
 .../epam/angular/tests/unit/GridListUnitTests.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
index f9e8578f4e..f38b044f67 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
@@ -2,6 +2,8 @@
 
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.gridListPage;
+import static io.github.com.pages.GridListPage.basicGridList;
+import static io.github.com.pages.GridListPage.dynamicGridList;
 import static org.testng.Assert.assertTrue;
 
 import io.github.epam.TestsInit;
@@ -19,13 +21,13 @@ public void before() {
 
     @Test
     public void isDisplayedTest() {
-        assertTrue(gridListPage.basicGridList.isDisplayed());
-        assertTrue(gridListPage.dynamicGridList.isDisplayed());
+        assertTrue(basicGridList.isDisplayed());
+        assertTrue(dynamicGridList.isDisplayed());
     }
 
     @Test
     public void isVisible() {
-        assertTrue(gridListPage.basicGridList.isVisible());
-        assertTrue(gridListPage.dynamicGridList.isVisible());
+        assertTrue(basicGridList.isVisible());
+        assertTrue(dynamicGridList.isVisible());
     }
 }

From dc4d9c96a530b1f45b42b690c14906b36e60bdfa Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Tue, 26 Sep 2023 21:16:53 +0300
Subject: [PATCH 08/30] refactor tests and Element Object

---
 .../java/io/github/com/pages/AngularPage.java |   3 -
 .../tests/elements/complex/GridListTests.java | 109 +++++-------------
 .../angular/tests/unit/GridListUnitTests.java |  33 ------
 .../light/angular/asserts/GridListAssert.java |  47 +++++---
 .../angular/elements/complex/GridList.java    |  23 ++--
 .../{GridListColors.java => Colors.java}      |   6 +-
 6 files changed, 75 insertions(+), 146 deletions(-)
 delete mode 100644 jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
 rename jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/{GridListColors.java => Colors.java} (98%)

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
index c2ee667798..546928ac6b 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
@@ -23,9 +23,6 @@ public class AngularPage extends WebPage {
     public static InputSection inputSection;
     public static SelectSection selectSection;
     public static ListSection listSection;
-    public static GridListSection gridListSection;
-    public static BadgeSection badgeSection;
-    public static BasicButtonsSection basicButtonsSection;
     public static AutocompleteSection autocompleteSection;
     public static SnackbarSection snackbarSection;
     public static MenuSection menuSection;
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 0cd2dc7689..80767d9231 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -1,116 +1,63 @@
 package io.github.epam.angular.tests.elements.complex;
 
 import io.github.epam.TestsInit;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static com.epam.jdi.light.angular.elements.enums.Colors.LIGHT_BLUE_2;
+import static com.epam.jdi.light.angular.elements.enums.Colors.LIGHT_GREEN_2;
+import static com.epam.jdi.light.angular.elements.enums.Colors.LIGHT_LILAC;
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.gridListPage;
 import static io.github.com.pages.GridListPage.basicGridList;
 import static io.github.com.pages.GridListPage.dynamicGridList;
-import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_BLUE;
-import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_GREEN;
-import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_LILAC;
-import static com.epam.jdi.light.angular.elements.enums.GridListColors.LIGHT_PINK;
 
 public class GridListTests extends TestsInit {
 
-    @BeforeMethod
+    @BeforeClass
     public void before() {
         gridListPage.open();
         waitCondition(() -> gridListPage.isOpened());
         gridListPage.checkOpened();
     }
 
-    @Test(description = "Test checks basic grid list's number of columns")
-    public void basicGridListNumberOfColumnsTest() {
+    @Test(description = "Test checks basic grid list attributes")
+    public void basicGridListTest() {
         basicGridList.shouldBe().displayed();
         basicGridList.show();
         basicGridList.shouldBe().visible();
-        basicGridList.has().numberOfColumns("2");
-    }
 
-    @Test(description = "Test checks basic grid list row's height")
-    public void basicGridListRowHeightTest() {
-        basicGridList.shouldBe().displayed();
-        basicGridList.show();
-        basicGridList.shouldBe().visible();
-        basicGridList.has().rowHeight("2:1");
-    }
+        basicGridList.has().numberOfColumnsInGridList("2")
+                     .and().rowHeight("2:1")
+                     .and().gutterSize("10px")
 
-    @Test(description = "Test checks basic grid list cell's text")
-    public void basicGridListTextTest() {
-        basicGridList.shouldBe().displayed();
-        basicGridList.show();
-        basicGridList.shouldBe().visible();
-        basicGridList.has().cellText(1, "1");
+                     .and().cellText(1, "1")
+                     .and().cellBackgroundColor(1, LIGHT_BLUE_2.value())
+                     .and().numberOfColumnsInCell(1, "1")
+                     .and().numberOfRowsInCell(1, "1");
     }
 
-    @Test(description = "Test checks basic grid list cell's background color")
-    public void basicGridListColorTest() {
-        basicGridList.shouldBe().displayed();
-        basicGridList.show();
-        basicGridList.shouldBe().visible();
-        basicGridList.has().cellBackgroundColor(1, LIGHT_BLUE.value());
-    }
-
-    @Test(description = "Test checks dynamic grid list's number of columns")
-    public void dynamicGridListNumberOfColumnsTest() {
+    @Test(description = "Test checks dynamic grid list attributes")
+    public void dynamicGridListTest() {
         dynamicGridList.shouldBe().displayed();
         dynamicGridList.show();
         dynamicGridList.shouldBe().visible();
-        dynamicGridList.has().numberOfColumns("4");
-    }
 
-    @Test(description = "Test checks dynamic grid list row's height")
-    public void dynamicGridListRowHeight() {
-        dynamicGridList.shouldBe().displayed();
-        dynamicGridList.show();
-        dynamicGridList.shouldBe().visible();
-        dynamicGridList.has().rowHeight("100px");
-    }
+        dynamicGridList.has().numberOfColumnsInGridList("4")
+                       .and().rowHeight("100px")
+                       .and().gutterSize("10px")
 
-    @Test(description = "Test checks dynamic grid list cell's text")
-    public void dynamicGridListTextTest() {
-        dynamicGridList.shouldBe().displayed();
-        dynamicGridList.show();
-        dynamicGridList.shouldBe().visible();
-        dynamicGridList.has().cellText(1, "One");
-    }
+                       .and().cellText(1, "One")
+                       .and().cellText(4, "Four")
 
-    @Test(description = "Test checks dynamic grid list cell's background color")
-    public void dynamicGridListColorTest() {
-        dynamicGridList.shouldBe().displayed();
-        dynamicGridList.show();
-        dynamicGridList.shouldBe().visible();
-        dynamicGridList.has()
-                       .cellBackgroundColor(1, LIGHT_BLUE.value())
-                       .cellBackgroundColor(2, LIGHT_GREEN.value())
-                       .cellBackgroundColor(3, LIGHT_PINK.value())
-                       .cellBackgroundColor(4, LIGHT_LILAC.value());
-    }
+                       .and().cellBackgroundColor(2, LIGHT_GREEN_2.value())
+                       .and().cellBackgroundColor(4, LIGHT_LILAC.value())
 
-    @Test(description = "Test checks dynamic grid list cell's number of columns")
-    public void dynamicGridListColumnsInCellTest() {
-        dynamicGridList.shouldBe().displayed();
-        dynamicGridList.show();
-        dynamicGridList.shouldBe().visible();
-        dynamicGridList.has()
-                       .numberOfColumnsInCell(1, "3")
-                       .numberOfColumnsInCell(2, "1")
-                       .numberOfColumnsInCell(3, "1")
-                       .numberOfColumnsInCell(4, "2");
-    }
+                       .and().numberOfColumnsInCell(1, "3")
+                       .and().numberOfColumnsInCell(2, "1")
+                       .and().numberOfColumnsInCell(4, "2")
 
-    @Test(description = "Test checks dynamic grid list cell's number of rows")
-    public void dynamicGridListRowsInCellTest() {
-        dynamicGridList.shouldBe().displayed();
-        dynamicGridList.show();
-        dynamicGridList.shouldBe().visible();
-        dynamicGridList.has()
-                       .numberOfRowsInCell(1, "1")
-                       .numberOfRowsInCell(2, "2")
-                       .numberOfRowsInCell(3, "1")
-                       .numberOfRowsInCell(4, "1");
+                       .and().numberOfRowsInCell(1, "1")
+                       .and().numberOfRowsInCell(2, "2");
     }
 }
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
deleted file mode 100644
index f38b044f67..0000000000
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/GridListUnitTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.github.epam.angular.tests.unit;
-
-import static com.jdiai.tools.Timer.waitCondition;
-import static io.github.com.StaticSite.gridListPage;
-import static io.github.com.pages.GridListPage.basicGridList;
-import static io.github.com.pages.GridListPage.dynamicGridList;
-import static org.testng.Assert.assertTrue;
-
-import io.github.epam.TestsInit;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-public class GridListUnitTests extends TestsInit {
-
-    @BeforeMethod
-    public void before() {
-        gridListPage.open();
-        waitCondition(() -> gridListPage.isOpened());
-        gridListPage.checkOpened();
-    }
-
-    @Test
-    public void isDisplayedTest() {
-        assertTrue(basicGridList.isDisplayed());
-        assertTrue(dynamicGridList.isDisplayed());
-    }
-
-    @Test
-    public void isVisible() {
-        assertTrue(basicGridList.isVisible());
-        assertTrue(dynamicGridList.isVisible());
-    }
-}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index b5dbafa3a0..e4ebb17b74 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -10,56 +10,65 @@
 public class GridListAssert extends UIAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
-    public GridListAssert numberOfColumns(String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().getNumberOfColumnsInGridList();
+    public GridListAssert numberOfColumnsInGridList(String expectedNumberOfColumns) {
+        String actualNumberOfColumns = element().numberOfColumnsInGridList();
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            String.format("Actual number of columns in element '%s' " +
-                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+            String.format("\nActual number of columns in Grid List: '%s'\n" +
+                "is not equal to expected: '%s'", actualNumberOfColumns, expectedNumberOfColumns));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has row's height '{0}'")
     public GridListAssert rowHeight(String expectedRowHeight) {
-        String actualRowHeight = element().getRowHeight();
+        String actualRowHeight = element().rowHeight();
         jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight),
-            String.format("Actual element's row height '%s' " +
-                "is not equal to expected '%s'", actualRowHeight, expectedRowHeight));
+            String.format("\nActual row height: '%s'\n" +
+                "is not equal to expected: '%s'", actualRowHeight, expectedRowHeight));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has gutter size '{0}'")
+    public GridListAssert gutterSize(String expectedGutterSize) {
+        String actualGutterSize = element().gutterSize();
+        jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize),
+            String.format("\nActual gutter size: '%s'\n" +
+                "is not equal to expected: '%s'", actualGutterSize, expectedGutterSize));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has text '{1}'")
     public GridListAssert cellText(int cellIndex, String ExpectedText) {
-        String actualText = element().getCellByIndex(cellIndex).text();
+        String actualText = element().cellByIndex(cellIndex).text();
         jdiAssert(actualText, Matchers.is(ExpectedText),
-            String.format("Actual element's cell text '%s' " +
-                "is not equal to expected '%s'", actualText, ExpectedText));
+            String.format("\nActual cell's text: '%s'\n" +
+                "is not equal to expected: '%s'", actualText, ExpectedText));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has background color '{1}'")
     public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
-        String actualColor = element().getCellBackgroundColorByIndex(cellIndex);
+        String actualColor = element().cellBackgroundColorByIndex(cellIndex);
         jdiAssert(actualColor, Matchers.is(expectedColor),
-            String.format("Actual element's cell background color '%s' " +
-                "is not equal to expected '%s'", actualColor, expectedColor));
+            String.format("\nActual cell's background color: '%s'\n" +
+                "is not equal to expected: '%s'", actualColor, expectedColor));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
     public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().getNumberOfColumnsInCellByIndex(cellIndex);
+        String actualNumberOfColumns = element().numberOfColumnsInCellByIndex(cellIndex);
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            String.format("Actual number of columns in element's cell '%s' " +
-                "is not equal to expected '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+            String.format("\nActual number of columns in cell: '%s'\n" +
+                "is not equal to expected: '%s'", actualNumberOfColumns, expectedNumberOfColumns));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
     public GridListAssert numberOfRowsInCell(int cellIndex, String expectedNumberOfRows) {
-        String actualNumberOfRows = element().getNumberOfRowsInCellByIndex(cellIndex);
+        String actualNumberOfRows = element().numberOfRowsInCellByIndex(cellIndex);
         jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows),
-            String.format("Actual number of rows in element's cell '%s' " +
-                "is not equal to expected '%s'", actualNumberOfRows, expectedNumberOfRows));
+            String.format("\nActual number of rows in cell: '%s'\n" +
+                "is not equal to expected: '%s'", actualNumberOfRows, expectedNumberOfRows));
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
index 5d5665d43a..8f958e4332 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -12,33 +12,38 @@
 public class GridList extends UIBaseElement<GridListAssert> {
 
     @JDIAction(value = "Get '{name}' number of columns")
-    public String getNumberOfColumnsInGridList() {
+    public String numberOfColumnsInGridList() {
         return core().getAttribute("cols");
     }
 
     @JDIAction(value = "Get '{name}' row's height")
-    public String getRowHeight() {
+    public String rowHeight() {
         return core().getAttribute("rowheight");
     }
 
+    @JDIAction(value = "Get '{name}' gutter size")
+    public String gutterSize() {
+        return core().getAttribute("guttersize");
+    }
+
     @JDIAction(value = "Get '{name}' cell by index '{0}'")
-    public UIElement getCellByIndex(int index) {
+    public UIElement cellByIndex(int index) {
         return finds(".mat-grid-tile").get(index);
     }
 
     @JDIAction(value = "Get '{name}' cell's number of columns by index '{0}'")
-    public String getNumberOfColumnsInCellByIndex(int index) {
-        return getCellByIndex(index).getAttribute("colspan");
+    public String numberOfColumnsInCellByIndex(int index) {
+        return cellByIndex(index).getAttribute("colspan");
     }
 
     @JDIAction(value = "Get '{name}' cell's number of rows by index '{0}'")
-    public String getNumberOfRowsInCellByIndex(int index) {
-        return getCellByIndex(index).getAttribute("rowspan");
+    public String numberOfRowsInCellByIndex(int index) {
+        return cellByIndex(index).getAttribute("rowspan");
     }
 
     @JDIAction(value = "Get '{name}' cell's background color by index '{0}'")
-    public String getCellBackgroundColorByIndex(int index) {
-        return getCellByIndex(index).getCssValue("background-color");
+    public String cellBackgroundColorByIndex(int index) {
+        return cellByIndex(index).getCssValue("background-color");
     }
 
     @Override
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/GridListColors.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/Colors.java
similarity index 98%
rename from jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/GridListColors.java
rename to jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/Colors.java
index da73b3dbc9..a8c2794a7a 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/GridListColors.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/Colors.java
@@ -1,4 +1,4 @@
-package io.github.com.enums;
+package com.epam.jdi.light.angular.elements.enums;
 
 public enum Colors {
     RED("rgba(244, 67, 54, 1)"),
@@ -17,6 +17,7 @@ public enum Colors {
     RED_ACCENT_3("rgba(255, 23, 68, 1)"),
     RED_ACCENT_4("rgba(213, 0, 0, 1)"),
     PINK("rgba(233, 30, 99, 1)"),
+    LIGHT_PINK("rgba(255, 182, 193, 1)"),
     PINK_LIGHTEN_5("rgba(252, 228, 236, 1)"),
     PINK_LIGHTEN_4("rgba(248, 187, 208, 1)"),
     PINK_LIGHTEN_3("rgba(244, 143, 177, 1)"),
@@ -90,6 +91,7 @@ public enum Colors {
     BLUE_ACCENT_5("rgba(138, 197, 255, 1)"),
     BLUE_ACCENT_6("rgb(25, 118, 210)"),
     LIGHT_BLUE("rgba(3, 169, 244, 1)"),
+    LIGHT_BLUE_2("rgba(173, 216, 230, 1)"),
     LIGHT_BLUE_LIGHTEN_5("rgba(225, 245, 254, 1)"),
     LIGHT_BLUE_LIGHTEN_4("rgba(179, 229, 252, 1)"),
     LIGHT_BLUE_LIGHTEN_3("rgba(129, 212, 250, 1)"),
@@ -148,6 +150,7 @@ public enum Colors {
     GREEN_ACCENT_4("rgba(0, 200, 83, 1)"),
     GREEN_ACCENT_5("rgb(76, 175, 80)"),
     LIGHT_GREEN("rgba(139, 195, 74, 1)"),
+    LIGHT_GREEN_2("rgba(144, 238, 144, 1)"),
     LIGHT_GREEN_LIGHTEN_5("rgba(241, 248, 233, 1)"),
     LIGHT_GREEN_LIGHTEN_4("rgba(220, 237, 200, 1)"),
     LIGHT_GREEN_LIGHTEN_3("rgba(197, 225, 165, 1)"),
@@ -274,6 +277,7 @@ public enum Colors {
     WHITE_TRANSPARENT_087("rgba(255, 255, 255, 0.87)"),
     WHITE_TRANSPARENT_038("rgba(0, 0, 0, 0.38)"),
     RED_TRANSPARENT_055("rgba(244, 67, 54, 0.55)"),
+    LIGHT_LILAC("rgba(221, 189, 241, 1)"),
     TRANSPARENT("rgba(0, 0, 0, 0)");
 
     private final String rgba;

From e407e9b5c87907a82501d76ab9cddcab2b8cd569 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Tue, 26 Sep 2023 21:23:21 +0300
Subject: [PATCH 09/30] hot fix Colors

---
 .../src/main/java/io/github/com}/enums/Colors.java          | 2 +-
 .../epam/angular/tests/elements/complex/GridListTests.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename {jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements => jdi-light-angular-tests/src/main/java/io/github/com}/enums/Colors.java (99%)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/Colors.java b/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java
similarity index 99%
rename from jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/Colors.java
rename to jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java
index a8c2794a7a..5efb9eb966 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/Colors.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/enums/Colors.java
@@ -1,4 +1,4 @@
-package com.epam.jdi.light.angular.elements.enums;
+package io.github.com.enums;
 
 public enum Colors {
     RED("rgba(244, 67, 54, 1)"),
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 80767d9231..10c243e523 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -4,9 +4,9 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import static com.epam.jdi.light.angular.elements.enums.Colors.LIGHT_BLUE_2;
-import static com.epam.jdi.light.angular.elements.enums.Colors.LIGHT_GREEN_2;
-import static com.epam.jdi.light.angular.elements.enums.Colors.LIGHT_LILAC;
+import static io.github.com.enums.Colors.LIGHT_BLUE_2;
+import static io.github.com.enums.Colors.LIGHT_GREEN_2;
+import static io.github.com.enums.Colors.LIGHT_LILAC;
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.gridListPage;
 import static io.github.com.pages.GridListPage.basicGridList;

From dd6abf59165e43ffc2fe765f1c6069ff6899f65a Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Tue, 26 Sep 2023 21:39:56 +0300
Subject: [PATCH 10/30] grid list tests refactoring

---
 .../epam/angular/tests/elements/complex/GridListTests.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 10c243e523..5fa6ae2535 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -9,6 +9,7 @@
 import static io.github.com.enums.Colors.LIGHT_LILAC;
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.gridListPage;
+
 import static io.github.com.pages.GridListPage.basicGridList;
 import static io.github.com.pages.GridListPage.dynamicGridList;
 

From f2f26c547946b1251b4558e895e0a59b6713f106 Mon Sep 17 00:00:00 2001
From: b14ckster <b1ackcter@gmail.com>
Date: Fri, 13 Oct 2023 18:00:28 +0300
Subject: [PATCH 11/30] refactor asserts

---
 .../java/io/github/com/pages/AngularPage.java |  1 -
 .../tests/elements/complex/GridListTests.java | 18 ++++-----
 .../light/angular/asserts/GridListAssert.java | 39 +++++++------------
 .../angular/elements/complex/GridList.java    | 12 +++---
 4 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
index 546928ac6b..06a23fdce0 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
@@ -23,7 +23,6 @@ public class AngularPage extends WebPage {
     public static InputSection inputSection;
     public static SelectSection selectSection;
     public static ListSection listSection;
-    public static AutocompleteSection autocompleteSection;
     public static SnackbarSection snackbarSection;
     public static MenuSection menuSection;
     public static PaginatorSection paginatorSection;
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 5fa6ae2535..be39905781 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -28,14 +28,14 @@ public void basicGridListTest() {
         basicGridList.show();
         basicGridList.shouldBe().visible();
 
-        basicGridList.has().numberOfColumnsInGridList("2")
+        basicGridList.has().numberOfColumns(2)
                      .and().rowHeight("2:1")
                      .and().gutterSize("10px")
 
                      .and().cellText(1, "1")
                      .and().cellBackgroundColor(1, LIGHT_BLUE_2.value())
-                     .and().numberOfColumnsInCell(1, "1")
-                     .and().numberOfRowsInCell(1, "1");
+                     .and().numberOfColumnsInCell(1, 1)
+                     .and().numberOfRowsInCell(1, 1);
     }
 
     @Test(description = "Test checks dynamic grid list attributes")
@@ -44,7 +44,7 @@ public void dynamicGridListTest() {
         dynamicGridList.show();
         dynamicGridList.shouldBe().visible();
 
-        dynamicGridList.has().numberOfColumnsInGridList("4")
+        dynamicGridList.has().numberOfColumns(4)
                        .and().rowHeight("100px")
                        .and().gutterSize("10px")
 
@@ -54,11 +54,11 @@ public void dynamicGridListTest() {
                        .and().cellBackgroundColor(2, LIGHT_GREEN_2.value())
                        .and().cellBackgroundColor(4, LIGHT_LILAC.value())
 
-                       .and().numberOfColumnsInCell(1, "3")
-                       .and().numberOfColumnsInCell(2, "1")
-                       .and().numberOfColumnsInCell(4, "2")
+                       .and().numberOfColumnsInCell(1, 3)
+                       .and().numberOfColumnsInCell(2, 1)
+                       .and().numberOfColumnsInCell(4, 2)
 
-                       .and().numberOfRowsInCell(1, "1")
-                       .and().numberOfRowsInCell(2, "2");
+                       .and().numberOfRowsInCell(1, 1)
+                       .and().numberOfRowsInCell(2, 2);
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index e4ebb17b74..461c54cdf4 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -4,14 +4,15 @@
 
 import com.epam.jdi.light.angular.elements.complex.GridList;
 import com.epam.jdi.light.asserts.generic.UIAssert;
+import com.epam.jdi.light.angular.elements.enums.AngularColors;
 import com.epam.jdi.light.common.JDIAction;
 import org.hamcrest.Matchers;
 
 public class GridListAssert extends UIAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
-    public GridListAssert numberOfColumnsInGridList(String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().numberOfColumnsInGridList();
+    public GridListAssert numberOfColumns(int expectedNumberOfColumns) {
+        int actualNumberOfColumns = element().numberOfColumns();
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
             String.format("\nActual number of columns in Grid List: '%s'\n" +
                 "is not equal to expected: '%s'", actualNumberOfColumns, expectedNumberOfColumns));
@@ -21,54 +22,42 @@ public GridListAssert numberOfColumnsInGridList(String expectedNumberOfColumns)
     @JDIAction("Assert that '{name}' has row's height '{0}'")
     public GridListAssert rowHeight(String expectedRowHeight) {
         String actualRowHeight = element().rowHeight();
-        jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight),
-            String.format("\nActual row height: '%s'\n" +
-                "is not equal to expected: '%s'", actualRowHeight, expectedRowHeight));
+        jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has gutter size '{0}'")
     public GridListAssert gutterSize(String expectedGutterSize) {
         String actualGutterSize = element().gutterSize();
-        jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize),
-            String.format("\nActual gutter size: '%s'\n" +
-                "is not equal to expected: '%s'", actualGutterSize, expectedGutterSize));
+        jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has text '{1}'")
-    public GridListAssert cellText(int cellIndex, String ExpectedText) {
+    public GridListAssert cellText(int cellIndex, String expectedText) {
         String actualText = element().cellByIndex(cellIndex).text();
-        jdiAssert(actualText, Matchers.is(ExpectedText),
-            String.format("\nActual cell's text: '%s'\n" +
-                "is not equal to expected: '%s'", actualText, ExpectedText));
+        jdiAssert(actualText, Matchers.is(expectedText));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has background color '{1}'")
     public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
         String actualColor = element().cellBackgroundColorByIndex(cellIndex);
-        jdiAssert(actualColor, Matchers.is(expectedColor),
-            String.format("\nActual cell's background color: '%s'\n" +
-                "is not equal to expected: '%s'", actualColor, expectedColor));
+        jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
-    public GridListAssert numberOfColumnsInCell(int cellIndex, String expectedNumberOfColumns) {
-        String actualNumberOfColumns = element().numberOfColumnsInCellByIndex(cellIndex);
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            String.format("\nActual number of columns in cell: '%s'\n" +
-                "is not equal to expected: '%s'", actualNumberOfColumns, expectedNumberOfColumns));
+    public GridListAssert numberOfColumnsInCell(int cellIndex, int expectedNumberOfColumns) {
+        int actualNumberOfColumns = element().numberOfColumnsInCellByIndex(cellIndex);
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns));
         return this;
     }
 
     @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
-    public GridListAssert numberOfRowsInCell(int cellIndex, String expectedNumberOfRows) {
-        String actualNumberOfRows = element().numberOfRowsInCellByIndex(cellIndex);
-        jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows),
-            String.format("\nActual number of rows in cell: '%s'\n" +
-                "is not equal to expected: '%s'", actualNumberOfRows, expectedNumberOfRows));
+    public GridListAssert numberOfRowsInCell(int cellIndex, int expectedNumberOfRows) {
+        int actualNumberOfRows = element().numberOfRowsInCellByIndex(cellIndex);
+        jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows));
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
index 8f958e4332..7472cddde6 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
@@ -12,8 +12,8 @@
 public class GridList extends UIBaseElement<GridListAssert> {
 
     @JDIAction(value = "Get '{name}' number of columns")
-    public String numberOfColumnsInGridList() {
-        return core().getAttribute("cols");
+    public int numberOfColumns() {
+        return Integer.parseInt(core().getAttribute("cols"));
     }
 
     @JDIAction(value = "Get '{name}' row's height")
@@ -32,13 +32,13 @@ public UIElement cellByIndex(int index) {
     }
 
     @JDIAction(value = "Get '{name}' cell's number of columns by index '{0}'")
-    public String numberOfColumnsInCellByIndex(int index) {
-        return cellByIndex(index).getAttribute("colspan");
+    public int numberOfColumnsInCellByIndex(int index) {
+        return Integer.parseInt(cellByIndex(index).getAttribute("colspan"));
     }
 
     @JDIAction(value = "Get '{name}' cell's number of rows by index '{0}'")
-    public String numberOfRowsInCellByIndex(int index) {
-        return cellByIndex(index).getAttribute("rowspan");
+    public int numberOfRowsInCellByIndex(int index) {
+        return Integer.parseInt(cellByIndex(index).getAttribute("rowspan"));
     }
 
     @JDIAction(value = "Get '{name}' cell's background color by index '{0}'")

From b2d62cd090db05ae44e44cc3951645da35427159 Mon Sep 17 00:00:00 2001
From: Maya Afanaseva <afanasevaml@yandex.ru>
Date: Wed, 18 Oct 2023 17:08:55 +0300
Subject: [PATCH 12/30] 4952-64-refactoringGridListAfterRebase

---
 .../java/com/epam/jdi/light/angular/asserts/GridListAssert.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
index 461c54cdf4..bcc8030934 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
@@ -4,7 +4,6 @@
 
 import com.epam.jdi.light.angular.elements.complex.GridList;
 import com.epam.jdi.light.asserts.generic.UIAssert;
-import com.epam.jdi.light.angular.elements.enums.AngularColors;
 import com.epam.jdi.light.common.JDIAction;
 import org.hamcrest.Matchers;
 

From b2f8717ee3968848bad815eb7541a613a55d1ba7 Mon Sep 17 00:00:00 2001
From: Maya Afanaseva <afanasevaml@yandex.ru>
Date: Wed, 18 Oct 2023 17:15:30 +0300
Subject: [PATCH 13/30] 4952-64-refactoringGridListAfterRebase

---
 .../src/main/java/io/github/com/StaticSite.java            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
index b43b9040d6..b098ffe299 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java
@@ -2,12 +2,6 @@
 
 import com.epam.jdi.light.elements.pageobjects.annotations.JSite;
 import com.epam.jdi.light.elements.pageobjects.annotations.Url;
-import com.epam.jdi.light.elements.pageobjects.annotations.Url;
-import com.epam.jdi.light.elements.pageobjects.annotations.locators.Css;
-import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
-import com.epam.jdi.light.ui.html.elements.common.Button;
-import com.epam.jdi.light.ui.html.elements.common.Text;
-import com.jdiai.tools.DataClass;
 import io.github.com.pages.AngularPage;
 import io.github.com.pages.AutocompletePage;
 import io.github.com.pages.BadgePage;
@@ -16,7 +10,6 @@
 import io.github.com.pages.ProgressBarPage;
 import io.github.com.pages.ProgressSpinnerPage;
 import io.github.com.pages.GridListPage;
-import io.github.com.pages.ProgressBarPage;
 
 @JSite("https://jdi-testing.github.io/jdi-light/angular-page/#/")
 public class StaticSite {

From d1f692650d53f35f7a4d322570864de0490e3a5e Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Mon, 11 Dec 2023 18:36:34 +0700
Subject: [PATCH 14/30] gridTile implemented with header, footer and avatar and
 moved to common folder with gridList Tests updated basic grid list removed
 from tests

---
 .../io/github/com/pages/GridListPage.java     |   5 +-
 .../tests/elements/complex/GridListTests.java |  58 ++++-----
 .../light/angular/asserts/GridListAssert.java |  62 ---------
 .../asserts/gridlist/GridListAssert.java      | 122 ++++++++++++++++++
 .../asserts/gridlist/GridTileAssert.java      |  93 +++++++++++++
 .../angular/elements/complex/GridList.java    |  53 --------
 .../elements/complex/gridlist/GridList.java   |  45 +++++++
 .../elements/complex/gridlist/GridTile.java   |  88 +++++++++++++
 8 files changed, 377 insertions(+), 149 deletions(-)
 delete mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
 create mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
 create mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
 delete mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
 create mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
 create mode 100644 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
index fb6f2f8252..42c60ea199 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
@@ -1,13 +1,10 @@
 package io.github.com.pages;
 
-import com.epam.jdi.light.angular.elements.complex.GridList;
+import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
 import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
 
 public class GridListPage extends NewAngularPage {
 
-    @UI("#basic-grid-list")
-    public static GridList basicGridList;
-
     @UI("#dynamic-grid-list")
     public static GridList dynamicGridList;
 }
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index be39905781..f6a1b8155e 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -1,16 +1,17 @@
 package io.github.epam.angular.tests.elements.complex;
 
+import com.epam.jdi.light.angular.elements.enums.AngularColors;
 import io.github.epam.TestsInit;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import static io.github.com.enums.Colors.LIGHT_BLUE_2;
 import static io.github.com.enums.Colors.LIGHT_GREEN_2;
 import static io.github.com.enums.Colors.LIGHT_LILAC;
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.gridListPage;
 
-import static io.github.com.pages.GridListPage.basicGridList;
+import static io.github.com.enums.Colors.LIGHT_PINK;
+import static io.github.com.enums.Colors.WHITE_TRANSPARENT_038;
 import static io.github.com.pages.GridListPage.dynamicGridList;
 
 public class GridListTests extends TestsInit {
@@ -22,43 +23,40 @@ public void before() {
         gridListPage.checkOpened();
     }
 
-    @Test(description = "Test checks basic grid list attributes")
-    public void basicGridListTest() {
-        basicGridList.shouldBe().displayed();
-        basicGridList.show();
-        basicGridList.shouldBe().visible();
-
-        basicGridList.has().numberOfColumns(2)
-                     .and().rowHeight("2:1")
-                     .and().gutterSize("10px")
-
-                     .and().cellText(1, "1")
-                     .and().cellBackgroundColor(1, LIGHT_BLUE_2.value())
-                     .and().numberOfColumnsInCell(1, 1)
-                     .and().numberOfRowsInCell(1, 1);
-    }
-
     @Test(description = "Test checks dynamic grid list attributes")
     public void dynamicGridListTest() {
         dynamicGridList.shouldBe().displayed();
         dynamicGridList.show();
         dynamicGridList.shouldBe().visible();
 
-        dynamicGridList.has().numberOfColumns(4)
-                       .and().rowHeight("100px")
-                       .and().gutterSize("10px")
+        dynamicGridList.has().cols(4)
+                .and().rowHeight("100px")
+                .and().gutterSize("10px")
+
+                .and().cellText(1, "One")
+                .and().cellText(4, "Four")
+
+                .and().cellColor(2, AngularColors.fromColor(LIGHT_GREEN_2.value()))
+                .and().cellColor(4, AngularColors.fromColor(LIGHT_LILAC.value()))
 
-                       .and().cellText(1, "One")
-                       .and().cellText(4, "Four")
+                .and().cellColspan(1, 3)
+                .and().cellColspan(2, 1)
+                .and().cellColspan(4, 2)
 
-                       .and().cellBackgroundColor(2, LIGHT_GREEN_2.value())
-                       .and().cellBackgroundColor(4, LIGHT_LILAC.value())
+                .and().cellRowspan(1, 1)
+                .and().cellRowspan(2, 2)
 
-                       .and().numberOfColumnsInCell(1, 3)
-                       .and().numberOfColumnsInCell(2, 1)
-                       .and().numberOfColumnsInCell(4, 2)
+                .and().cellHasAvatar(2)
+                .and().cellAvatarUrl(2,"https://material.angular.io/assets/img/examples/shiba2.jpg");;
 
-                       .and().numberOfRowsInCell(1, 1)
-                       .and().numberOfRowsInCell(2, 2);
+        dynamicGridList.cellByIndex(3)
+                .is().colspan(1)
+                .and().rowspan(1)
+                .and().color(AngularColors.fromColor(LIGHT_PINK.value()))
+                .and().footerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+                .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+                .and().cellText("Three")
+                .and().footerText("Mat Grid Footer")
+                .and().headerText("Mat Grid Header");
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
deleted file mode 100644
index bcc8030934..0000000000
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/GridListAssert.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.epam.jdi.light.angular.asserts;
-
-import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
-
-import com.epam.jdi.light.angular.elements.complex.GridList;
-import com.epam.jdi.light.asserts.generic.UIAssert;
-import com.epam.jdi.light.common.JDIAction;
-import org.hamcrest.Matchers;
-
-public class GridListAssert extends UIAssert<GridListAssert, GridList> {
-
-    @JDIAction("Assert that '{name}' has number of columns '{0}'")
-    public GridListAssert numberOfColumns(int expectedNumberOfColumns) {
-        int actualNumberOfColumns = element().numberOfColumns();
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns),
-            String.format("\nActual number of columns in Grid List: '%s'\n" +
-                "is not equal to expected: '%s'", actualNumberOfColumns, expectedNumberOfColumns));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' has row's height '{0}'")
-    public GridListAssert rowHeight(String expectedRowHeight) {
-        String actualRowHeight = element().rowHeight();
-        jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' has gutter size '{0}'")
-    public GridListAssert gutterSize(String expectedGutterSize) {
-        String actualGutterSize = element().gutterSize();
-        jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' cell has text '{1}'")
-    public GridListAssert cellText(int cellIndex, String expectedText) {
-        String actualText = element().cellByIndex(cellIndex).text();
-        jdiAssert(actualText, Matchers.is(expectedText));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' cell has background color '{1}'")
-    public GridListAssert cellBackgroundColor(int cellIndex, String expectedColor) {
-        String actualColor = element().cellBackgroundColorByIndex(cellIndex);
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' cell has number of columns '{1}'")
-    public GridListAssert numberOfColumnsInCell(int cellIndex, int expectedNumberOfColumns) {
-        int actualNumberOfColumns = element().numberOfColumnsInCellByIndex(cellIndex);
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedNumberOfColumns));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' cell has number of rows '{1}'")
-    public GridListAssert numberOfRowsInCell(int cellIndex, int expectedNumberOfRows) {
-        int actualNumberOfRows = element().numberOfRowsInCellByIndex(cellIndex);
-        jdiAssert(actualNumberOfRows, Matchers.is(expectedNumberOfRows));
-        return this;
-    }
-}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
new file mode 100644
index 0000000000..2e0f7879a8
--- /dev/null
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -0,0 +1,122 @@
+package com.epam.jdi.light.angular.asserts.gridlist;
+
+import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
+
+import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
+import com.epam.jdi.light.angular.elements.enums.AngularColors;
+import com.epam.jdi.light.asserts.generic.UIAssert;
+import com.epam.jdi.light.common.JDIAction;
+import org.hamcrest.Matchers;
+
+public class GridListAssert extends UIAssert<GridListAssert, GridList> {
+
+    @JDIAction("Assert that '{name}' has number of columns '{0}'")
+    public GridListAssert cols(int expectedCols) {
+        int actualNumberOfColumns = element().сols();
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedCols),
+            String.format("\nActual number of columns in Grid List: '%s'\n" +
+                "is not equal to expected: '%s'", actualNumberOfColumns, expectedCols));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has row's height '{0}'")
+    public GridListAssert rowHeight(String expectedRowHeight) {
+        String actualRowHeight = element().rowHeight();
+        jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has gutter size '{0}'")
+    public GridListAssert gutterSize(String expectedGutterSize) {
+        String actualGutterSize = element().gutterSize();
+        jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has number of columns '{1}'")
+    public GridListAssert cellColspan(int cellIndex, int expectedColspan) {
+        int actualNumberOfColumns = element().cellByIndex(cellIndex).getColspan();
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedColspan));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has number of rows '{1}'")
+    public GridListAssert cellRowspan(int cellIndex, int expectedRowspan) {
+        int actualNumberOfRows = element().cellByIndex(cellIndex).getRowspan();
+        jdiAssert(actualNumberOfRows, Matchers.is(expectedRowspan));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has text '{1}'")
+    public GridListAssert cellText(int cellIndex, String expectedText) {
+        String actualText = element().cellByIndex(cellIndex).getText();
+        jdiAssert(actualText, Matchers.is(expectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has background color '{1}'")
+    public GridListAssert cellColor(int cellIndex, String expectedColor) {
+        String actualColor = element().cellByIndex(cellIndex).color();
+        jdiAssert(actualColor, Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has background color '{1}'")
+    public GridListAssert cellColor(int cellIndex, AngularColors expectedColor) {
+        AngularColors actualColor = element().cellByIndex(cellIndex).angularColor();
+        jdiAssert(actualColor, Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has header color '{1}'")
+    public GridListAssert headerColor(int cellIndex, String expectedColor) {
+        String actualColor = element().cellByIndex(cellIndex).headerColor();
+        jdiAssert(actualColor, Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has header color '{1}'")
+    public GridListAssert headerColor(int cellIndex, AngularColors expectedColor) {
+        AngularColors actualColor = element().cellByIndex(cellIndex).headerAngularColor();
+        jdiAssert(actualColor, Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has footer color '{1}'")
+    public GridListAssert footerColor(int cellIndex, String expectedColor) {
+        String actualColor = element().cellByIndex(cellIndex).footerColor();
+        jdiAssert(actualColor, Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has footer color '{1}'")
+    public GridListAssert footerColor(int cellIndex, AngularColors expectedColor) {
+        AngularColors actualColor = element().cellByIndex(cellIndex).footerAngularColor();
+        jdiAssert(actualColor, Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} header text is '{1}'")
+    public GridListAssert cellHeaderText(int cellIndex, String expectedText) {
+        jdiAssert(element().cellByIndex(cellIndex).headerText(), Matchers.is(expectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} footer text is '{1}'")
+    public GridListAssert cellFooterText(int cellIndex, String expectedText) {
+        jdiAssert(element().cellByIndex(cellIndex).footerText(), Matchers.is(expectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} has avatar")
+    public GridListAssert cellHasAvatar(int cellIndex) {
+        jdiAssert(element().cellByIndex(cellIndex).hasAvatar(), Matchers.is(true));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' cell#{0} avatar url is {1}")
+    public GridListAssert cellAvatarUrl(int cellIndex, String url) {
+        jdiAssert(element().cellByIndex(cellIndex).avatarUrl(), Matchers.is(url));
+        return this;
+    }
+}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
new file mode 100644
index 0000000000..1ef358192b
--- /dev/null
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
@@ -0,0 +1,93 @@
+package com.epam.jdi.light.angular.asserts.gridlist;
+
+import com.epam.jdi.light.angular.elements.complex.gridlist.GridTile;
+import com.epam.jdi.light.angular.elements.enums.AngularColors;
+import com.epam.jdi.light.asserts.generic.UIAssert;
+import com.epam.jdi.light.common.JDIAction;
+import org.hamcrest.Matchers;
+
+import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
+
+public class GridTileAssert extends UIAssert<GridTileAssert, GridTile> {
+
+    @JDIAction("Assert that '{name}' has number of columns '{0}'")
+    public GridTileAssert colspan(int expectedColspan) {
+        int actualNumberOfColumns = element().getColspan();
+        jdiAssert(actualNumberOfColumns, Matchers.is(expectedColspan));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has number of rows '{0}'")
+    public GridTileAssert rowspan(int expectedRowspan) {
+        int actualNumberOfRows = element().getRowspan();
+        jdiAssert(actualNumberOfRows, Matchers.is(expectedRowspan));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has text '{0}'")
+    public GridTileAssert cellText(String expectedText) {
+        String actualText = element().getText();
+        jdiAssert(actualText, Matchers.is(expectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' color is '{0}'")
+    public GridTileAssert color(AngularColors expectedColor) {
+        jdiAssert(element().angularColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' color is '{0}'")
+    public GridTileAssert color(String expectedColor) {
+        jdiAssert(element().color(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' header color is '{0}'")
+    public GridTileAssert headerColor(AngularColors expectedColor) {
+        jdiAssert(element().headerAngularColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' header color is '{0}'")
+    public GridTileAssert headerColor(String expectedColor) {
+        jdiAssert(element().headerColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' footer color is '{0}'")
+    public GridTileAssert footerColor(AngularColors expectedColor) {
+        jdiAssert(element().footerAngularColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' footer color is '{0}'")
+    public GridTileAssert footerColor(String expectedColor) {
+        jdiAssert(element().footerColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' header text is '{0}'")
+    public GridTileAssert headerText(String expectedText) {
+        jdiAssert(element().headerText(), Matchers.is(expectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' footer text is '{0}'")
+    public GridTileAssert footerText(String expectedText) {
+        jdiAssert(element().footerText(), Matchers.is(expectedText));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' has avatar")
+    public GridTileAssert hasAvatar() {
+        jdiAssert(element().hasAvatar(), Matchers.is(true));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' avatar url is {0}")
+    public GridTileAssert avatarUrl(String url) {
+        jdiAssert(element().avatarUrl(), Matchers.is(url));
+        return this;
+    }
+}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
deleted file mode 100644
index 7472cddde6..0000000000
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.epam.jdi.light.angular.elements.complex;
-
-import com.epam.jdi.light.angular.asserts.GridListAssert;
-import com.epam.jdi.light.common.JDIAction;
-import com.epam.jdi.light.elements.base.UIBaseElement;
-import com.epam.jdi.light.elements.common.UIElement;
-
-/**
- * To see an example of Grid web element please visit
- * <a href="https://material.angular.io/components/grid-list/overview">Angular Grid list Web Page</a>
- */
-public class GridList extends UIBaseElement<GridListAssert> {
-
-    @JDIAction(value = "Get '{name}' number of columns")
-    public int numberOfColumns() {
-        return Integer.parseInt(core().getAttribute("cols"));
-    }
-
-    @JDIAction(value = "Get '{name}' row's height")
-    public String rowHeight() {
-        return core().getAttribute("rowheight");
-    }
-
-    @JDIAction(value = "Get '{name}' gutter size")
-    public String gutterSize() {
-        return core().getAttribute("guttersize");
-    }
-
-    @JDIAction(value = "Get '{name}' cell by index '{0}'")
-    public UIElement cellByIndex(int index) {
-        return finds(".mat-grid-tile").get(index);
-    }
-
-    @JDIAction(value = "Get '{name}' cell's number of columns by index '{0}'")
-    public int numberOfColumnsInCellByIndex(int index) {
-        return Integer.parseInt(cellByIndex(index).getAttribute("colspan"));
-    }
-
-    @JDIAction(value = "Get '{name}' cell's number of rows by index '{0}'")
-    public int numberOfRowsInCellByIndex(int index) {
-        return Integer.parseInt(cellByIndex(index).getAttribute("rowspan"));
-    }
-
-    @JDIAction(value = "Get '{name}' cell's background color by index '{0}'")
-    public String cellBackgroundColorByIndex(int index) {
-        return cellByIndex(index).getCssValue("background-color");
-    }
-
-    @Override
-    public GridListAssert is() {
-        return new GridListAssert().set(this);
-    }
-}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
new file mode 100644
index 0000000000..f6a066d80f
--- /dev/null
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -0,0 +1,45 @@
+package com.epam.jdi.light.angular.elements.complex.gridlist;
+
+import com.epam.jdi.light.angular.asserts.gridlist.GridListAssert;
+import com.epam.jdi.light.common.JDIAction;
+import com.epam.jdi.light.elements.base.UIBaseElement;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * To see an example of Grid web element please visit
+ * <a href="https://material.angular.io/components/grid-list/overview">Angular Grid list Web Page</a>
+ */
+public class GridList extends UIBaseElement<GridListAssert> {
+
+    @JDIAction(value = "Get '{name}' number of columns")
+    public int сols() {
+        return Integer.parseInt(core().getAttribute("cols"));
+    }
+
+    @JDIAction(value = "Get '{name}' row's height")
+    public String rowHeight() {
+        return core().getAttribute("rowheight");
+    }
+
+    @JDIAction(value = "Get '{name}' gutter size in pixels")
+    public String gutterSize() {
+        return core().getAttribute("guttersize");
+    }
+
+    @JDIAction(value = "Get '{name}' cell by index '{0}'")
+    public GridTile cellByIndex(int index) {
+        return getTiles().collect(Collectors.toList()).get(index - 1);
+    }
+
+    @Override
+    public GridListAssert is() {
+        return new GridListAssert().set(this);
+    }
+
+    protected Stream<GridTile> getTiles() {
+        return finds(".mat-grid-tile").stream()
+                .map(e -> new GridTile().setCore(GridTile.class, e));
+    }
+}
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
new file mode 100644
index 0000000000..958a8138dd
--- /dev/null
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -0,0 +1,88 @@
+package com.epam.jdi.light.angular.elements.complex.gridlist;
+
+import com.epam.jdi.light.angular.asserts.gridlist.GridTileAssert;
+import com.epam.jdi.light.angular.elements.enums.AngularColors;
+import com.epam.jdi.light.common.JDIAction;
+import com.epam.jdi.light.elements.base.UIBaseElement;
+
+public class GridTile extends UIBaseElement<GridTileAssert> {
+
+    private static final String HEADER_LOCATOR = ".mat-grid-tile-header";
+    private static final String FOOTER_LOCATOR = ".mat-grid-tile-footer";
+    private static final String AVATAR_LOCATOR = ".avatar-img";
+    private static final String TEXT_LOCATOR = ".mat-grid-tile-text";
+
+    @Override
+    public GridTileAssert is() {
+        return new GridTileAssert().set(this);
+    }
+
+    @Override
+    public GridTileAssert has() {
+        return is();
+    }
+
+    @JDIAction(value = "Get '{name}' cell's number of columns")
+    public int getColspan() {
+        return Integer.parseInt(core().getAttribute("colspan"));
+    }
+
+    @JDIAction(value = "Get '{name}' cell's number of rows")
+    public int getRowspan() {
+        return Integer.parseInt(core().getAttribute("rowspan"));
+    }
+
+    @JDIAction(value = "Get '{name}' cell text")
+    public String getText() {
+        return core().find(TEXT_LOCATOR).text();
+    }
+
+    @JDIAction("Get '{name}' color")
+    public String color() {
+        return core().getCssValue("background-color");
+    }
+
+    @JDIAction("Get '{name}' header color")
+    public String headerColor() {
+        return core().find(HEADER_LOCATOR).getCssValue("border-bottom-color");
+    }
+
+    @JDIAction("Get '{name}' footer color")
+    public String footerColor() {
+        return core().find(FOOTER_LOCATOR).getCssValue("border-bottom-color");
+    }
+
+    @JDIAction("Get '{name}' color")
+    public AngularColors angularColor() {
+        return AngularColors.fromColor(core().getCssValue("background-color"));
+    }
+
+    @JDIAction("Get '{name}' header color")
+    public AngularColors headerAngularColor() {
+        return AngularColors.fromColor(core().find(HEADER_LOCATOR).getCssValue("border-bottom-color"));
+    }
+
+    @JDIAction("Get '{name}' footer color")
+    public AngularColors footerAngularColor() {
+        return AngularColors.fromColor(core().find(FOOTER_LOCATOR).getCssValue("border-bottom-color"));
+    }
+
+    @JDIAction("Get '{name}' header text")
+    public String headerText() {
+        return core().find(HEADER_LOCATOR).text();
+    }
+
+    @JDIAction("Get '{name}' footer text")
+    public String footerText() {
+        return core().find(FOOTER_LOCATOR).text();
+    }
+
+    @JDIAction("Get '{name}' avatar")
+    public Boolean hasAvatar() {
+        return core().find(AVATAR_LOCATOR).isExist();
+    }
+    @JDIAction("Get '{name}' avatar")
+    public String avatarUrl() {
+        return core().find(AVATAR_LOCATOR).getAttribute("src");
+    }
+}

From 13595b0e72c82002b5d5ddf5c2a4da035d43d207 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Mon, 11 Dec 2023 22:29:02 +0700
Subject: [PATCH 15/30] changed cell to tile in naming

---
 .../tests/elements/complex/GridListTests.java | 26 +++---
 .../asserts/gridlist/GridListAssert.java      | 80 +++++++++----------
 .../asserts/gridlist/GridTileAssert.java      |  2 +-
 .../elements/complex/gridlist/GridList.java   |  4 +-
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index f6a1b8155e..557f8b5702 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -33,29 +33,29 @@ public void dynamicGridListTest() {
                 .and().rowHeight("100px")
                 .and().gutterSize("10px")
 
-                .and().cellText(1, "One")
-                .and().cellText(4, "Four")
+                .and().tileText(1, "One")
+                .and().tileText(4, "Four")
 
-                .and().cellColor(2, AngularColors.fromColor(LIGHT_GREEN_2.value()))
-                .and().cellColor(4, AngularColors.fromColor(LIGHT_LILAC.value()))
+                .and().tileColor(2, AngularColors.fromColor(LIGHT_GREEN_2.value()))
+                .and().tileColor(4, AngularColors.fromColor(LIGHT_LILAC.value()))
 
-                .and().cellColspan(1, 3)
-                .and().cellColspan(2, 1)
-                .and().cellColspan(4, 2)
+                .and().tileColspan(1, 3)
+                .and().tileColspan(2, 1)
+                .and().tileColspan(4, 2)
 
-                .and().cellRowspan(1, 1)
-                .and().cellRowspan(2, 2)
+                .and().tileRowspan(1, 1)
+                .and().tileRowspan(2, 2)
 
-                .and().cellHasAvatar(2)
-                .and().cellAvatarUrl(2,"https://material.angular.io/assets/img/examples/shiba2.jpg");;
+                .and().tileHasAvatar(2)
+                .and().tileAvatarUrl(2,"https://material.angular.io/assets/img/examples/shiba2.jpg");
 
-        dynamicGridList.cellByIndex(3)
+        dynamicGridList.tileByIndex(3)
                 .is().colspan(1)
                 .and().rowspan(1)
                 .and().color(AngularColors.fromColor(LIGHT_PINK.value()))
                 .and().footerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
                 .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
-                .and().cellText("Three")
+                .and().text("Three")
                 .and().footerText("Mat Grid Footer")
                 .and().headerText("Mat Grid Header");
     }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index 2e0f7879a8..e7f786610f 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -12,7 +12,7 @@ public class GridListAssert extends UIAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridListAssert cols(int expectedCols) {
-        int actualNumberOfColumns = element().сols();
+        int actualNumberOfColumns = element().cols();
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedCols),
             String.format("\nActual number of columns in Grid List: '%s'\n" +
                 "is not equal to expected: '%s'", actualNumberOfColumns, expectedCols));
@@ -33,90 +33,90 @@ public GridListAssert gutterSize(String expectedGutterSize) {
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has number of columns '{1}'")
-    public GridListAssert cellColspan(int cellIndex, int expectedColspan) {
-        int actualNumberOfColumns = element().cellByIndex(cellIndex).getColspan();
+    @JDIAction("Assert that in '{name}' tile#{0} has number of columns '{1}'")
+    public GridListAssert tileColspan(int tileIndex, int expectedColspan) {
+        int actualNumberOfColumns = element().tileByIndex(tileIndex).getColspan();
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedColspan));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has number of rows '{1}'")
-    public GridListAssert cellRowspan(int cellIndex, int expectedRowspan) {
-        int actualNumberOfRows = element().cellByIndex(cellIndex).getRowspan();
+    @JDIAction("Assert that in '{name}' tile#{0} has number of rows '{1}'")
+    public GridListAssert tileRowspan(int tileIndex, int expectedRowspan) {
+        int actualNumberOfRows = element().tileByIndex(tileIndex).getRowspan();
         jdiAssert(actualNumberOfRows, Matchers.is(expectedRowspan));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has text '{1}'")
-    public GridListAssert cellText(int cellIndex, String expectedText) {
-        String actualText = element().cellByIndex(cellIndex).getText();
+    @JDIAction("Assert that in '{name}' tile#{0} has text '{1}'")
+    public GridListAssert tileText(int tileIndex, String expectedText) {
+        String actualText = element().tileByIndex(tileIndex).getText();
         jdiAssert(actualText, Matchers.is(expectedText));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has background color '{1}'")
-    public GridListAssert cellColor(int cellIndex, String expectedColor) {
-        String actualColor = element().cellByIndex(cellIndex).color();
+    @JDIAction("Assert that in '{name}' tile#{0} has background color '{1}'")
+    public GridListAssert tileColor(int tileIndex, String expectedColor) {
+        String actualColor = element().tileByIndex(tileIndex).color();
         jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has background color '{1}'")
-    public GridListAssert cellColor(int cellIndex, AngularColors expectedColor) {
-        AngularColors actualColor = element().cellByIndex(cellIndex).angularColor();
+    @JDIAction("Assert that in '{name}' tile#{0} has background color '{1}'")
+    public GridListAssert tileColor(int tileIndex, AngularColors expectedColor) {
+        AngularColors actualColor = element().tileByIndex(tileIndex).angularColor();
         jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has header color '{1}'")
-    public GridListAssert headerColor(int cellIndex, String expectedColor) {
-        String actualColor = element().cellByIndex(cellIndex).headerColor();
+    @JDIAction("Assert that in '{name}' tile#{0} has header color '{1}'")
+    public GridListAssert headerColor(int tileIndex, String expectedColor) {
+        String actualColor = element().tileByIndex(tileIndex).headerColor();
         jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has header color '{1}'")
-    public GridListAssert headerColor(int cellIndex, AngularColors expectedColor) {
-        AngularColors actualColor = element().cellByIndex(cellIndex).headerAngularColor();
+    @JDIAction("Assert that in '{name}' tile#{0} has header color '{1}'")
+    public GridListAssert headerColor(int tileIndex, AngularColors expectedColor) {
+        AngularColors actualColor = element().tileByIndex(tileIndex).headerAngularColor();
         jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has footer color '{1}'")
-    public GridListAssert footerColor(int cellIndex, String expectedColor) {
-        String actualColor = element().cellByIndex(cellIndex).footerColor();
+    @JDIAction("Assert that in '{name}' tile#{0} has footer color '{1}'")
+    public GridListAssert footerColor(int tileIndex, String expectedColor) {
+        String actualColor = element().tileByIndex(tileIndex).footerColor();
         jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has footer color '{1}'")
-    public GridListAssert footerColor(int cellIndex, AngularColors expectedColor) {
-        AngularColors actualColor = element().cellByIndex(cellIndex).footerAngularColor();
+    @JDIAction("Assert that in '{name}' tile#{0} has footer color '{1}'")
+    public GridListAssert footerColor(int tileIndex, AngularColors expectedColor) {
+        AngularColors actualColor = element().tileByIndex(tileIndex).footerAngularColor();
         jdiAssert(actualColor, Matchers.is(expectedColor));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} header text is '{1}'")
-    public GridListAssert cellHeaderText(int cellIndex, String expectedText) {
-        jdiAssert(element().cellByIndex(cellIndex).headerText(), Matchers.is(expectedText));
+    @JDIAction("Assert that in '{name}' tile#{0} header text is '{1}'")
+    public GridListAssert tileHeaderText(int tileIndex, String expectedText) {
+        jdiAssert(element().tileByIndex(tileIndex).headerText(), Matchers.is(expectedText));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} footer text is '{1}'")
-    public GridListAssert cellFooterText(int cellIndex, String expectedText) {
-        jdiAssert(element().cellByIndex(cellIndex).footerText(), Matchers.is(expectedText));
+    @JDIAction("Assert that in '{name}' tile#{0} footer text is '{1}'")
+    public GridListAssert tileFooterText(int tileIndex, String expectedText) {
+        jdiAssert(element().tileByIndex(tileIndex).footerText(), Matchers.is(expectedText));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} has avatar")
-    public GridListAssert cellHasAvatar(int cellIndex) {
-        jdiAssert(element().cellByIndex(cellIndex).hasAvatar(), Matchers.is(true));
+    @JDIAction("Assert that in '{name}' tile#{0} has avatar")
+    public GridListAssert tileHasAvatar(int tileIndex) {
+        jdiAssert(element().tileByIndex(tileIndex).hasAvatar(), Matchers.is(true));
         return this;
     }
 
-    @JDIAction("Assert that '{name}' cell#{0} avatar url is {1}")
-    public GridListAssert cellAvatarUrl(int cellIndex, String url) {
-        jdiAssert(element().cellByIndex(cellIndex).avatarUrl(), Matchers.is(url));
+    @JDIAction("Assert that in '{name}' tile#{0} avatar url is {1}")
+    public GridListAssert tileAvatarUrl(int tileIndex, String url) {
+        jdiAssert(element().tileByIndex(tileIndex).avatarUrl(), Matchers.is(url));
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
index 1ef358192b..e7cdf2fe86 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
@@ -25,7 +25,7 @@ public GridTileAssert rowspan(int expectedRowspan) {
     }
 
     @JDIAction("Assert that '{name}' has text '{0}'")
-    public GridTileAssert cellText(String expectedText) {
+    public GridTileAssert text(String expectedText) {
         String actualText = element().getText();
         jdiAssert(actualText, Matchers.is(expectedText));
         return this;
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index f6a066d80f..91ed56c498 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -14,7 +14,7 @@
 public class GridList extends UIBaseElement<GridListAssert> {
 
     @JDIAction(value = "Get '{name}' number of columns")
-    public int сols() {
+    public int cols() {
         return Integer.parseInt(core().getAttribute("cols"));
     }
 
@@ -29,7 +29,7 @@ public String gutterSize() {
     }
 
     @JDIAction(value = "Get '{name}' cell by index '{0}'")
-    public GridTile cellByIndex(int index) {
+    public GridTile tileByIndex(int index) {
         return getTiles().collect(Collectors.toList()).get(index - 1);
     }
 

From c42148adf3f408ba52f0b5003c5e8b726aad070d Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 22 Dec 2023 16:32:17 +0700
Subject: [PATCH 16/30] fixed comments

---
 .../java/io/github/com/pages/AngularPage.java |  1 -
 .../tests/elements/complex/GridListTests.java | 45 +++++-----
 .../asserts/gridlist/GridListAssert.java      | 89 +------------------
 .../asserts/gridlist/GridTileAssert.java      | 18 +---
 .../elements/complex/gridlist/GridList.java   |  6 +-
 .../elements/complex/gridlist/GridTile.java   | 31 +++----
 6 files changed, 42 insertions(+), 148 deletions(-)

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
index d13d8807c5..7b6a7ea027 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java
@@ -10,7 +10,6 @@
 import io.github.com.pages.sections.DatepickerSection;
 import io.github.com.pages.sections.ExpansionPanelSection;
 import io.github.com.pages.sections.FormFieldsSection;
-import io.github.com.pages.sections.GridListSection;
 import io.github.com.pages.sections.InputSection;
 import io.github.com.pages.sections.ListSection;
 import io.github.com.pages.sections.MenuSection;
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 557f8b5702..76d2a7cb23 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -31,32 +31,33 @@ public void dynamicGridListTest() {
 
         dynamicGridList.has().cols(4)
                 .and().rowHeight("100px")
-                .and().gutterSize("10px")
+                .and().gutterSize("10px");
 
-                .and().tileText(1, "One")
-                .and().tileText(4, "Four")
+        dynamicGridList.getTiles().forEach(e -> e.is().visible());
 
-                .and().tileColor(2, AngularColors.fromColor(LIGHT_GREEN_2.value()))
-                .and().tileColor(4, AngularColors.fromColor(LIGHT_LILAC.value()))
+        dynamicGridList.tileByIndex(1)
+            .is().text("One")
+            .and().colspan(3)
+            .and().rowspan(1);
 
-                .and().tileColspan(1, 3)
-                .and().tileColspan(2, 1)
-                .and().tileColspan(4, 2)
-
-                .and().tileRowspan(1, 1)
-                .and().tileRowspan(2, 2)
-
-                .and().tileHasAvatar(2)
-                .and().tileAvatarUrl(2,"https://material.angular.io/assets/img/examples/shiba2.jpg");
+        dynamicGridList.tileByIndex(2)
+            .is().color(AngularColors.fromColor(LIGHT_GREEN_2.value()))
+            .and().colspan(1)
+            .and().rowspan(2);
 
         dynamicGridList.tileByIndex(3)
-                .is().colspan(1)
-                .and().rowspan(1)
-                .and().color(AngularColors.fromColor(LIGHT_PINK.value()))
-                .and().footerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
-                .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
-                .and().text("Three")
-                .and().footerText("Mat Grid Footer")
-                .and().headerText("Mat Grid Header");
+            .is().colspan(1)
+            .and().rowspan(1)
+            .and().color(LIGHT_PINK.value())
+            .and().footerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+            .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+            .and().text("Three")
+            .and().footerText("Mat Grid Footer")
+            .and().headerText("Mat Grid Header");
+
+        dynamicGridList.tileByIndex(4)
+        .is().text("Four")
+            .and().color(AngularColors.fromColor(LIGHT_LILAC.value()))
+            .and().colspan(2);
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index e7f786610f..b7f4a26d0f 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -4,7 +4,9 @@
 
 import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
 import com.epam.jdi.light.angular.elements.enums.AngularColors;
+import com.epam.jdi.light.asserts.generic.ListAssert;
 import com.epam.jdi.light.asserts.generic.UIAssert;
+import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import org.hamcrest.Matchers;
 
@@ -32,91 +34,4 @@ public GridListAssert gutterSize(String expectedGutterSize) {
         jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize));
         return this;
     }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has number of columns '{1}'")
-    public GridListAssert tileColspan(int tileIndex, int expectedColspan) {
-        int actualNumberOfColumns = element().tileByIndex(tileIndex).getColspan();
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedColspan));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has number of rows '{1}'")
-    public GridListAssert tileRowspan(int tileIndex, int expectedRowspan) {
-        int actualNumberOfRows = element().tileByIndex(tileIndex).getRowspan();
-        jdiAssert(actualNumberOfRows, Matchers.is(expectedRowspan));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has text '{1}'")
-    public GridListAssert tileText(int tileIndex, String expectedText) {
-        String actualText = element().tileByIndex(tileIndex).getText();
-        jdiAssert(actualText, Matchers.is(expectedText));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has background color '{1}'")
-    public GridListAssert tileColor(int tileIndex, String expectedColor) {
-        String actualColor = element().tileByIndex(tileIndex).color();
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has background color '{1}'")
-    public GridListAssert tileColor(int tileIndex, AngularColors expectedColor) {
-        AngularColors actualColor = element().tileByIndex(tileIndex).angularColor();
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has header color '{1}'")
-    public GridListAssert headerColor(int tileIndex, String expectedColor) {
-        String actualColor = element().tileByIndex(tileIndex).headerColor();
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has header color '{1}'")
-    public GridListAssert headerColor(int tileIndex, AngularColors expectedColor) {
-        AngularColors actualColor = element().tileByIndex(tileIndex).headerAngularColor();
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has footer color '{1}'")
-    public GridListAssert footerColor(int tileIndex, String expectedColor) {
-        String actualColor = element().tileByIndex(tileIndex).footerColor();
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has footer color '{1}'")
-    public GridListAssert footerColor(int tileIndex, AngularColors expectedColor) {
-        AngularColors actualColor = element().tileByIndex(tileIndex).footerAngularColor();
-        jdiAssert(actualColor, Matchers.is(expectedColor));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} header text is '{1}'")
-    public GridListAssert tileHeaderText(int tileIndex, String expectedText) {
-        jdiAssert(element().tileByIndex(tileIndex).headerText(), Matchers.is(expectedText));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} footer text is '{1}'")
-    public GridListAssert tileFooterText(int tileIndex, String expectedText) {
-        jdiAssert(element().tileByIndex(tileIndex).footerText(), Matchers.is(expectedText));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} has avatar")
-    public GridListAssert tileHasAvatar(int tileIndex) {
-        jdiAssert(element().tileByIndex(tileIndex).hasAvatar(), Matchers.is(true));
-        return this;
-    }
-
-    @JDIAction("Assert that in '{name}' tile#{0} avatar url is {1}")
-    public GridListAssert tileAvatarUrl(int tileIndex, String url) {
-        jdiAssert(element().tileByIndex(tileIndex).avatarUrl(), Matchers.is(url));
-        return this;
-    }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
index e7cdf2fe86..b54c8654e1 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
@@ -12,21 +12,21 @@ public class GridTileAssert extends UIAssert<GridTileAssert, GridTile> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridTileAssert colspan(int expectedColspan) {
-        int actualNumberOfColumns = element().getColspan();
+        int actualNumberOfColumns = element().colspan();
         jdiAssert(actualNumberOfColumns, Matchers.is(expectedColspan));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has number of rows '{0}'")
     public GridTileAssert rowspan(int expectedRowspan) {
-        int actualNumberOfRows = element().getRowspan();
+        int actualNumberOfRows = element().rowspan();
         jdiAssert(actualNumberOfRows, Matchers.is(expectedRowspan));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has text '{0}'")
     public GridTileAssert text(String expectedText) {
-        String actualText = element().getText();
+        String actualText = element().text();
         jdiAssert(actualText, Matchers.is(expectedText));
         return this;
     }
@@ -78,16 +78,4 @@ public GridTileAssert footerText(String expectedText) {
         jdiAssert(element().footerText(), Matchers.is(expectedText));
         return this;
     }
-
-    @JDIAction("Assert that '{name}' has avatar")
-    public GridTileAssert hasAvatar() {
-        jdiAssert(element().hasAvatar(), Matchers.is(true));
-        return this;
-    }
-
-    @JDIAction("Assert that '{name}' avatar url is {0}")
-    public GridTileAssert avatarUrl(String url) {
-        jdiAssert(element().avatarUrl(), Matchers.is(url));
-        return this;
-    }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index 91ed56c498..584b57c6e2 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -28,7 +28,7 @@ public String gutterSize() {
         return core().getAttribute("guttersize");
     }
 
-    @JDIAction(value = "Get '{name}' cell by index '{0}'")
+    @JDIAction(value = "Get '{name}' tile by index '{0}'")
     public GridTile tileByIndex(int index) {
         return getTiles().collect(Collectors.toList()).get(index - 1);
     }
@@ -38,8 +38,8 @@ public GridListAssert is() {
         return new GridListAssert().set(this);
     }
 
-    protected Stream<GridTile> getTiles() {
-        return finds(".mat-grid-tile").stream()
+    public Stream<GridTile> getTiles() {
+        return core().finds(".mat-grid-tile").stream()
                 .map(e -> new GridTile().setCore(GridTile.class, e));
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
index 958a8138dd..a339cda547 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -4,12 +4,12 @@
 import com.epam.jdi.light.angular.elements.enums.AngularColors;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.elements.base.UIBaseElement;
+import com.epam.jdi.light.elements.interfaces.base.HasColor;
 
-public class GridTile extends UIBaseElement<GridTileAssert> {
+public class GridTile extends UIBaseElement<GridTileAssert> implements HasColor {
 
     private static final String HEADER_LOCATOR = ".mat-grid-tile-header";
     private static final String FOOTER_LOCATOR = ".mat-grid-tile-footer";
-    private static final String AVATAR_LOCATOR = ".avatar-img";
     private static final String TEXT_LOCATOR = ".mat-grid-tile-text";
 
     @Override
@@ -22,18 +22,18 @@ public GridTileAssert has() {
         return is();
     }
 
-    @JDIAction(value = "Get '{name}' cell's number of columns")
-    public int getColspan() {
+    @JDIAction(value = "Get '{name}' tile's number of columns")
+    public int colspan() {
         return Integer.parseInt(core().getAttribute("colspan"));
     }
 
-    @JDIAction(value = "Get '{name}' cell's number of rows")
-    public int getRowspan() {
+    @JDIAction(value = "Get '{name}' tile's number of rows")
+    public int rowspan() {
         return Integer.parseInt(core().getAttribute("rowspan"));
     }
 
-    @JDIAction(value = "Get '{name}' cell text")
-    public String getText() {
+    @JDIAction(value = "Get '{name}' tile text")
+    public String text() {
         return core().find(TEXT_LOCATOR).text();
     }
 
@@ -52,17 +52,17 @@ public String footerColor() {
         return core().find(FOOTER_LOCATOR).getCssValue("border-bottom-color");
     }
 
-    @JDIAction("Get '{name}' color")
+    @JDIAction("Get '{name}' angular color")
     public AngularColors angularColor() {
         return AngularColors.fromColor(core().getCssValue("background-color"));
     }
 
-    @JDIAction("Get '{name}' header color")
+    @JDIAction("Get '{name}' angular header color")
     public AngularColors headerAngularColor() {
         return AngularColors.fromColor(core().find(HEADER_LOCATOR).getCssValue("border-bottom-color"));
     }
 
-    @JDIAction("Get '{name}' footer color")
+    @JDIAction("Get '{name}' angular footer color")
     public AngularColors footerAngularColor() {
         return AngularColors.fromColor(core().find(FOOTER_LOCATOR).getCssValue("border-bottom-color"));
     }
@@ -76,13 +76,4 @@ public String headerText() {
     public String footerText() {
         return core().find(FOOTER_LOCATOR).text();
     }
-
-    @JDIAction("Get '{name}' avatar")
-    public Boolean hasAvatar() {
-        return core().find(AVATAR_LOCATOR).isExist();
-    }
-    @JDIAction("Get '{name}' avatar")
-    public String avatarUrl() {
-        return core().find(AVATAR_LOCATOR).getAttribute("src");
-    }
 }

From fa152516c1a405d4f79e9f0fa1428311b19bd67c Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 22 Dec 2023 16:34:12 +0700
Subject: [PATCH 17/30] removed unused imports

---
 .../jdi/light/angular/asserts/gridlist/GridListAssert.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index b7f4a26d0f..feb161e3d7 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -3,10 +3,7 @@
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
 
 import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
-import com.epam.jdi.light.angular.elements.enums.AngularColors;
-import com.epam.jdi.light.asserts.generic.ListAssert;
 import com.epam.jdi.light.asserts.generic.UIAssert;
-import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import org.hamcrest.Matchers;
 

From c20c5d88cc68981b21df91aa0231e783bbda35c5 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Tue, 26 Dec 2023 19:22:23 +0700
Subject: [PATCH 18/30] added background colors

---
 .../tests/elements/complex/GridListTests.java |  8 +++-
 .../asserts/gridlist/GridTileAssert.java      | 33 ++++++++++++--
 .../elements/complex/gridlist/GridList.java   |  2 +-
 .../elements/complex/gridlist/GridTile.java   | 44 ++++++++++++++-----
 4 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 76d2a7cb23..d0552ef4d0 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -5,6 +5,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static io.github.com.enums.Colors.BLACK_TRANSPARENT_087;
 import static io.github.com.enums.Colors.LIGHT_GREEN_2;
 import static io.github.com.enums.Colors.LIGHT_LILAC;
 import static com.jdiai.tools.Timer.waitCondition;
@@ -48,9 +49,14 @@ public void dynamicGridListTest() {
         dynamicGridList.tileByIndex(3)
             .is().colspan(1)
             .and().rowspan(1)
-            .and().color(LIGHT_PINK.value())
+            .and().backgroundColor(LIGHT_PINK.value())
+            .and().backgroundColor(AngularColors.fromColor(LIGHT_PINK.value()))
+            .and().color(BLACK_TRANSPARENT_087.value())
+            .and().color(AngularColors.fromColor(BLACK_TRANSPARENT_087.value()))
             .and().footerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+            .and().footerBackgroundColor(WHITE_TRANSPARENT_038.value())
             .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+            .and().headerBackgroundColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
             .and().text("Three")
             .and().footerText("Mat Grid Footer")
             .and().headerText("Mat Grid Header");
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
index b54c8654e1..42b9de8383 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
@@ -2,13 +2,14 @@
 
 import com.epam.jdi.light.angular.elements.complex.gridlist.GridTile;
 import com.epam.jdi.light.angular.elements.enums.AngularColors;
+import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import org.hamcrest.Matchers;
 
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
 
-public class GridTileAssert extends UIAssert<GridTileAssert, GridTile> {
+public class GridTileAssert extends UIAssert<GridTileAssert, GridTile> implements ColorAssert<GridTileAssert, GridTile> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridTileAssert colspan(int expectedColspan) {
@@ -37,9 +38,9 @@ public GridTileAssert color(AngularColors expectedColor) {
         return this;
     }
 
-    @JDIAction("Assert that '{name}' color is '{0}'")
-    public GridTileAssert color(String expectedColor) {
-        jdiAssert(element().color(), Matchers.is(expectedColor));
+    @JDIAction("Assert that '{name}' background color is '{0}'")
+    public GridTileAssert backgroundColor(AngularColors expectedColor) {
+        jdiAssert(element().angularBackgroundColor(), Matchers.is(expectedColor));
         return this;
     }
 
@@ -55,6 +56,18 @@ public GridTileAssert headerColor(String expectedColor) {
         return this;
     }
 
+    @JDIAction("Assert that '{name}' header background color is '{0}'")
+    public GridTileAssert headerBackgroundColor(AngularColors expectedColor) {
+        jdiAssert(element().headerAngularBackgroundColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' header background color is '{0}'")
+    public GridTileAssert headerBackgroundColor(String expectedColor) {
+        jdiAssert(element().headerBackgroundColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
     @JDIAction("Assert that '{name}' footer color is '{0}'")
     public GridTileAssert footerColor(AngularColors expectedColor) {
         jdiAssert(element().footerAngularColor(), Matchers.is(expectedColor));
@@ -67,6 +80,18 @@ public GridTileAssert footerColor(String expectedColor) {
         return this;
     }
 
+    @JDIAction("Assert that '{name}' footer background color is '{0}'")
+    public GridTileAssert footerBackgroundColor(AngularColors expectedColor) {
+        jdiAssert(element().footerAngularBackgroundColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
+    @JDIAction("Assert that '{name}' footer background color is '{0}'")
+    public GridTileAssert footerBackgroundColor(String expectedColor) {
+        jdiAssert(element().footerBackgroundColor(), Matchers.is(expectedColor));
+        return this;
+    }
+
     @JDIAction("Assert that '{name}' header text is '{0}'")
     public GridTileAssert headerText(String expectedText) {
         jdiAssert(element().headerText(), Matchers.is(expectedText));
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index 584b57c6e2..61063b6764 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -28,7 +28,7 @@ public String gutterSize() {
         return core().getAttribute("guttersize");
     }
 
-    @JDIAction(value = "Get '{name}' tile by index '{0}'")
+    @JDIAction(value = "Get '{name}' tile by index '{0}' (1 based index)")
     public GridTile tileByIndex(int index) {
         return getTiles().collect(Collectors.toList()).get(index - 1);
     }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
index a339cda547..d7d5fa3b72 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -37,34 +37,54 @@ public String text() {
         return core().find(TEXT_LOCATOR).text();
     }
 
-    @JDIAction("Get '{name}' color")
-    public String color() {
-        return core().getCssValue("background-color");
-    }
-
     @JDIAction("Get '{name}' header color")
     public String headerColor() {
-        return core().find(HEADER_LOCATOR).getCssValue("border-bottom-color");
+        return core().find(HEADER_LOCATOR).getCssValue("color");
     }
 
     @JDIAction("Get '{name}' footer color")
     public String footerColor() {
-        return core().find(FOOTER_LOCATOR).getCssValue("border-bottom-color");
+        return core().find(FOOTER_LOCATOR).getCssValue("color");
+    }
+
+    @JDIAction("Get '{name}' header color")
+    public String headerBackgroundColor() {
+        return core().find(HEADER_LOCATOR).getCssValue("background-color");
+    }
+
+    @JDIAction("Get '{name}' footer color")
+    public String footerBackgroundColor() {
+        return core().find(FOOTER_LOCATOR).getCssValue("background-color");
     }
 
     @JDIAction("Get '{name}' angular color")
     public AngularColors angularColor() {
-        return AngularColors.fromColor(core().getCssValue("background-color"));
+        return AngularColors.fromColor(color());
+    }
+
+    @JDIAction("Get '{name}' angular background color")
+    public AngularColors angularBackgroundColor() {
+        return AngularColors.fromColor(backgroundColor());
     }
 
-    @JDIAction("Get '{name}' angular header color")
+    @JDIAction("Get '{name}' header angular color")
     public AngularColors headerAngularColor() {
-        return AngularColors.fromColor(core().find(HEADER_LOCATOR).getCssValue("border-bottom-color"));
+        return AngularColors.fromColor(headerColor());
     }
 
-    @JDIAction("Get '{name}' angular footer color")
+    @JDIAction("Get '{name}' footer angular color")
     public AngularColors footerAngularColor() {
-        return AngularColors.fromColor(core().find(FOOTER_LOCATOR).getCssValue("border-bottom-color"));
+        return AngularColors.fromColor(footerColor());
+    }
+
+    @JDIAction("Get '{name}' header angular background color")
+    public AngularColors headerAngularBackgroundColor() {
+        return AngularColors.fromColor(headerBackgroundColor());
+    }
+
+    @JDIAction("Get '{name}' footer angular background color")
+    public AngularColors footerAngularBackgroundColor() {
+        return AngularColors.fromColor(footerBackgroundColor());
     }
 
     @JDIAction("Get '{name}' header text")

From 763b7b991c5a3843ca1afe106fb0cb056aed5410 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 5 Jan 2024 05:04:08 +0700
Subject: [PATCH 19/30] text method updated

---
 .../epam/angular/tests/elements/complex/GridListTests.java     | 2 +-
 .../jdi/light/angular/elements/complex/gridlist/GridTile.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index d0552ef4d0..e2566cb077 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -57,7 +57,7 @@ public void dynamicGridListTest() {
             .and().footerBackgroundColor(WHITE_TRANSPARENT_038.value())
             .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
             .and().headerBackgroundColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
-            .and().text("Three")
+            .and().text("Mat Grid Header\nThree\nMat Grid Footer")
             .and().footerText("Mat Grid Footer")
             .and().headerText("Mat Grid Header");
 
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
index d7d5fa3b72..c7014ffeba 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -10,7 +10,6 @@ public class GridTile extends UIBaseElement<GridTileAssert> implements HasColor
 
     private static final String HEADER_LOCATOR = ".mat-grid-tile-header";
     private static final String FOOTER_LOCATOR = ".mat-grid-tile-footer";
-    private static final String TEXT_LOCATOR = ".mat-grid-tile-text";
 
     @Override
     public GridTileAssert is() {
@@ -34,7 +33,7 @@ public int rowspan() {
 
     @JDIAction(value = "Get '{name}' tile text")
     public String text() {
-        return core().find(TEXT_LOCATOR).text();
+        return core().text();
     }
 
     @JDIAction("Get '{name}' header color")

From 71252457b58dedc3d7768388ad6ed2401c237329 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 5 Jan 2024 05:07:45 +0700
Subject: [PATCH 20/30] option to implement extending UIListBase

---
 .../jdi/light/angular/asserts/gridlist/GridListAssert.java    | 4 ++--
 .../jdi/light/angular/elements/complex/gridlist/GridList.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index feb161e3d7..fc852b841d 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -3,11 +3,11 @@
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
 
 import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
-import com.epam.jdi.light.asserts.generic.UIAssert;
+import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
 import org.hamcrest.Matchers;
 
-public class GridListAssert extends UIAssert<GridListAssert, GridList> {
+public class GridListAssert extends UISelectAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridListAssert cols(int expectedCols) {
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index 61063b6764..eaa267a05b 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -2,7 +2,7 @@
 
 import com.epam.jdi.light.angular.asserts.gridlist.GridListAssert;
 import com.epam.jdi.light.common.JDIAction;
-import com.epam.jdi.light.elements.base.UIBaseElement;
+import com.epam.jdi.light.elements.base.UIListBase;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -11,7 +11,7 @@
  * To see an example of Grid web element please visit
  * <a href="https://material.angular.io/components/grid-list/overview">Angular Grid list Web Page</a>
  */
-public class GridList extends UIBaseElement<GridListAssert> {
+public class GridList extends UIListBase<GridListAssert> {
 
     @JDIAction(value = "Get '{name}' number of columns")
     public int cols() {

From 1aa6a2d2bc28f16ec4c7cfd0f7f9f643cbfeef82 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 5 Jan 2024 19:23:34 +0700
Subject: [PATCH 21/30] removed creating variables for actual values for
 asserts

---
 .../angular/asserts/gridlist/GridListAssert.java      | 11 ++++-------
 .../angular/asserts/gridlist/GridTileAssert.java      |  9 +++------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index fc852b841d..ca2ea166b5 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -11,24 +11,21 @@ public class GridListAssert extends UISelectAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridListAssert cols(int expectedCols) {
-        int actualNumberOfColumns = element().cols();
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedCols),
+        jdiAssert(element().cols(), Matchers.is(expectedCols),
             String.format("\nActual number of columns in Grid List: '%s'\n" +
-                "is not equal to expected: '%s'", actualNumberOfColumns, expectedCols));
+                "is not equal to expected: '%s'", element().cols(), expectedCols));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has row's height '{0}'")
     public GridListAssert rowHeight(String expectedRowHeight) {
-        String actualRowHeight = element().rowHeight();
-        jdiAssert(actualRowHeight, Matchers.is(expectedRowHeight));
+        jdiAssert(element().rowHeight(), Matchers.is(expectedRowHeight));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has gutter size '{0}'")
     public GridListAssert gutterSize(String expectedGutterSize) {
-        String actualGutterSize = element().gutterSize();
-        jdiAssert(actualGutterSize, Matchers.is(expectedGutterSize));
+        jdiAssert(element().gutterSize(), Matchers.is(expectedGutterSize));
         return this;
     }
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
index 42b9de8383..f87788fc02 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridTileAssert.java
@@ -13,22 +13,19 @@ public class GridTileAssert extends UIAssert<GridTileAssert, GridTile> implement
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridTileAssert colspan(int expectedColspan) {
-        int actualNumberOfColumns = element().colspan();
-        jdiAssert(actualNumberOfColumns, Matchers.is(expectedColspan));
+        jdiAssert(element().colspan(), Matchers.is(expectedColspan));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has number of rows '{0}'")
     public GridTileAssert rowspan(int expectedRowspan) {
-        int actualNumberOfRows = element().rowspan();
-        jdiAssert(actualNumberOfRows, Matchers.is(expectedRowspan));
+        jdiAssert(element().rowspan(), Matchers.is(expectedRowspan));
         return this;
     }
 
     @JDIAction("Assert that '{name}' has text '{0}'")
     public GridTileAssert text(String expectedText) {
-        String actualText = element().text();
-        jdiAssert(actualText, Matchers.is(expectedText));
+        jdiAssert(element().text(), Matchers.is(expectedText));
         return this;
     }
 

From 42db43055e1eba726b92269e578779152ea449e0 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 5 Jan 2024 19:29:55 +0700
Subject: [PATCH 22/30] added getting footer and header as uiElement. No extra
 asserts added

---
 .../angular/elements/complex/gridlist/GridTile.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
index c7014ffeba..f05fac026c 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -4,6 +4,7 @@
 import com.epam.jdi.light.angular.elements.enums.AngularColors;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.elements.base.UIBaseElement;
+import com.epam.jdi.light.elements.common.UIElement;
 import com.epam.jdi.light.elements.interfaces.base.HasColor;
 
 public class GridTile extends UIBaseElement<GridTileAssert> implements HasColor {
@@ -95,4 +96,14 @@ public String headerText() {
     public String footerText() {
         return core().find(FOOTER_LOCATOR).text();
     }
+
+    @JDIAction("Get '{name}' header")
+    public UIElement header() {
+        return core().find(HEADER_LOCATOR);
+    }
+
+    @JDIAction("Get '{name}' footer")
+    public UIElement footer() {
+        return core().find(FOOTER_LOCATOR);
+    }
 }

From f219d10a29761759c08e2704b5c327eb7a5c68d5 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Wed, 17 Jan 2024 00:28:34 +0700
Subject: [PATCH 23/30] fixed text colors and added names for tiles

---
 .../epam/angular/tests/elements/complex/GridListTests.java | 5 +++--
 .../light/angular/elements/complex/gridlist/GridList.java  | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index e2566cb077..ea1406038a 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -12,6 +12,7 @@
 import static io.github.com.StaticSite.gridListPage;
 
 import static io.github.com.enums.Colors.LIGHT_PINK;
+import static io.github.com.enums.Colors.WHITE;
 import static io.github.com.enums.Colors.WHITE_TRANSPARENT_038;
 import static io.github.com.pages.GridListPage.dynamicGridList;
 
@@ -53,9 +54,9 @@ public void dynamicGridListTest() {
             .and().backgroundColor(AngularColors.fromColor(LIGHT_PINK.value()))
             .and().color(BLACK_TRANSPARENT_087.value())
             .and().color(AngularColors.fromColor(BLACK_TRANSPARENT_087.value()))
-            .and().footerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+            .and().footerColor(AngularColors.fromColor(WHITE.value()))
             .and().footerBackgroundColor(WHITE_TRANSPARENT_038.value())
-            .and().headerColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
+            .and().headerColor(WHITE.value())
             .and().headerBackgroundColor(AngularColors.fromColor(WHITE_TRANSPARENT_038.value()))
             .and().text("Mat Grid Header\nThree\nMat Grid Footer")
             .and().footerText("Mat Grid Footer")
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index eaa267a05b..6dbfa5ad47 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -39,7 +39,12 @@ public GridListAssert is() {
     }
 
     public Stream<GridTile> getTiles() {
+        int[] counter = {1};
         return core().finds(".mat-grid-tile").stream()
-                .map(e -> new GridTile().setCore(GridTile.class, e));
+                .map(e -> {
+                    GridTile tile = new GridTile().setCore(GridTile.class, e);
+                    tile.setName("Grid Tile " + counter[0]++);
+                    return tile;
+                });
     }
 }

From 772030124e1264c4177312b420cabcffd37e26cc Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Fri, 2 Feb 2024 23:19:50 +0700
Subject: [PATCH 24/30] added get content option, removed "in pixels" and
 changed tileByIngex method

---
 .../angular/tests/elements/complex/GridListTests.java     | 3 +++
 .../light/angular/elements/complex/gridlist/GridList.java | 8 +++++---
 .../light/angular/elements/complex/gridlist/GridTile.java | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index ea1406038a..c5e40c7e3a 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -47,6 +47,9 @@ public void dynamicGridListTest() {
             .and().colspan(1)
             .and().rowspan(2);
 
+        dynamicGridList.tileByIndex(2).content().find(".avatar-img").is()
+            .attr("src","https://material.angular.io/assets/img/examples/shiba2.jpg");
+
         dynamicGridList.tileByIndex(3)
             .is().colspan(1)
             .and().rowspan(1)
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index 6dbfa5ad47..2debb7a776 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -4,7 +4,6 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.elements.base.UIListBase;
 
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -23,14 +22,17 @@ public String rowHeight() {
         return core().getAttribute("rowheight");
     }
 
-    @JDIAction(value = "Get '{name}' gutter size in pixels")
+    @JDIAction(value = "Get '{name}' gutter size")
     public String gutterSize() {
         return core().getAttribute("guttersize");
     }
 
     @JDIAction(value = "Get '{name}' tile by index '{0}' (1 based index)")
     public GridTile tileByIndex(int index) {
-        return getTiles().collect(Collectors.toList()).get(index - 1);
+        return getTiles()
+            .skip(index - 1)
+            .findFirst()
+            .orElseThrow(() -> new IllegalArgumentException("No tile at index " + index));
     }
 
     @Override
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
index f05fac026c..3eda1e84c2 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -87,6 +87,11 @@ public AngularColors footerAngularBackgroundColor() {
         return AngularColors.fromColor(footerBackgroundColor());
     }
 
+    @JDIAction("Get '{name}' content")
+    public UIElement content() {
+        return core();
+    }
+
     @JDIAction("Get '{name}' header text")
     public String headerText() {
         return core().find(HEADER_LOCATOR).text();

From bb6f03003d288512f3ff3990209631247a974aa3 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Sat, 3 Feb 2024 04:59:25 +0700
Subject: [PATCH 25/30] removed content option, and separated getting tiles in
 stream and list

---
 .../tests/elements/complex/GridListTests.java       |  4 ++--
 .../angular/elements/complex/gridlist/GridList.java | 13 +++++++++++--
 .../angular/elements/complex/gridlist/GridTile.java |  5 -----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index c5e40c7e3a..58c108edc8 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -35,7 +35,7 @@ public void dynamicGridListTest() {
                 .and().rowHeight("100px")
                 .and().gutterSize("10px");
 
-        dynamicGridList.getTiles().forEach(e -> e.is().visible());
+        dynamicGridList.tiles().forEach(e -> e.is().visible());
 
         dynamicGridList.tileByIndex(1)
             .is().text("One")
@@ -47,7 +47,7 @@ public void dynamicGridListTest() {
             .and().colspan(1)
             .and().rowspan(2);
 
-        dynamicGridList.tileByIndex(2).content().find(".avatar-img").is()
+        dynamicGridList.tileByIndex(2).find(".avatar-img").is()
             .attr("src","https://material.angular.io/assets/img/examples/shiba2.jpg");
 
         dynamicGridList.tileByIndex(3)
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
index 2debb7a776..44721daf84 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java
@@ -4,6 +4,8 @@
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.elements.base.UIListBase;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -29,7 +31,7 @@ public String gutterSize() {
 
     @JDIAction(value = "Get '{name}' tile by index '{0}' (1 based index)")
     public GridTile tileByIndex(int index) {
-        return getTiles()
+        return getTilesStream()
             .skip(index - 1)
             .findFirst()
             .orElseThrow(() -> new IllegalArgumentException("No tile at index " + index));
@@ -40,7 +42,8 @@ public GridListAssert is() {
         return new GridListAssert().set(this);
     }
 
-    public Stream<GridTile> getTiles() {
+    @JDIAction("Get inner grid tiles stream from {name}")
+    protected Stream<GridTile> getTilesStream() {
         int[] counter = {1};
         return core().finds(".mat-grid-tile").stream()
                 .map(e -> {
@@ -49,4 +52,10 @@ public Stream<GridTile> getTiles() {
                     return tile;
                 });
     }
+
+    @JDIAction("Get inner grid tiles list from {name}")
+    public List<GridTile> tiles() {
+        return getTilesStream().collect(Collectors.toList());
+    }
+
 }
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
index 3eda1e84c2..f05fac026c 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java
@@ -87,11 +87,6 @@ public AngularColors footerAngularBackgroundColor() {
         return AngularColors.fromColor(footerBackgroundColor());
     }
 
-    @JDIAction("Get '{name}' content")
-    public UIElement content() {
-        return core();
-    }
-
     @JDIAction("Get '{name}' header text")
     public String headerText() {
         return core().find(HEADER_LOCATOR).text();

From b67c3baa1adc6524e2e21861fdc611863505d881 Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Thu, 8 Feb 2024 20:29:19 +0700
Subject: [PATCH 26/30] added assertions for grid list and test examples for it

---
 .../tests/elements/complex/GridListTests.java |  13 +-
 .../asserts/gridlist/GridListAssert.java      | 131 ++++++++++++++++++
 2 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 58c108edc8..1ffb76beca 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -1,6 +1,7 @@
 package io.github.epam.angular.tests.elements.complex;
 
 import com.epam.jdi.light.angular.elements.enums.AngularColors;
+import com.epam.jdi.light.elements.interfaces.base.ICoreElement;
 import io.github.epam.TestsInit;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -32,8 +33,16 @@ public void dynamicGridListTest() {
         dynamicGridList.shouldBe().visible();
 
         dynamicGridList.has().cols(4)
-                .and().rowHeight("100px")
-                .and().gutterSize("10px");
+            .and().rowHeight("100px")
+            .and().gutterSize("10px")
+            .and().notEmpty()
+            .and().size(4)
+            .and().itemsWithTexts("One", "Grid tile with avatar", "Mat Grid Header\nThree\nMat Grid Footer", "Four")
+            .and().textsInItems("One", "Four")
+            .each(ICoreElement::isVisible)
+            .noOne(e -> e.text().equals("Zero"))
+            .onlyOne(e -> e.text().equals("One"))
+            .any(e -> e.rowspan() == 1);
 
         dynamicGridList.tiles().forEach(e -> e.is().visible());
 
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index ca2ea166b5..795594d3ce 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -1,12 +1,24 @@
 package com.epam.jdi.light.angular.asserts.gridlist;
 
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
+import static com.epam.jdi.light.common.Exceptions.runtimeException;
+import static com.jdiai.tools.LinqUtils.first;
+import static com.jdiai.tools.LinqUtils.single;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 
 import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
+import com.epam.jdi.light.angular.elements.complex.gridlist.GridTile;
 import com.epam.jdi.light.asserts.generic.UISelectAssert;
 import com.epam.jdi.light.common.JDIAction;
+import com.jdiai.tools.LinqUtils;
+import com.jdiai.tools.func.JFunc1;
 import org.hamcrest.Matchers;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class GridListAssert extends UISelectAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
@@ -28,4 +40,123 @@ public GridListAssert gutterSize(String expectedGutterSize) {
         jdiAssert(element().gutterSize(), Matchers.is(expectedGutterSize));
         return this;
     }
+
+    /**
+     * Checks that Grid List has given size.
+     *
+     * @param size expected size
+     * @return the same assert for chaining
+     */
+    @JDIAction(value = "Assert that '{name}' has size {0}", isAssert = true)
+    public GridListAssert size(int size) {
+        jdiAssert(element().tiles().size(), Matchers.is(size));
+        return this;
+    }
+
+    /**
+     * Checks that Grid List is empty.
+     * @return the same assert for chaining
+     */
+    @JDIAction(value = "Assert that '{name}' is empty", isAssert = true)
+    public GridListAssert empty() {
+        jdiAssert(element().tiles().isEmpty(), Matchers.is(true), "List is not empty");
+        return this;
+    }
+
+    /**
+     * Checks that Grid List is not empty.
+     * @return the same assert for chaining
+     */
+    @JDIAction(value = "Assert that '{name}' is not empty", isAssert = true)
+    public GridListAssert notEmpty() {
+        jdiAssert(element().tiles().isEmpty(), Matchers.is(false), "List is empty");
+        return this;
+    }
+
+    /**
+     * Checks that list contains only items with given texts.
+     *
+     * @param itemTexts expected items
+     * @return the same assert for chaining
+     */
+    @JDIAction(value = "Assert that '{name}' contains all items with texts '{0}'", isAssert = true)
+    public GridListAssert itemsWithTexts(String... itemTexts) {
+        if (itemTexts.length == 0) {
+            throw runtimeException("Set containing expected item names should not be empty");
+        } else {
+            List<String> expList = Arrays.asList(itemTexts);
+            List<GridTile> items = element().tiles();
+            String[] notExistsTexts = items.stream()
+                .map(el -> el.core().text())
+                .filter(s -> !expList.contains(s))
+                .toArray(String[]::new);
+            jdiAssert(notExistsTexts, Matchers.emptyArray());
+            return this;
+        }
+    }
+
+    /**
+     * Checks that Grid List contains given texts in tiles.
+     *
+     * @param itemTexts expected items
+     * @return the same assert for chaining
+     */
+    @JDIAction(value = "Assert that '{name}' contains items with texts '{0}'", isAssert = true)
+    public GridListAssert textsInItems(String... itemTexts) {
+        if (itemTexts.length == 0) {
+            throw runtimeException("Set containing expected item names should not be empty");
+        } else {
+            List<String> expList = Arrays.asList(itemTexts);
+            List<String> items = element().tiles().stream().map(GridTile::text).collect(Collectors.toList());
+            String[] notExistsTexts = expList.stream()
+                .filter(s -> !items.contains(s))
+                .toArray(String[]::new);
+            jdiAssert(notExistsTexts, Matchers.emptyArray());
+            return this;
+        }
+    }
+
+    /**
+     * Check that all elements meet condition
+     * @param condition to compare
+     * @return DataListAssert
+     */
+    @JDIAction("Assert that each of '{name}' elements meet condition")
+    public GridListAssert each(JFunc1<GridTile, Boolean> condition) {
+        jdiAssert(LinqUtils.all(element().tiles(), condition::execute), Matchers.is(true), "Not all elements meet condition");
+        return this;
+    }
+
+    /**
+     * Check that at least one element meets condition
+     * @param condition to compare
+     * @return DataListAssert
+     */
+    @JDIAction("Assert that any of '{name}' elements meet condition")
+    public GridListAssert any(JFunc1<GridTile, Boolean> condition) {
+        jdiAssert(LinqUtils.any(element().tiles(), condition::execute), Matchers.is(true), "None of elements meets condition");
+        return this;
+    }
+
+    /**
+     * Check that only one of elements meets condition
+     * @param condition to compare
+     * @return DataListAssert
+     */
+    @JDIAction("Assert that only one of '{name}' elements meet condition")
+    public GridListAssert onlyOne(JFunc1<GridTile, Boolean> condition) {
+        jdiAssert(single(element().tiles(), condition::execute), Matchers.is(notNullValue()));
+        return this;
+    }
+
+    /**
+     * Check that none of elements meets condition
+     * @param condition to compare
+     * @return DataListAssert
+     */
+    @JDIAction("Assert that none of '{name}' meet condition")
+    public GridListAssert noOne(JFunc1<GridTile, Boolean> condition) {
+        jdiAssert(first(element().tiles(), condition::execute), Matchers.is(nullValue()));
+        return this;
+    }
 }

From 1f0dd27f71f8d7a7c050ac04252849cb3425384f Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Thu, 8 Feb 2024 21:22:18 +0700
Subject: [PATCH 27/30] removed methods itemsWithTexts and textsInItems

---
 .../tests/elements/complex/GridListTests.java |  2 -
 .../asserts/gridlist/GridListAssert.java      | 48 -------------------
 2 files changed, 50 deletions(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index 1ffb76beca..b73b7e3f53 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -37,8 +37,6 @@ public void dynamicGridListTest() {
             .and().gutterSize("10px")
             .and().notEmpty()
             .and().size(4)
-            .and().itemsWithTexts("One", "Grid tile with avatar", "Mat Grid Header\nThree\nMat Grid Footer", "Four")
-            .and().textsInItems("One", "Four")
             .each(ICoreElement::isVisible)
             .noOne(e -> e.text().equals("Zero"))
             .onlyOne(e -> e.text().equals("One"))
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index 795594d3ce..11038b5568 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -1,7 +1,6 @@
 package com.epam.jdi.light.angular.asserts.gridlist;
 
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
-import static com.epam.jdi.light.common.Exceptions.runtimeException;
 import static com.jdiai.tools.LinqUtils.first;
 import static com.jdiai.tools.LinqUtils.single;
 import static org.hamcrest.Matchers.notNullValue;
@@ -15,10 +14,6 @@
 import com.jdiai.tools.func.JFunc1;
 import org.hamcrest.Matchers;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class GridListAssert extends UISelectAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
@@ -73,49 +68,6 @@ public GridListAssert notEmpty() {
         return this;
     }
 
-    /**
-     * Checks that list contains only items with given texts.
-     *
-     * @param itemTexts expected items
-     * @return the same assert for chaining
-     */
-    @JDIAction(value = "Assert that '{name}' contains all items with texts '{0}'", isAssert = true)
-    public GridListAssert itemsWithTexts(String... itemTexts) {
-        if (itemTexts.length == 0) {
-            throw runtimeException("Set containing expected item names should not be empty");
-        } else {
-            List<String> expList = Arrays.asList(itemTexts);
-            List<GridTile> items = element().tiles();
-            String[] notExistsTexts = items.stream()
-                .map(el -> el.core().text())
-                .filter(s -> !expList.contains(s))
-                .toArray(String[]::new);
-            jdiAssert(notExistsTexts, Matchers.emptyArray());
-            return this;
-        }
-    }
-
-    /**
-     * Checks that Grid List contains given texts in tiles.
-     *
-     * @param itemTexts expected items
-     * @return the same assert for chaining
-     */
-    @JDIAction(value = "Assert that '{name}' contains items with texts '{0}'", isAssert = true)
-    public GridListAssert textsInItems(String... itemTexts) {
-        if (itemTexts.length == 0) {
-            throw runtimeException("Set containing expected item names should not be empty");
-        } else {
-            List<String> expList = Arrays.asList(itemTexts);
-            List<String> items = element().tiles().stream().map(GridTile::text).collect(Collectors.toList());
-            String[] notExistsTexts = expList.stream()
-                .filter(s -> !items.contains(s))
-                .toArray(String[]::new);
-            jdiAssert(notExistsTexts, Matchers.emptyArray());
-            return this;
-        }
-    }
-
     /**
      * Check that all elements meet condition
      * @param condition to compare

From 9eb0550107aebba1c817a6fbbfed3545337305b8 Mon Sep 17 00:00:00 2001
From: Vladimir Klonin <57947006+vklonin@users.noreply.github.com>
Date: Fri, 9 Feb 2024 09:29:06 +0300
Subject: [PATCH 28/30] Update
 jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java

Co-authored-by: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
---
 .../epam/jdi/light/angular/asserts/gridlist/GridListAssert.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index 11038b5568..988a981d35 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -16,7 +16,7 @@
 
 public class GridListAssert extends UISelectAssert<GridListAssert, GridList> {
 
-    @JDIAction("Assert that '{name}' has number of columns '{0}'")
+    @JDIAction(value = "Assert that '{name}' has number of columns '{0}'", isAssert = true)
     public GridListAssert cols(int expectedCols) {
         jdiAssert(element().cols(), Matchers.is(expectedCols),
             String.format("\nActual number of columns in Grid List: '%s'\n" +

From eae91ea5cbcd8fcb13802c948e7d559e385799d4 Mon Sep 17 00:00:00 2001
From: Vladimir Klonin <57947006+vklonin@users.noreply.github.com>
Date: Fri, 9 Feb 2024 09:30:34 +0300
Subject: [PATCH 29/30] Update
 jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java

Co-authored-by: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>
---
 .../epam/angular/tests/elements/complex/GridListTests.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index b73b7e3f53..4369f452dd 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -45,7 +45,7 @@ public void dynamicGridListTest() {
         dynamicGridList.tiles().forEach(e -> e.is().visible());
 
         dynamicGridList.tileByIndex(1)
-            .is().text("One")
+            .has().text("One")
             .and().colspan(3)
             .and().rowspan(1);
 

From 969e8022f52f40e617bcd96f2fc312359d2a785d Mon Sep 17 00:00:00 2001
From: Alina Lysenko <LysenkoAliAli@gmail.com>
Date: Wed, 14 Feb 2024 04:04:05 +0800
Subject: [PATCH 30/30] added custom tile, fixed empty matcher, removed
 mismatch message

---
 .../com/custom/elements/CustomGridTileWithImage.java | 11 +++++++++++
 .../main/java/io/github/com/pages/GridListPage.java  |  4 ++++
 .../tests/elements/complex/GridListTests.java        | 12 ++++++------
 .../angular/asserts/gridlist/GridListAssert.java     | 11 +++++------
 4 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java

diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java b/jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java
new file mode 100644
index 0000000000..1b25b923e9
--- /dev/null
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java
@@ -0,0 +1,11 @@
+package io.github.com.custom.elements;
+
+import com.epam.jdi.light.angular.elements.complex.gridlist.GridTile;
+import com.epam.jdi.light.elements.common.UIElement;
+import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
+
+public class CustomGridTileWithImage extends GridTile {
+
+    @UI("#dynamic-grid-item-avatar")
+    public UIElement image;
+}
diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
index 42c60ea199..dfd0fa3c03 100644
--- a/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
+++ b/jdi-light-angular-tests/src/main/java/io/github/com/pages/GridListPage.java
@@ -2,9 +2,13 @@
 
 import com.epam.jdi.light.angular.elements.complex.gridlist.GridList;
 import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
+import io.github.com.custom.elements.CustomGridTileWithImage;
 
 public class GridListPage extends NewAngularPage {
 
     @UI("#dynamic-grid-list")
     public static GridList dynamicGridList;
+
+    @UI("#dynamic-grid-list-two")
+    public static CustomGridTileWithImage tileWithImage;
 }
diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
index b73b7e3f53..4585d1ad9a 100644
--- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
+++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/GridListTests.java
@@ -1,7 +1,6 @@
 package io.github.epam.angular.tests.elements.complex;
 
 import com.epam.jdi.light.angular.elements.enums.AngularColors;
-import com.epam.jdi.light.elements.interfaces.base.ICoreElement;
 import io.github.epam.TestsInit;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -16,6 +15,7 @@
 import static io.github.com.enums.Colors.WHITE;
 import static io.github.com.enums.Colors.WHITE_TRANSPARENT_038;
 import static io.github.com.pages.GridListPage.dynamicGridList;
+import static io.github.com.pages.GridListPage.tileWithImage;
 
 public class GridListTests extends TestsInit {
 
@@ -37,10 +37,10 @@ public void dynamicGridListTest() {
             .and().gutterSize("10px")
             .and().notEmpty()
             .and().size(4)
-            .each(ICoreElement::isVisible)
-            .noOne(e -> e.text().equals("Zero"))
-            .onlyOne(e -> e.text().equals("One"))
-            .any(e -> e.rowspan() == 1);
+            .and().each(e -> e.isVisible())
+            .and().noOne(e -> e.text().equals("Zero"))
+            .and().onlyOne(e -> e.text().equals("One"))
+            .and().any(e -> e.rowspan() == 1);
 
         dynamicGridList.tiles().forEach(e -> e.is().visible());
 
@@ -54,7 +54,7 @@ public void dynamicGridListTest() {
             .and().colspan(1)
             .and().rowspan(2);
 
-        dynamicGridList.tileByIndex(2).find(".avatar-img").is()
+         tileWithImage.image.is()
             .attr("src","https://material.angular.io/assets/img/examples/shiba2.jpg");
 
         dynamicGridList.tileByIndex(3)
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
index 11038b5568..6d20a38b72 100644
--- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
+++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java
@@ -3,6 +3,7 @@
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
 import static com.jdiai.tools.LinqUtils.first;
 import static com.jdiai.tools.LinqUtils.single;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
@@ -18,9 +19,7 @@ public class GridListAssert extends UISelectAssert<GridListAssert, GridList> {
 
     @JDIAction("Assert that '{name}' has number of columns '{0}'")
     public GridListAssert cols(int expectedCols) {
-        jdiAssert(element().cols(), Matchers.is(expectedCols),
-            String.format("\nActual number of columns in Grid List: '%s'\n" +
-                "is not equal to expected: '%s'", element().cols(), expectedCols));
+        jdiAssert(element().cols(), Matchers.is(expectedCols));
         return this;
     }
 
@@ -54,7 +53,7 @@ public GridListAssert size(int size) {
      */
     @JDIAction(value = "Assert that '{name}' is empty", isAssert = true)
     public GridListAssert empty() {
-        jdiAssert(element().tiles().isEmpty(), Matchers.is(true), "List is not empty");
+        jdiAssert(element().tiles(), Matchers.empty());
         return this;
     }
 
@@ -62,9 +61,9 @@ public GridListAssert empty() {
      * Checks that Grid List is not empty.
      * @return the same assert for chaining
      */
-    @JDIAction(value = "Assert that '{name}' is not empty", isAssert = true)
+    @JDIAction(value = "Assert that  '{name}' is not empty", isAssert = true)
     public GridListAssert notEmpty() {
-        jdiAssert(element().tiles().isEmpty(), Matchers.is(false), "List is empty");
+        jdiAssert(element().tiles(), not(Matchers.empty()));
         return this;
     }