4952 + 4964: Angular grid list class implementation and refactoring tests #5085

b14ckster · 2023-09-27T12:58:47Z

"У нас есть enum для цветов, надо для него тоже assert сделать" - добавить использование
jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/enums/AngularColors.java

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

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

…s_implementation # Conflicts: # jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java

…s_implementation

and moved to common folder with gridList Tests updated basic grid list removed from tests

…s_implementation

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

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

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

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

…s_implementation

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

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

… method

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

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

pnatashap · 2024-02-08T17:13:17Z

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

+    @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" +


стандартное сообщение матчера нормальное, к нему все привыкли

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

pnatashap · 2024-02-08T17:15:38Z

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

+     */
+    @JDIAction(value = "Assert that '{name}' is empty", isAssert = true)
+    public GridListAssert empty() {
+        jdiAssert(element().tiles().isEmpty(), Matchers.is(true), "List is not empty");


есть матчер для пустой коллекции

сообщение List is not empty не понятно, какой такой лист? мы tile проверяем, вот и написать, что tile есть или нет

pnatashap · 2024-02-08T17:20:45Z

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

+     */
+    @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");


я может что-то не поняла, а почему мы не используем Matcher.allOf и с матчером внутри?
сообщение, что не все элементы невозможно потом понять, потому что инфа, что собственно не прошло, теряется, зачем перебивать сообщение об ошибке родное? и делать его нечитаемым?

pnatashap · 2024-02-08T17:21:47Z

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

+            .and().gutterSize("10px")
+            .and().notEmpty()
+            .and().size(4)
+            .each(ICoreElement::isVisible)


стиль кода поехал, давайте единообразно писать

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

pnatashap · 2024-02-08T17:24:22Z

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

+            .and().colspan(1)
+            .and().rowspan(2);
+
+        dynamicGridList.tileByIndex(2).find(".avatar-img").is()


не надо вот такое писать, кастомный локатор в тесте - плохая практика, мы тут пытаемся показать, как это используется правильно.
правильный метод - сделать кастомный tile с валидатором

…erts/gridlist/GridListAssert.java Co-authored-by: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>

…ests/elements/complex/GridListTests.java Co-authored-by: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>

…tation' into angular_grid_list_class_implementation

pnatashap · 2024-02-13T21:47:23Z

...light-angular-tests/src/main/java/io/github/com/custom/elements/CustomGridTileWithImage.java

+public class CustomGridTileWithImage extends GridTile {
+
+    @UI("#dynamic-grid-item-avatar")
+    public UIElement image;


я скоро добавлю в checkstyle условие, чтобы никто не писал, что image имеет тип UIElement

b14ckster added Angular Refactoring code refactoring ReWork labels Sep 27, 2023

b14ckster requested review from pnatashap and vklonin September 27, 2023 12:58

b14ckster self-assigned this Sep 27, 2023

This was linked to issues Sep 27, 2023

Tests refactoring: grid list element #4952

Open

Create class implementing angular element Grid list #4964

Open

pnatashap requested changes Oct 12, 2023

View reviewed changes

b14ckster added 11 commits October 13, 2023 14:27

add grid list implementation and refactor tests

a18ae08

add grid list implementation and add tests

95a1554

refactor code

e32700e

refactor code and implement using new page

eac88c8

implement grid list class and refactor tests

854d3a2

refactor imports and enum

4478d36

refactor unit tests

260fab6

refactor tests and Element Object

dc4d9c9

hot fix Colors

e407e9b

grid list tests refactoring

dd6abf5

refactor asserts

f2f26c5

b14ckster force-pushed the angular_grid_list_class_implementation branch from 520353e to f2f26c5 Compare October 13, 2023 15:00

pnatashap requested changes Oct 13, 2023

View reviewed changes

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/GridList.java Outdated Show resolved Hide resolved

MayaElf unassigned b14ckster Oct 18, 2023

MayaElf added 2 commits October 18, 2023 17:08

4952-64-refactoringGridListAfterRebase

b2d62cd

4952-64-refactoringGridListAfterRebase

b2f8717

MayaElf changed the title ~~4952 + 4964: Angular grid list class implementation and refactoring tests~~ [WIP]4952 + 4964: Angular grid list class implementation and refactoring tests Oct 18, 2023

MayaElf assigned AlinaLysenko Nov 10, 2023

AlinaLysenko added 3 commits November 29, 2023 00:08

Merge branch 'angular_rework_development' into angular_grid_list_clas…

5be7585

…s_implementation # Conflicts: # jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java

Merge branch 'angular_rework_development' into angular_grid_list_clas…

32ebfa6

…s_implementation

gridTile implemented with header, footer and avatar

d1f6926

and moved to common folder with gridList Tests updated basic grid list removed from tests

AlinaLysenko added 4 commits December 26, 2023 19:22

added background colors

c20c5d8

text method updated

763b7b9

Merge branch 'angular_rework_development' into angular_grid_list_clas…

473ff98

…s_implementation

option to implement extending UIListBase

7125245

pnatashap requested changes Jan 5, 2024

View reviewed changes

AlinaLysenko added 2 commits January 5, 2024 19:23

removed creating variables for actual values for asserts

1aa6a2d

added getting footer and header as uiElement. No extra asserts added

42db430

AlinaLysenko reviewed Jan 5, 2024

View reviewed changes

jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/gridlist/GridListAssert.java Show resolved Hide resolved

AlinaLysenko requested a review from pnatashap January 5, 2024 17:41

pnatashap requested a review from AlinaLysenko January 5, 2024 21:36

AlinaLysenko requested a review from spbqaru January 11, 2024 10:40

spbqaru approved these changes Jan 16, 2024

View reviewed changes

AlinaLysenko added 2 commits January 17, 2024 00:28

fixed text colors and added names for tiles

f219d10

Merge branch 'angular_rework_development' into angular_grid_list_clas…

2aab439

…s_implementation

vklonin reviewed Feb 2, 2024

View reviewed changes

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java Outdated Show resolved Hide resolved

vklonin reviewed Feb 2, 2024

View reviewed changes

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

added get content option, removed "in pixels" and changed tileByIngex…

7720301

… method

pnatashap requested changes Feb 2, 2024

View reviewed changes

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridList.java Show resolved Hide resolved

...ght-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/gridlist/GridTile.java Outdated Show resolved Hide resolved

AlinaLysenko added 3 commits February 3, 2024 04:59

removed content option, and separated getting tiles in stream and list

bb6f030

added assertions for grid list and test examples for it

b67c3ba

removed methods itemsWithTexts and textsInItems

1f0dd27

vklonin requested a review from pnatashap February 8, 2024 16:47

vklonin approved these changes Feb 8, 2024

View reviewed changes

pnatashap requested changes Feb 8, 2024

View reviewed changes

vklonin and others added 4 commits February 9, 2024 09:29

Update jdi-light-angular/src/main/java/com/epam/jdi/light/angular/ass…

9eb0550

…erts/gridlist/GridListAssert.java Co-authored-by: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>

Update jdi-light-angular-tests/src/test/java/io/github/epam/angular/t…

eae91ea

…ests/elements/complex/GridListTests.java Co-authored-by: Natalia Pozhidaeva <Natalia_Pozhidaeva@epam.com>

added custom tile, fixed empty matcher, removed mismatch message

969e802

Merge remote-tracking branch 'origin/angular_grid_list_class_implemen…

50a42ae

…tation' into angular_grid_list_class_implementation

pnatashap requested changes Feb 13, 2024

View reviewed changes

vklonin self-requested a review February 14, 2024 07:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

4952 + 4964: Angular grid list class implementation and refactoring tests #5085

4952 + 4964: Angular grid list class implementation and refactoring tests #5085

b14ckster commented Sep 27, 2023 •

edited

pnatashap Feb 8, 2024

pnatashap Feb 8, 2024

pnatashap Feb 8, 2024

pnatashap Feb 8, 2024

pnatashap Feb 8, 2024

pnatashap Feb 13, 2024

4952 + 4964: Angular grid list class implementation and refactoring tests #5085

Are you sure you want to change the base?

4952 + 4964: Angular grid list class implementation and refactoring tests #5085

Conversation

b14ckster commented Sep 27, 2023 • edited

pnatashap Feb 8, 2024

Choose a reason for hiding this comment

pnatashap Feb 8, 2024

Choose a reason for hiding this comment

pnatashap Feb 8, 2024

Choose a reason for hiding this comment

pnatashap Feb 8, 2024

Choose a reason for hiding this comment

pnatashap Feb 8, 2024

Choose a reason for hiding this comment

pnatashap Feb 13, 2024

Choose a reason for hiding this comment

b14ckster commented Sep 27, 2023 •

edited