diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/EditableCalendar.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/EditableCalendar.java index de8bb12ce3..c1edae6802 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/EditableCalendar.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/EditableCalendar.java @@ -1,7 +1,6 @@ package io.github.com.custom; import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; import com.epam.jdi.light.vuetify.elements.complex.Calendar; import com.epam.jdi.light.vuetify.elements.complex.Card; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/LoadingCard.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/LoadingCard.java index 0b9e948c86..a29c00e7c0 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/LoadingCard.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/LoadingCard.java @@ -4,7 +4,6 @@ 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.epam.jdi.light.vuetify.elements.common.ProgressLinear; import com.epam.jdi.light.vuetify.elements.complex.Card; import java.util.List; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/NewItemCard.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/NewItemCard.java index 7d04af784d..1a8ac54e00 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/NewItemCard.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/cards/NewItemCard.java @@ -3,7 +3,6 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.WebList; 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.vuetify.elements.complex.Card; import org.openqa.selenium.Keys; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/tables/FilterDataIterator.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/tables/FilterDataIterator.java index cc08dee039..660baa3abf 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/tables/FilterDataIterator.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/tables/FilterDataIterator.java @@ -1,7 +1,6 @@ package io.github.com.custom.tables; import com.epam.jdi.light.elements.complex.dropdown.Dropdown; -import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.pageobjects.annotations.locators.JDropdown; import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.ui.html.elements.common.Button; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/windows/AccountCreationWindows.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/windows/AccountCreationWindows.java index 54af682a88..7d00f4fb43 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/windows/AccountCreationWindows.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/custom/windows/AccountCreationWindows.java @@ -1,9 +1,7 @@ package io.github.com.custom.windows; import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.light.elements.interfaces.base.ICoreElement; 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.vuetify.elements.common.VuetifyButton; import com.epam.jdi.light.vuetify.elements.complex.Card; import com.epam.jdi.light.vuetify.elements.complex.Windows; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/dataproviders/IconsDataProvider.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/dataproviders/IconsDataProvider.java index e919c144de..5f70309e05 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/dataproviders/IconsDataProvider.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/dataproviders/IconsDataProvider.java @@ -17,22 +17,17 @@ import static io.github.com.enums.MdiIcons.CALL_SPLIT; import static io.github.com.enums.MdiIcons.CANCEL; import static io.github.com.enums.MdiIcons.CHECKBOX_MARKED_CIRCLE; -import static io.github.com.enums.MdiIcons.CHEVRON_RIGHT; import static io.github.com.enums.MdiIcons.CLOUD_UPLOAD; import static io.github.com.enums.MdiIcons.DELETE; import static io.github.com.enums.MdiIcons.DIALPAD; import static io.github.com.enums.MdiIcons.DOMAIN; import static io.github.com.enums.MdiIcons.EMAIL; -import static io.github.com.enums.MdiIcons.FOLDER_OPEN; -import static io.github.com.enums.MdiIcons.GAVEL; -import static io.github.com.enums.MdiIcons.HOME; import static io.github.com.enums.MdiIcons.MESSAGE_TEXT; import static io.github.com.enums.MdiIcons.MINUS_CIRCLE; import static io.github.com.enums.MdiIcons.PENCIL; import static io.github.com.enums.MdiIcons.SHARE_VARIANT; import static io.github.com.enums.MdiIcons.THUMB_DOWN; import static io.github.com.enums.MdiIcons.THUMB_UP; -import static io.github.com.enums.MdiIcons.WIDGETS; import static io.github.com.enums.MdiIcons.WRENCH; public class IconsDataProvider { diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/enums/MdiIcons.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/enums/MdiIcons.java index 70466e7697..f89afa8fdf 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/enums/MdiIcons.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/enums/MdiIcons.java @@ -1,16 +1,12 @@ package io.github.com.enums; -import com.epam.jdi.light.elements.base.UIBaseElement; -import com.epam.jdi.light.vuetify.elements.common.Icon; import com.google.common.base.CaseFormat; import com.opencsv.CSVReader; import java.io.FileReader; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.stream.Collectors; public enum MdiIcons { ACCESS_POINT, diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/RatingsPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/RatingsPage.java index 28de8eb8c9..d50be75f15 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/RatingsPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/RatingsPage.java @@ -1,6 +1,5 @@ package io.github.com.pages; -import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.vuetify.annotations.JDIRating; import com.epam.jdi.light.vuetify.elements.complex.Card; diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TreeviewPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TreeviewPage.java index b1b740abc1..5b6d5638f9 100644 --- a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TreeviewPage.java +++ b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/TreeviewPage.java @@ -1,13 +1,11 @@ package io.github.com.pages; -import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.WebList; 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.vuetify.annotations.JDITreeView; import com.epam.jdi.light.vuetify.elements.common.Input; import com.epam.jdi.light.vuetify.elements.common.VueCheckbox; -import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; import com.epam.jdi.light.vuetify.elements.complex.TreeView; public class TreeviewPage extends VuetifyPage { diff --git a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/common/ProgressCircularTests.java b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/common/ProgressCircularTests.java index 4743955202..dbb634743e 100644 --- a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/common/ProgressCircularTests.java +++ b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/common/ProgressCircularTests.java @@ -67,4 +67,4 @@ public void sizeWidthProgressCircularsTests(int index, String color, int height, .width(width) .thickness(thickness); } -} \ No newline at end of file +} diff --git a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/CardsTests.java b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/CardsTests.java index 84bd3b87f7..e92a571abe 100644 --- a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/CardsTests.java +++ b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/CardsTests.java @@ -1,7 +1,6 @@ package io.github.epam.vuetify.tests.complex; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; import com.epam.jdi.light.vuetify.elements.complex.Card; import io.github.epam.TestsInit; import org.testng.annotations.BeforeClass; diff --git a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/DatePickersTests.java b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/DatePickersTests.java index 7c8b9f14d3..3be6e56174 100644 --- a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/DatePickersTests.java +++ b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/DatePickersTests.java @@ -96,8 +96,6 @@ public class DatePickersTests extends TestsInit { "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"); private LocalDate date = LocalDate.now(); private DateTimeFormatter dateFormatHeader = DateTimeFormatter.ofPattern("ccc, MMM d").withLocale(Locale.ENGLISH); - private DateTimeFormatter formatterYearHyphenMonth = - DateTimeFormatter.ofPattern("uuuu-MM").withLocale(Locale.ENGLISH); private DateTimeFormatter formatterMMDDYYYY = DateTimeFormatter.ofPattern("MM/dd/uuuu").withLocale(Locale.ENGLISH); private int currentYear = Year.now().getValue(); diff --git a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/SlideGroupsTests.java b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/SlideGroupsTests.java index 4e175bafa2..7086fb757f 100644 --- a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/SlideGroupsTests.java +++ b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/SlideGroupsTests.java @@ -15,12 +15,9 @@ import static io.github.com.pages.SlideGroupsPage.customIconsSlideGroup; import static io.github.com.pages.SlideGroupsPage.activeClassSlideGroup; import static io.github.com.pages.SlideGroupsPage.pseudoCarouselCount; -import static org.testng.Assert.assertEquals; public class SlideGroupsTests extends TestsInit { - private final int[] multipleSelectedIndexes = {1, 3}; - private final String minusIcon = ".v-icon.mdi-minus"; private final String plusIcon = ".v-icon.mdi-plus"; @@ -55,10 +52,10 @@ public void centerActiveSlideGroupTests() { centerActiveSlideGroup.slideByIndex(i).click(); centerActiveSlideGroup.has().slideSelected(i); } - for (Integer slidesPosition : slidesPositions) { - centerActiveSlideGroup.slideByIndex(4).click(); - centerActiveSlideGroup.has().slideSelected(3); - } + + centerActiveSlideGroup.slideByIndex(4).click(); + centerActiveSlideGroup.has().slideSelected(3); + for (int i = 4; i <= 6; i++) { centerActiveSlideGroup.slideByIndex(i).click(); centerActiveSlideGroup.has().slideSelected(i); diff --git a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/TabsTests.java b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/TabsTests.java index 18f5b069e4..11fb4ebfa3 100644 --- a/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/TabsTests.java +++ b/jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/TabsTests.java @@ -3,11 +3,9 @@ import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; import io.github.epam.TestsInit; import io.github.epam.vuetify.tests.data.TabsTestsDataProvider; -import org.hamcrest.Matchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.elements.common.WindowsManager.resizeWindow; import static com.jdiai.tools.Timer.waitCondition; import static io.github.com.StaticSite.tabsPage; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AspectRatiosAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AspectRatiosAssert.java index bba2900dd6..d30651151e 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AspectRatiosAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/AspectRatiosAssert.java @@ -3,7 +3,6 @@ import com.epam.jdi.light.asserts.generic.UIAssert; import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.elements.common.AspectRatios; -import com.jdiai.tools.Timer; import org.hamcrest.Matchers; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FooterAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FooterAssert.java index 770ac15a81..f4283bd7ae 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FooterAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/FooterAssert.java @@ -4,7 +4,15 @@ import com.epam.jdi.light.asserts.generic.UIAssert; import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.elements.composite.Footer; -import com.epam.jdi.light.vuetify.interfaces.asserts.*; +import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.RoundedAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ShapedAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.TileAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ContainerAssert; import org.hamcrest.Matcher; import org.hamcrest.Matchers; 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 index c1c8544dfa..f095e64efd 100644 --- 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 @@ -4,7 +4,6 @@ import com.epam.jdi.light.asserts.generic.UIAssert; import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.elements.common.ListItem; -import com.jdiai.tools.Timer; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -15,15 +14,6 @@ */ public class ListItemAssert extends UIAssert implements ITextAssert { - private static final String IS_DISPLAYED = "is displayed"; - private static final String IS_HIDDEN = "is hidden"; - private static final String IS_ACTIVE = "is active"; - private static final String IS_NOT_ACTIVE = "is not active"; - private static final String IS_CLICKABLE = "is clickable"; - private static final String IS_NOT_CLICKABLE = "is not clickable"; - private static final String IS_EXPANDED = "is expanded"; - private static final String IS_COLLAPSED = "is collapsed"; - @Override @JDIAction("Assert that '{name}' is displayed") public ListItemAssert displayed() { @@ -104,7 +94,7 @@ public ListItemAssert expanded() { /** * Checks that the list item is collapsed. - *; + * * @return this {@link ListItemAssert} instance */ @JDIAction("Assert that '{name}' is collapsed") diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationAssert.java index b8f4274f2d..96fc172d0f 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/PaginationAssert.java @@ -4,7 +4,6 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.elements.complex.Pagination; import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert; -import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert; import org.hamcrest.Matchers; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SheetAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SheetAssert.java index 83f92ad17e..3bd2610a3b 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SheetAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SheetAssert.java @@ -4,7 +4,14 @@ import com.epam.jdi.light.asserts.generic.UIAssert; import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.elements.common.Sheet; -import com.epam.jdi.light.vuetify.interfaces.asserts.*; +import com.epam.jdi.light.vuetify.interfaces.asserts.ColorAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.OutlinedAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.TileAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ShapedAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.ElevationAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.MeasurementAssert; +import com.epam.jdi.light.vuetify.interfaces.asserts.RoundedAssert; import org.hamcrest.Matcher; import org.hamcrest.Matchers; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SlideGroupAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SlideGroupAssert.java index 1d60dd154a..d3f93f57b4 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SlideGroupAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/SlideGroupAssert.java @@ -4,7 +4,6 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.elements.complex.SlideGroup; import com.epam.jdi.light.vuetify.interfaces.asserts.ThemeAssert; -import com.jdiai.tools.Timer; import org.hamcrest.Matchers; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewAssert.java index 8982f125bc..86be8f40c6 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewAssert.java @@ -6,10 +6,7 @@ import com.epam.jdi.light.vuetify.interfaces.asserts.DenseAssert; import com.epam.jdi.light.vuetify.interfaces.asserts.LoadingAssert; import org.hamcrest.Matchers; -import java.util.List; -import java.util.Map; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; -import static org.hamcrest.Matchers.equalTo; public class TreeViewAssert extends UISelectAssert implements LoadingAssert, diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewNodeAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewNodeAssert.java index 7480142a7a..3739d012d8 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewNodeAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/TreeViewNodeAssert.java @@ -10,7 +10,6 @@ import org.hamcrest.Matcher; import org.hamcrest.Matchers; import java.util.List; -import java.util.Map; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.jdiai.tools.Timer.waitCondition; import static java.util.Arrays.asList; @@ -106,7 +105,6 @@ public TreeViewNodeAssert notMarked() { @JDIAction("Assert that '{0}' values checked in '{name}'") public TreeViewNodeAssert checked(Matcher> values) { - List actualCheckedValues = element().checked(); jdiAssert(element().checked(), values); return this; } diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyListGroupAssert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyListGroupAssert.java index 418a9bb8bc..6d2167429a 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyListGroupAssert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/VuetifyListGroupAssert.java @@ -22,7 +22,7 @@ public VuetifyListGroupAssert expanded() { /** * Checks that the list item is collapsed. - *; + * * @return this {@link VuetifyListGroupAssert} instance */ @JDIAction("Assert that '{name}' is collapsed") diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Alert.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Alert.java index 44080c59dd..02fa7e7712 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Alert.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/Alert.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * To see an example of Alert web element please visit https://vuetifyjs.com/en/components/alerts/ diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/VueCheckbox.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/VueCheckbox.java index 670300828b..816719750d 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/VueCheckbox.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/common/VueCheckbox.java @@ -5,7 +5,6 @@ import com.epam.jdi.light.elements.common.Label; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.base.HasLabel; -import com.epam.jdi.light.ui.html.elements.common.Checkbox; import com.epam.jdi.light.vuetify.asserts.VueCheckboxAssert; import com.epam.jdi.light.vuetify.interfaces.HasColor; import com.epam.jdi.light.vuetify.interfaces.HasMessages; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ButtonGroup.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ButtonGroup.java index 989b70fc14..d708218c06 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ButtonGroup.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/ButtonGroup.java @@ -28,8 +28,7 @@ /** * To see an example of Button Group web element please visit https://vuetifyjs.com/en/components/button-groups/ - *

- * Created by Nikita Nechepurenko on 01.10.2021 + *

* This element describes a container with buttons in it. * You can specify a locator for inner buttons with the JDIButtonGroup annotation. @@ -40,12 +39,6 @@ public class ButtonGroup extends UIListBase> implements ISetup, HasClick, HasIcon, HasColor, HasTheme, HasRounded, IsShaped, HasMeasurement, IsDense, IsTile { - @Override - @JDIAction("Is item '{0}' selected in {name}") - public boolean selected(int index) { - return get(index).hasClass("v-item--active"); - } - private String buttonsLocator = ".v-btn"; public ButtonGroup() { @@ -55,6 +48,12 @@ public ButtonGroup(UIElement element) { core().setCore(element); } + @Override + @JDIAction("Is item '{0}' selected in {name}") + public boolean selected(int index) { + return get(index).hasClass("v-item--active"); + } + @JDIAction("Get Button with index '{0}'") public VuetifyButton getButtonByIndex(int index) { return castToButton(list().get(index)); @@ -131,4 +130,4 @@ public ButtonGroupAssert has() { public UISelectAssert are() { return is(); } -} \ No newline at end of file +} diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Calendar.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Calendar.java index db6c40c0a6..c1621b77e5 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Calendar.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Calendar.java @@ -5,23 +5,16 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.WebList; -import static com.jdiai.tools.Timer.waitCondition; - import com.epam.jdi.light.vuetify.asserts.CalendarAssert; -import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; import com.epam.jdi.light.vuetify.interfaces.HasTheme; import org.openqa.selenium.WebElement; -import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.GregorianCalendar; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.epam.jdi.light.elements.init.UIFactory.$; -import static com.epam.jdi.light.elements.init.UIFactory.$$; - /** * To see an example of Calendars please visit https://vuetifyjs.com/en/components/calendars/ */ @@ -46,8 +39,6 @@ public class Calendar extends UIBaseElement implements HasTheme private static final String CURRENT_TIME_LOCATOR = ".v-current-time"; private static final String SLOT_LOCATOR = ".v-sheet"; - private static final DateTimeFormatter INPUT_DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy"); - public List displayedDaysOfMonth() { return Stream.of( finds(WEEKLY_DAY_OF_MONTH_LOCATOR), diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Card.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Card.java index 85728b3cc5..7bbddba3ba 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Card.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Card.java @@ -3,7 +3,6 @@ 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.complex.WebList; import com.epam.jdi.light.elements.interfaces.base.HasClick; import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.vuetify.asserts.CardAssert; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/DatePicker.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/DatePicker.java index 3d3632ccf4..f0e0ab6746 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/DatePicker.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/DatePicker.java @@ -254,10 +254,6 @@ private List shownMultipleDates() { return root().finds(SHOWN_MULTIPLE_DATES); } - private UIElement outlinedDate() { - return root().find(OUTLINED_DATE); - } - private List eventColorCircles() { return root().finds(EVENT_COLOR_CIRCLE); } diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Menu.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Menu.java index 145af6a6e0..33afb61a4e 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Menu.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/Menu.java @@ -4,7 +4,6 @@ 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.elements.interfaces.common.IsText; import com.epam.jdi.light.vuetify.asserts.MenuAssert; import com.epam.jdi.light.vuetify.elements.common.ListItem; import com.epam.jdi.light.vuetify.interfaces.HasTheme; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/SlideGroup.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/SlideGroup.java index 17e1859703..8bbe0a4057 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/SlideGroup.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/SlideGroup.java @@ -1,19 +1,15 @@ package com.epam.jdi.light.vuetify.elements.complex; import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.light.driver.WebDriverFactory; import com.epam.jdi.light.elements.base.UIBaseElement; import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.vuetify.asserts.SlideGroupAssert; import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; import com.epam.jdi.light.vuetify.interfaces.HasIcon; import com.epam.jdi.light.vuetify.interfaces.HasTheme; -import com.jdiai.tools.Timer; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -79,7 +75,7 @@ public int position() { return -1; } - private List getAllSlides(By by) { + public List getAllSlides(By by) { return core().findElements(by); } diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/TreeView.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/TreeView.java index a02ccf2267..d05d571441 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/TreeView.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/TreeView.java @@ -10,9 +10,7 @@ import com.epam.jdi.light.vuetify.interfaces.IsDense; import com.epam.jdi.light.vuetify.interfaces.IsLoading; import java.lang.reflect.Field; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.elements.pageobjects.annotations.objects.FillFromAnnotationRules.fieldHasAnnotation; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/bars/ToolBar.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/bars/ToolBar.java index 8f7e4965a8..877098c194 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/bars/ToolBar.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/bars/ToolBar.java @@ -2,7 +2,6 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.vuetify.asserts.bars.ToolBarAssert; -import com.epam.jdi.light.vuetify.elements.common.VuetifyButton; /** * To see examples of Tool Bar web elements please visit https://vuetifyjs.com/en/components/toolbars diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/radiobuttons/RadioButton.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/radiobuttons/RadioButton.java index a0a138c1f9..4eab315a41 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/radiobuttons/RadioButton.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/radiobuttons/RadioButton.java @@ -3,7 +3,6 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.base.UIBaseElement; import com.epam.jdi.light.elements.common.Label; -import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.base.HasLabel; import com.epam.jdi.light.vuetify.asserts.radiobuttons.RadioButtonAssert; import com.epam.jdi.light.vuetify.elements.common.Icon; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/tables/DataIterator.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/tables/DataIterator.java index c2c8683c1d..6b8f299732 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/tables/DataIterator.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/complex/tables/DataIterator.java @@ -58,8 +58,9 @@ public void setup(Field field) { protected void setupInnerClasses(Field field) { Type[] types = getGenericTypes(field); - if (types.length != 1) + if (types.length != 1) { return; + } try { contentClazz = types[0].toString().equals("?") ? null : (Class) types[0]; } catch (Exception ex) { diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Footer.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Footer.java index ac3b68dd96..043c635977 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Footer.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Footer.java @@ -5,7 +5,15 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.common.IsText; import com.epam.jdi.light.vuetify.asserts.FooterAssert; -import com.epam.jdi.light.vuetify.interfaces.*; +import com.epam.jdi.light.vuetify.interfaces.HasColor; +import com.epam.jdi.light.vuetify.interfaces.HasTheme; +import com.epam.jdi.light.vuetify.interfaces.HasElevation; +import com.epam.jdi.light.vuetify.interfaces.HasMeasurement; +import com.epam.jdi.light.vuetify.interfaces.IsOutlined; +import com.epam.jdi.light.vuetify.interfaces.HasRounded; +import com.epam.jdi.light.vuetify.interfaces.IsShaped; +import com.epam.jdi.light.vuetify.interfaces.IsTile; +import com.epam.jdi.light.vuetify.interfaces.IsContainer; /** * To see an example of Footer web element please visit https://vuetifyjs.com/en/components/footer/ diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/OverflowButton.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/OverflowButton.java index 63e51f8690..4eb2660da0 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/OverflowButton.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/OverflowButton.java @@ -39,7 +39,6 @@ public class OverflowButton extends UIBaseElement implemen private static final String EXPANDER_LOCATOR = ".v-input__append-inner"; private static final String OPEN_PANEL_CLASS = "v-select--is-menu-active"; - private static final String REVERSED_CLASS = "v-text-field--reverse"; private static final String COUNTER_LOCATOR = ".v-counter"; private static final String PLACEHOLDER_LOCATOR = ".v-label"; private static final String SELECT_LOCATOR = ".v-select__selections"; diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Parallax.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Parallax.java index 923df64c63..2d5fcb5370 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Parallax.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/elements/composite/Parallax.java @@ -9,11 +9,6 @@ import org.openqa.selenium.By; import com.epam.jdi.light.vuetify.elements.common.Image; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static java.lang.String.format; - /** * Parallax is basically a container with a background image that scrolls slower than browser window. * Since Parallax might contain any elements, as a page section would, diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/enums/AlertType.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/enums/AlertType.java index 69812cf0c8..1d18289358 100644 --- a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/enums/AlertType.java +++ b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/enums/AlertType.java @@ -14,4 +14,4 @@ public enum AlertType { public String toString() { return value; } -} \ No newline at end of file +}