Bump frameworkium-core from 3.0.1 to 4.1.0

pom.xml

@@ -60,7 +60,7 @@
     <dependency>
       <groupId>com.github.frameworkium</groupId>
       <artifactId>frameworkium-core</artifactId>
-      <version>3.0.1</version>
+      <version>4.1.0</version>
     </dependency>
 
     <!-- Your own dependencies here -->

src/test/java/angularjs/pages/DeveloperGuidePage.java

@@ -1,31 +1,27 @@
 package angularjs.pages;
 
+import com.frameworkium.core.htmlelements.element.Link;
+import com.frameworkium.core.htmlelements.element.TextInput;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.element.Link;
-import ru.yandex.qatools.htmlelements.element.TextInput;
 
 import java.util.concurrent.TimeUnit;
 
 public class DeveloperGuidePage extends BasePage<DeveloperGuidePage> {
 
-    @Name("Developer guide search")
     @Visible
     @FindBy(css = "input[name='as_q']")
     private TextInput searchField;
 
-    @Name("Bootstrap search item")
     @Visible
     @FindBy(linkText = "Bootstrap")
     private Link bootstrapSearchItem;
 
-    @Name("Guide article title")
     @FindBy(css = ".main-grid h1")
     private WebElement guideTitle;
 

src/test/java/angularjs/pages/HomePage.java

@@ -7,24 +7,21 @@
 import io.qameta.allure.Step;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 public class HomePage extends BasePage<HomePage> {
 
-    @Name("Develop navigation bar item")
     @Visible
     @FindBy(xpath = "//a[text()='Develop']")
     private WebElement developDropdown;
 
-    @Name("Developer Guide menu item")
     @FindBy(xpath = "//a[text()='Developer Guide']")
     private WebElement developerGuideMenuItem;
 
     @Step("Open home page")
     public static HomePage open() {
-        UITestLifecycle.get().getWebDriver().manage().timeouts().pageLoadTimeout(30, TimeUnit.SECONDS);
+        UITestLifecycle.get().getWebDriver().manage().timeouts().pageLoadTimeout(Duration.ofSeconds(30));
         return PageFactory.newInstance(HomePage.class, "https://angularjs.org/");
     }
 

src/test/java/calcapp/pages/app/CalculatorPage.java

@@ -1,10 +1,10 @@
 package calcapp.pages.app;
 
+import com.frameworkium.core.htmlelements.element.*;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.element.*;
 
 import java.util.List;
 

src/test/java/github/pages/ExplorePage.java

@@ -5,12 +5,10 @@
 import com.frameworkium.core.ui.pages.PageFactory;
 import github.pages.components.HeaderComponent;
 import io.qameta.allure.Step;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 public class ExplorePage extends BasePage<ExplorePage> {
 
     @Visible
-    @Name("Header")
     private HeaderComponent header;
 
     @Step("Navigate to the Github homepage")

src/test/java/github/pages/HomePage.java

@@ -5,12 +5,10 @@
 import com.frameworkium.core.ui.pages.PageFactory;
 import github.pages.components.HeaderComponent;
 import io.qameta.allure.Step;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 public class HomePage extends BasePage<HomePage> {
 
     @Visible
-    @Name("Header")
     private HeaderComponent header;
 
     @Step("Navigate to the Github homepage")

src/test/java/github/pages/SearchResultsPage.java

@@ -1,25 +1,22 @@
 package github.pages;
 
+import com.frameworkium.core.htmlelements.element.Link;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import com.frameworkium.core.ui.pages.PageFactory;
 import github.pages.components.HeaderComponent;
 import io.qameta.allure.Step;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.element.Link;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class SearchResultsPage extends BasePage<SearchResultsPage> {
 
     @Visible
-    @Name("Header")
     private HeaderComponent header;
 
     @Visible(checkAtMost = 1)
-    @Name("Repository Links")
     @FindBy(css = "h3 > a")
     private List<Link> repoLinks;
 

src/test/java/github/pages/components/HeaderComponent.java

@@ -1,35 +1,30 @@
 package github.pages.components;
 
+import com.frameworkium.core.htmlelements.element.*;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.PageFactory;
 import github.pages.*;
 import io.qameta.allure.Step;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.element.*;
 
-@Name("Github Header")
+
 @FindBy(css = "header")
 public class HeaderComponent extends HtmlElement {
 
     @Visible
-    @Name("Home Logo/Link")
     @FindBy(css = "a.header-logo-invertocat")
     private Link homeLink;
 
-    @Name("Search Box")
     @FindBy(name = "q")
     private TextInput searchBox;
 
     @Visible
-    @Name("Explore Link")
     @FindBy(partialLinkText = "Explore")
     private Link exploreLink;
 
     @Visible
-    @Name("Marketing Sign-Up Banner")
     @FindBy(partialLinkText = "Marketplace")
     private WebElement marketingLink;
 

src/test/java/seleniumhq/components/HeaderComponent.java

@@ -1,11 +1,11 @@
 package seleniumhq.components;
 
+import com.frameworkium.core.htmlelements.element.HtmlElement;
+import com.frameworkium.core.htmlelements.element.Link;
 import com.frameworkium.core.ui.UITestLifecycle;
 import com.frameworkium.core.ui.pages.PageFactory;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import ru.yandex.qatools.htmlelements.element.HtmlElement;
-import ru.yandex.qatools.htmlelements.element.Link;
 import seleniumhq.pages.SeleniumDownloadPage;
 
 @FindBy(className = "navbar")

src/test/java/seleniumhq/pages/SeleniumDownloadPage.java

@@ -1,10 +1,10 @@
 package seleniumhq.pages;
 
+import com.frameworkium.core.htmlelements.element.Link;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import com.frameworkium.core.ui.pages.PageFactory;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.element.Link;
 import seleniumhq.components.HeaderComponent;
 
 public class SeleniumDownloadPage extends BasePage<SeleniumDownloadPage> {

src/test/java/tfl/web/pages/HomePage.java

@@ -6,11 +6,9 @@
 import io.qameta.allure.Step;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 public class HomePage extends BasePage<HomePage> {
 
-    @Name("Plan A Journey Link")
     @Visible
     @FindBy(css = "li.plan-journey a")
     private WebElement planJourneyLink;

src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java

@@ -4,17 +4,14 @@
 import com.frameworkium.core.ui.pages.BasePage;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 public class JourneyPlannerResultsPage extends BasePage<JourneyPlannerResultsPage> {
 
     @Visible
-    @Name("Results viewport")
     @FindBy(css = ".journey-planner-results")
     private WebElement resultsViewport;
 
     @Visible
-    @Name("Page Title Area")
     @FindBy(css = "h1 span.hero-headline")
     private WebElement pageTitleArea;
 

src/test/java/tfl/web/pages/PlanJourneyPage.java

@@ -6,7 +6,6 @@
 import io.qameta.allure.Step;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 import java.util.List;
 
@@ -16,25 +15,20 @@
 public class PlanJourneyPage extends BasePage<PlanJourneyPage> {
 
     @Visible
-    @Name("From Field")
     @FindBy(css = "input#InputFrom")
     private WebElement fromField;
 
-    @Name("List of from suggestions")
     @FindBy(css = "#search-filter-form-0 div.tt-dataset-stop-points-search div.tt-suggestion")
     private List<WebElement> fromSuggestions;
 
     @Visible
-    @Name("To Field")
     @FindBy(css = "input#InputTo")
     private WebElement toField;
 
-    @Name("List of to suggestions")
     @FindBy(css = "#search-filter-form-1 div.tt-dataset-stop-points-search div.tt-suggestion")
     private List<WebElement> toSuggestions;
 
     @Visible
-    @Name("Plan my Journey Button")
     @FindBy(css = "input.plan-journey-button")
     private WebElement planJourneyButton;
 

src/test/java/theinternet/pages/BasicAuthSuccessPage.java

@@ -4,12 +4,10 @@
 import com.frameworkium.core.ui.pages.BasePage;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 public class BasicAuthSuccessPage extends BasePage<BasicAuthSuccessPage> {
 
     @Visible
-    @Name("Header text")
     @FindBy(css = "div.example h3")
     private WebElement headerText;
 }

src/test/java/theinternet/pages/CheckboxesPage.java

@@ -1,19 +1,17 @@
 package theinternet.pages;
 
+import com.frameworkium.core.htmlelements.element.CheckBox;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.element.CheckBox;
 
 import java.util.List;
 import java.util.stream.Stream;
 
 public class CheckboxesPage extends BasePage<CheckboxesPage> {
 
     @Visible
-    @Name("All checkboxes")
     @FindBy(css = "form input[type='checkbox']")
     private List<CheckBox> allCheckboxes;
 

src/test/java/theinternet/pages/DragAndDropPage.java

@@ -6,7 +6,6 @@
 import io.restassured.RestAssured;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -23,16 +22,13 @@ public class DragAndDropPage extends BasePage<DragAndDropPage> {
     private static final String JQUERY_JS_URI = "https://code.jquery.com/jquery-1.12.4.min.js";
 
     @Visible
-    @Name("Box A")
     @FindBy(id = "column-a")
     private WebElement boxA;
 
     @Visible
-    @Name("Box B")
     @FindBy(id = "column-b")
     private WebElement boxB;
 
-    @Name("List of headers")
     @FindBy(css = "header")
     private List<WebElement> boxes;
 
@@ -58,7 +54,7 @@ public class DragAndDropPage extends BasePage<DragAndDropPage> {
      * Fetches Javascript used to be able to simulate Drag and Drop.
      *
      * @return a String containing the Javascript for JQuery (if not already
-     *         present on the page) and code for simulating drag and drop.
+     * present on the page) and code for simulating drag and drop.
      */
     private String javascriptToSimulateDragDrop() {
         if (jQueryJS.isEmpty()) {

src/test/java/theinternet/pages/DropdownPage.java

@@ -1,16 +1,15 @@
 package theinternet.pages;
 
+import com.frameworkium.core.htmlelements.element.Select;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.element.Select;
+
 
 public class DropdownPage extends BasePage<DropdownPage> {
 
     @Visible
-    @Name("Dropdown list")
     @FindBy(css = "select#dropdown")
     private Select dropdown;
 

src/test/java/theinternet/pages/DynamicLoadingExamplePage.java

@@ -1,28 +1,25 @@
 package theinternet.pages;
 
+import com.frameworkium.core.htmlelements.annotations.Timeout;
+import com.frameworkium.core.htmlelements.element.Button;
+import com.frameworkium.core.htmlelements.element.TextBlock;
 import com.frameworkium.core.ui.annotations.Invisible;
 import com.frameworkium.core.ui.annotations.Visible;
 import com.frameworkium.core.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.annotations.Timeout;
-import ru.yandex.qatools.htmlelements.element.Button;
-import ru.yandex.qatools.htmlelements.element.TextBlock;
 
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf;
 
 public class DynamicLoadingExamplePage extends BasePage<DynamicLoadingExamplePage> {
 
     @Visible
-    @Name("Start button")
     @FindBy(css = "#start button")
     private Button startButton;
 
     @Invisible  // make sure it's not there
     @Timeout(0) // used to speed up the wait for Invisible TypifiedElements
-    @Name("Hidden element")
     @FindBy(id = "finish")
     private TextBlock dynamicElement;