#4926: Tests refactoring: Paginator element #5386

Kate-Semenova · 2024-01-26T17:30:12Z

Refactored tests for PaginatorTests
Added new ones to cover the following features:
firstPageLabel: string
lastPageLabel: string
color: ThemePalette
disabled: boolean
hidePageSize: boolean
length: number
pageIndex: number
showFirstLastButtons: boolean

pnatashap · 2024-01-26T18:25:54Z

@Kate-Semenova there are style errors, as you can see from the automatic checks

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

pnatashap · 2024-01-29T14:38:18Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+    }
+
+    @Override
+    @JDIAction(value = "Is '{name}' expanded", level = DEBUG, timeout = 0)


Why we do not want to wait till it will be opened?

copied-pasted. ill remove waiters

pnatashap · 2024-01-29T14:39:33Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+
+    public PaginatorSelector() {
+        super();
+        cdkOverlayContainer.backdropSelectPanel = "div.mat-mdc-select-panel";


Suggested change

cdkOverlayContainer.backdropSelectPanel = "div.mat-mdc-select-panel";

cdkOverlayContainer.backdropSelectPanelLocaltor = "div.mat-mdc-select-panel";

I chose not to add any changes to the existing com.epam.jdi.light.angular.elements.composite.MaterialSelectorContainer, especially as it is in progress within PR #5096

неправильная иерархия и все

pnatashap · 2024-01-29T14:41:42Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+        return this.core();
+    }
+
+    @JDIAction("Get '{name}' selected value from selector")


Result is toogle text. On previous method it is called toggle, now it is selected value, below we can see a method "selectedElement" and it has absolutely different search logic.
All the name must be aligned and clear

так и не исправлено

pnatashap · 2024-01-29T14:42:30Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

-    @Override
-    public PaginatorAssert is() {
-        return new PaginatorAssert().set(this);
+    @JDIAction("Get COLOR for selected value in the list of options for '{name}'")


Suggested change

@JDIAction("Get COLOR for selected value in the list of options for '{name}'")

@JDIAction("Get color for selected value in the list of options for '{name}'")

pnatashap · 2024-01-29T14:44:46Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

-    public PaginatorAssert is() {
-        return new PaginatorAssert().set(this);
+    @JDIAction("Get COLOR for selected value in the list of options for '{name}'")
+    public String colorInList() {


Method name is not correct: according to the code we see that color is from selected element (typically they are differ)

pnatashap · 2024-01-29T14:48:19Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

+    }
+
+    @JDIAction("Get if '{name}' has first and last page buttons shown")
+    public boolean showFirstLastButtons() {


show means an action, methods change nothing. Must be renamed

pnatashap · 2024-01-29T14:49:39Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

-        return next.isEnabled();
+    @JDIAction("Get COLOR theme for '{name}'")
+    public AngularColors color() {
+        final AngularColors color = AngularColors.fromName(core().attr("color"));


Not all colors can exists in our table, it can be customer color, we should be still able to get it

pnatashap · 2024-01-29T14:50:21Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

-    public void next() {
-        next.click();
+    @JDIAction("Get COLOR of selector`s boarder for '{name}'")
+    public String colorOfBoarder() {


Suggested change

public String colorOfBoarder() {

public String borderColor() {

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

pnatashap · 2024-01-29T14:53:03Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

+    private static final String PAGINATOR_PAGE_SIZE_SECTION_LOCATOR = ".mat-mdc-paginator-page-size";
+    private static final String ITEM_PER_PAGE_SELECTOR_LOCATOR = "mat-select";
+    private final PaginatorSelector itemPerPageSelector;
+    private static final Pattern PATTERN = Pattern.compile("^(\\d+)( . (\\d+))? .+ (\\d+)");


Patter for what?

...ngular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/PaginatorTests.java

pnatashap · 2024-01-31T16:28:36Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+        return this.core();
+    }
+
+    @JDIAction("Get '{name}' selected value from selector")


так и не исправлено

pnatashap · 2024-01-31T16:36:34Z

...ngular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/PaginatorTests.java

+    private static final int STEP = 100;
+    private static final int PAGE_SIZE = 10;
+    private static final int LENGTH = STEP * PAGE_SIZE - new Random().nextInt(STEP);
+    private static final String RANGE_PATTERN = "%d - %d / %d";

    @BeforeMethod


Suggested change

@BeforeMethod

@BeforeClass

pnatashap · 2024-01-31T16:37:48Z

...ngular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/PaginatorTests.java

    public void labelPaginationTest() {
-        paginator.has().label("Items per page:");
+        paginatorConfigurable.has().itemPerPageLabel("Items per page:");


Suggested change

paginatorConfigurable.has().itemPerPageLabel("Items per page:");

paginatorConfigurable.has().pageSizeLabel("Items per page:");

pnatashap · 2024-01-31T16:39:32Z

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

+
+    @JDIAction(value = "Assert that '{name}' has '{0}' color theme", isAssert = true)
+    public PaginatorAssert colorTheme(final AngularColors value) {
+        final AngularColors color = AngularColors.fromName(element().colorTheme());


получение цвета должно быть в jdiAssert
и везде ниже тоже

pnatashap · 2024-01-31T16:41:19Z

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

+    }
+
+    @JDIAction(value = "Assert that '{name}' has page index of {0}", isAssert = true)
+    public PaginatorAssert totalNumberOfItems(int length) {


кто такие Items в этом методе?

oh, sorry. Я не отредактировала документацию. Total number of items that are being paginated. Возможно, имеет смысл оставить как "length"

Я точно исправлю JDIAction и подумаю, как лучше назвать метод

pnatashap · 2024-01-31T16:42:18Z

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

-    public void previousEnabled() {
-        jdiAssert(element().isPreviousEnabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
+    public PaginatorAssert previousEnabled() {
+        jdiAssert(element().previousButton().isEnabled() ? "enabled" : "disabled", Matchers.equalTo("enabled"));


не надо сравнивать строки, сравниваем boolean и пишем нормальное сообщение об ошибке

и ниже тоже

pnatashap · 2024-01-31T16:43:44Z

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

    }

    @JDIAction(value = "Assert that previous button enabled for '{name}'", isAssert = true)
-    public void previousEnabled() {
-        jdiAssert(element().isPreviousEnabled(), Matchers.is(true), "ERROR MESSAGE IS REQUIRED");
+    public PaginatorAssert previousEnabled() {


Suggested change

public PaginatorAssert previousEnabled() {

public PaginatorAssert previousPageButtonEnabled() {

pnatashap · 2024-01-31T16:45:20Z

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

+    }
+
+    @JDIAction(value = "Assert that first page button displayed={0} for '{name}'", isAssert = true)
+    public PaginatorAssert firstPageDisplayed(boolean value) {


имя метода путает: в нем написано, что проверяем, оторбражается ли первая страница, а имеется ввиду отображается ли кнопка перехода к первой странице

pnatashap

и повторить ООП

pnatashap · 2024-02-12T21:40:52Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/AngularColors.java

@@ -35,8 +35,12 @@ public static AngularColors fromStyle(String styleName) {
    }

    public static AngularColors fromColor(String color) {
+        final String finalColor = color.startsWith("rgb(")
+                ? color.replace("rgb(", "rgba(").replace(")", ", 1)")


rgb мы заменяем на rgba только условно, а вот в конец мы в любом случае добавляем 1, т.е. если вход будет rgba, то он станет невалидным цветом

@pnatashap В данном случае я не до конца понимаю, что нужно менять. Отталкиваюсь в первую очередь от того, что уже есть в фреймворке, а это енам, хардкорженные значения:

pnatashap · 2024-02-12T21:41:30Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+    }
+
+    @Override
+    @JDIAction(value = "Check that '{name}' is enabled", timeout = 0)


в чем необходимость добавление 0вого timeout?

pnatashap · 2024-02-12T21:43:28Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+
+    @Override
+    @JDIAction("Expand '{name}'")
+    public void expand() {


метод путает - иногда бывает, что в paginator есть возможность увидеть номера страниц посередине, например, а тут видимо открытие выпадающего списка с размером страницы, не очевидный метод, надо переиновывать

pnatashap · 2024-02-12T21:44:42Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+    }
+
+    @JDIAction("Get '{name}' selected UIElement from the list")
+    public UIElement selectedOptionFromList() {


а почему так непонятно Option?
мы вибираем размер страницы, вот так и должен называться метод

pnatashap · 2024-02-12T21:46:30Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+
+    @Override
+    @JDIAction("Get 'name' toggle")
+    protected UIElement toggle() {


что за toggle? это просто этот элемент и ничего больше

pnatashap · 2024-02-12T21:49:50Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+
+    public PaginatorSelector() {
+        super();
+        cdkOverlayContainer.backdropSelectPanel = "div.mat-mdc-select-panel";


неправильная иерархия и все

pnatashap · 2024-02-12T21:52:59Z

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/PaginatorSelector.java

+
+import java.util.NoSuchElementException;
+
+public class PaginatorSelector extends MaterialSelector {


проблема с построением класса: этот класс не расширяет MaterialSelector, а содержит (причем опционально его, выпадающий список с размером страницы вообще может отсутствовать)
удалить наследование и излишне приписанные методы и пересмотреть все элементы и методы

pnatashap · 2024-03-09T01:25:39Z

jdi-light-angular-tests/src/main/java/io/github/com/pages/PaginatorPage.java

+    public static Input pageSizeOptionsInput;
+
+    @UI("//paginator-configurable-example//div[contains(text(),'List length:')]")
+    public static Text listLength;


this is not a listLenght, it is a full message, so can be listLenghtMessage

pnatashap · 2024-03-09T01:25:53Z

jdi-light-angular-tests/src/main/java/io/github/com/pages/PaginatorPage.java

+    @UI("//paginator-configurable-example//div[contains(text(),'List length:')]")
+    public static Text listLength;
+    @UI("//paginator-configurable-example//div[contains(text(),'Page size:')]")
+    public static Text pageSize;


the same as above

pnatashap · 2024-03-09T01:26:07Z

jdi-light-angular-tests/src/main/java/io/github/com/pages/PaginatorPage.java

+    @UI("//paginator-configurable-example//div[contains(text(),'Page size:')]")
+    public static Text pageSize;
+    @UI("//paginator-configurable-example//div[contains(text(),'Page index:')]")
+    public static Text pageIndex;


the same as above

pnatashap · 2024-03-09T01:31:49Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

+    private Pattern rangeLabelPattern = Pattern.compile("^(\\d+)( . (\\d+))? .+ (\\d+)");
+
+    @JDIAction("Set pattern for '{name}' range label")
+    public void setRangeLabelPattern(String regex) {


должно задаваться аннотацией и инициализироваться конструктором

pnatashap · 2024-03-09T01:36:41Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

-        range = new UIElement();
-        range.setLocator(rangeLocator);
+    @JDIAction("Get item per page selector for '{name}'")
+    public UIElement itemPerPageSelector() {


список должен быть вынесен в отдельный элемент, потому что в общей куче все эти методы по открыть, закрыть, получить список - выглядят странно

pnatashap · 2024-03-09T01:47:18Z

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Paginator.java

+    private static final String SELECT_PANEL_LOCATOR = "div.mat-mdc-select-panel";
+    private static final String ITEM_PER_PAGE_OPTIONS_LOCATOR = "mat-option";
+    private static final String ARIA_EXPANDED_ATTR = "aria-expanded";
+    private static final String COLOR_ATT = "color";


достаточно стандартный атрибут и кажется у нас есть интерфейс HasColor
не вижу необходимости вносить в константы

pnatashap · 2024-03-09T01:51:15Z

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


 public class PaginatorAssert extends UIAssert<PaginatorAssert, Paginator> {
    @JDIAction(value = "Assert that '{name}' has '{0}' label", isAssert = true)
-    public void label(String label) {
-        jdiAssert(element().label(), Matchers.is(label));
+    public PaginatorAssert pageSizeLabel(final String label) {


должна быть еще валидация с матчером, не только на равно

Kate-Semenova added Angular jdi-light labels Jan 26, 2024

Kate-Semenova requested a review from spbqaru January 26, 2024 17:30

Kate-Semenova self-assigned this Jan 26, 2024

Kate-Semenova linked an issue Jan 26, 2024 that may be closed by this pull request

Tests refactoring: Paginator element #4926

Open

8 tasks

Kate-Semenova force-pushed the angular-paginator-tests branch 2 times, most recently from facaf4f to 1a7c77c Compare January 29, 2024 08:59

Kate-Semenova commented Jan 29, 2024

View reviewed changes

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/PaginatorAssert.java Outdated Show resolved Hide resolved

pnatashap requested changes Jan 29, 2024

View reviewed changes

Kate-Semenova force-pushed the angular-paginator-tests branch from 53a2f76 to bc26b65 Compare January 31, 2024 12:46

Kate-Semenova requested a review from pnatashap January 31, 2024 13:30

Kate-Semenova commented Jan 31, 2024

View reviewed changes

...ngular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/PaginatorTests.java Show resolved Hide resolved

pnatashap requested changes Jan 31, 2024

View reviewed changes

Kate-Semenova force-pushed the angular-paginator-tests branch 2 times, most recently from 344222c to d55cc1d Compare February 2, 2024 13:29

Kate-Semenova requested a review from pnatashap February 12, 2024 08:42

pnatashap requested changes Feb 12, 2024

View reviewed changes

Kate-Semenova added 4 commits March 5, 2024 13:48

#4926: Tests refactoring: Paginator element

ab7732d

#4926: Tests refactoring: Paginator element fix 1

b3370dd

#4926: Tests refactoring: Paginator element fix 2

8b6f43f

#4926: Tests refactoring: Paginator element fix 3 remove hierarchy

1fc5b56

Kate-Semenova force-pushed the angular-paginator-tests branch from d55cc1d to 1fc5b56 Compare March 5, 2024 17:03

pnatashap requested changes Mar 9, 2024

View reviewed changes

	cdkOverlayContainer.backdropSelectPanel = "div.mat-mdc-select-panel";
	cdkOverlayContainer.backdropSelectPanelLocaltor = "div.mat-mdc-select-panel";

	@JDIAction("Get COLOR for selected value in the list of options for '{name}'")
	@JDIAction("Get color for selected value in the list of options for '{name}'")

	public String colorOfBoarder() {
	public String borderColor() {

	paginatorConfigurable.has().itemPerPageLabel("Items per page:");
	paginatorConfigurable.has().pageSizeLabel("Items per page:");

	public PaginatorAssert previousEnabled() {
	public PaginatorAssert previousPageButtonEnabled() {


		import java.util.NoSuchElementException;

		public class PaginatorSelector extends MaterialSelector {

#4926: Tests refactoring: Paginator element #5386

Are you sure you want to change the base?

#4926: Tests refactoring: Paginator element #5386

Conversation

Kate-Semenova commented Jan 26, 2024

pnatashap commented Jan 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pnatashap left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment