Rework List item group

jdi-testing · Jan 9, 2024 · d6ad14b · d6ad14b · 0pdd · Jan 9, 2024
1 parent b5a185d
commit d6ad14b
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 36 deletions.
diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ListItemAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/ListItemAssert.java
@@ -12,7 +12,8 @@
 /**
  * Assertions for {@link ListItem}
  */
-public class ListItemAssert extends UIAssert<ListItemAssert, ListItem> implements ITextAssert<ListItemAssert> {
+public class ListItemAssert extends UIAssert<ListItemAssert, ListItem>
+        implements ITextAssert<ListItemAssert> {
 
     @Override
     @JDIAction(value = "Assert that '{name}' is displayed", isAssert = true)

diff --git a/...vuetify/asserts/ListItemGroupsAssert.java → .../vuetify/asserts/ListItemGroupAssert.java b/...vuetify/asserts/ListItemGroupsAssert.java → .../vuetify/asserts/ListItemGroupAssert.java
@@ -1,95 +1,109 @@
 package com.epam.jdi.light.vuetify.asserts;
 
-import com.epam.jdi.light.asserts.generic.UIAssert;
 import com.epam.jdi.light.common.JDIAction;
 import com.epam.jdi.light.vuetify.elements.complex.ListItemGroup;
-import com.epam.jdi.light.asserts.generic.ColorAssert;
 import com.epam.jdi.light.vuetify.interfaces.asserts.FlatAssert;
-import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert;
 import org.hamcrest.Matchers;
 
 import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert;
 
 
-public class ListItemGroupsAssert extends UIAssert<ListItemGroupsAssert, ListItemGroup> implements
-        FlatAssert<ListItemGroupsAssert, ListItemGroup>, ColorAssert<ListItemGroupsAssert, ListItemGroup>,
-        ThemeAssert<ListItemGroupsAssert, ListItemGroup> {
+public class ListItemGroupAssert extends ListItemAssert implements
+        FlatAssert<ListItemGroupAssert, ListItemGroup> {
+
+    @Override
+    public ListItemGroup element() {
+        return (ListItemGroup) super.element();
+    }
+
+    public ListItemGroupAssert set(ListItemGroup element) {
+        super.set(element);
+        return this;
+    }
+
+    public ListItemGroupAssert and() {
+        super.and();
+        return this;
+    }
+
 
     @JDIAction(value = "Assert that '{name}' is active", isAssert = true)
-    public ListItemGroupsAssert active() {
+    public ListItemGroupAssert active() {
         jdiAssert(element().isActive(), Matchers.is(true), "ListItemGroup is not active");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' is not active", isAssert = true)
-    public ListItemGroupsAssert notActive() {
+    public ListItemGroupAssert notActive() {
         jdiAssert(element().isActive(), Matchers.is(false), "ListItemGroup is active");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' has title", isAssert = true)
-    public ListItemGroupsAssert title() {
-        jdiAssert(element().hasTitle(), Matchers.is(true), "ListItemGroup has no title");
+    public ListItemGroupAssert title() {
+        jdiAssert(element().header().isExist(), Matchers.is(true), "ListItemGroup has no title");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' has no title", isAssert = true)
-    public ListItemGroupsAssert noTitle() {
-        jdiAssert(element().hasTitle(), Matchers.is(false), "ListItemGroup has title");
+    public ListItemGroupAssert noTitle() {
+        jdiAssert(element().header().isExist(), Matchers.is(false), "ListItemGroup has title");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' has border", isAssert = true)
-    public ListItemGroupsAssert border() {
+    public ListItemGroupAssert border() {
         jdiAssert(element().hasBorder(), Matchers.is(true), "ListItemGroup has no border");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' has not border", isAssert = true)
-    public ListItemGroupsAssert noBorder() {
+    public ListItemGroupAssert noBorder() {
         jdiAssert(element().hasBorder(), Matchers.is(false), "ListItemGroup has border");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' has icon", isAssert = true)
-    public ListItemGroupsAssert icon() {
+    public ListItemGroupAssert icon() {
         jdiAssert(element().hasIcon(), Matchers.is(true), "ListItemGroup does not have icon");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' has no icon", isAssert = true)
-    public ListItemGroupsAssert noIcon() {
+    public ListItemGroupAssert noIcon() {
         jdiAssert(element().hasIcon(), Matchers.is(false), "ListItemGroup has icon");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' contains text '{0}'", isAssert = true)
-    public ListItemGroupsAssert containsText(String text) {
+    public ListItemGroupAssert containsText(String text) {
         jdiAssert(element().getText(), Matchers.containsString(text));
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' is a sub-group", isAssert = true)
-    public ListItemGroupsAssert subGroup() {
+    public ListItemGroupAssert subGroup() {
         jdiAssert(element().isSubgroup(), Matchers.is(true), "ListItemGroup is not a sub-group");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' is not a sub-group", isAssert = true)
-    public ListItemGroupsAssert notSubGroup() {
+    public ListItemGroupAssert notSubGroup() {
         jdiAssert(element().isSubgroup(), Matchers.is(false), "ListItemGroup is sub-group");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' is no-action", isAssert = true)
-    public ListItemGroupsAssert noAction() {
+    public ListItemGroupAssert noAction() {
         jdiAssert(element().isNoAction(), Matchers.is(true), "ListItemGroup is not no-action");
         return this;
     }
 
     @JDIAction(value = "Assert that '{name}' is not no-action", isAssert = true)
-    public ListItemGroupsAssert notNoAction() {
+    public ListItemGroupAssert notNoAction() {
         jdiAssert(element().isNoAction(), Matchers.is(false), "ListItemGroup is no-action");
         return this;
     }
+
+
 }
diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ItemGroup.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ItemGroup.java
@@ -8,7 +8,7 @@
 
 public class ItemGroup extends UIListBase<ItemGroupAssert> implements HasTheme {
 
-    //Interface IsMultiple is not applicable here, as there is no "--is-multi"
+    // @todo #5298 Implement get selected items function Interface IsMultiple is not applicable here, as there is no "--is-multi"
 
     @Override
     @JDIAction("Is item '{0}' selected in {name}")

diff --git a/...ight-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ListItemGroup.java b/...ight-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ListItemGroup.java
@@ -1,26 +1,30 @@
 package com.epam.jdi.light.vuetify.elements.complex;
 
 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.HasClick;
-import com.epam.jdi.light.vuetify.asserts.ListItemGroupsAssert;
+import com.epam.jdi.light.vuetify.asserts.ListItemGroupAssert;
 import com.epam.jdi.light.elements.interfaces.base.HasColor;
-import com.epam.jdi.light.vuetify.interfaces.HasIcon;
-import com.epam.jdi.light.vuetify.interfaces.HasTheme;
+import com.epam.jdi.light.vuetify.elements.common.ListItem;
 import com.epam.jdi.light.vuetify.interfaces.IsFlat;
+import org.openqa.selenium.By;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * To see an example of Lists web element please visit
  * https://vuetifyjs.com/en/components/list-item-groups/
  */
 
-public class ListItemGroup extends UIBaseElement<ListItemGroupsAssert> implements HasClick, HasIcon, IsFlat, HasColor,
-        HasTheme {
+public class ListItemGroup extends ListItem implements IsFlat {
 
     @Override
-    public ListItemGroupsAssert is() {
-        return new ListItemGroupsAssert().set(this);
+    public ListItemGroupAssert is() {
+        return (ListItemGroupAssert) new ListItemGroupAssert().set(this);
+    }
+
+    @JDIAction("Get header item for {name}")
+    public ListItem header() {
+        return new ListItem().setCore(ListItem.class, core().find(".v-list-group__header"));
     }
 
     @JDIAction("Get if '{name}' is active")
@@ -49,6 +53,13 @@ public boolean isSubgroup() {
     public boolean isNoAction() {
         return core().hasClass("v-list-group--no-action");
     }
+
+    @JDIAction()
+    public List<ListItem> items() {
+        return core().finds(By.cssSelector(".v-list-item:not(.v-list-group__header)"))
+                .stream().map(e -> new ListItem().setCore(ListItem.class, e))
+                .collect(Collectors.toList());
+    }
 }
 
 
diff --git a/...ight-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/VuetifyList.java b/...ight-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/VuetifyList.java
@@ -28,6 +28,11 @@
  */
 public class VuetifyList extends UIBaseElement<VuetifyListAssert> implements ICoreElement, HasTheme, HasElevation,
         IsDense, IsFlat, HasRounded, IsShaped {
+
+    private final String groupLocator = ".v-list-group";
+    private final String itemLocator = ".v-list-item";
+
+
     @Override
     public VuetifyListAssert is() {
         return new VuetifyListAssert().set(this);
@@ -60,7 +65,7 @@ public ListItem item(String title) {
      * @return items as {@link WebList}
      */
     protected WebList itemsWebList() {
-        return core().finds(".v-list-item");
+        return core().finds(itemLocator);
     }
 
     /**
@@ -118,17 +123,23 @@ public int size() {
 
     @JDIAction("Get '{name}' groups")
     public List<VuetifyListGroup> groups() {
-        return core().finds(".v-list-group").stream()
+        return core().finds(groupLocator).stream()
                 .map(e -> new VuetifyListGroup().setCore(VuetifyListGroup.class, e))
                 .collect(Collectors.toList());
     }
     @JDIAction("Get '{name}' group with '{0}' title ")
     public VuetifyListGroup group(String title) {
-        return core().finds(".v-list-group").stream()
+        return core().finds(groupLocator).stream()
                 .map(e -> new VuetifyListGroup().setCore(VuetifyListGroup.class, e))
                 .filter(e -> e.header().text().equals(title)).findFirst().orElse(null);
     }
 
+    @JDIAction("Get '{name}' group with '{0}' index ")
+    public VuetifyListGroup group(int index) {
+        return new VuetifyListGroup().
+                setCore(VuetifyListGroup.class, core().finds(groupLocator).get(index));
+    }
+
     @Override
     @JDIAction("Get if '{name}' is disabled")
     public boolean isDisabled() {