Updated to remove ru.yandex usage

Emerson Baillie · Emerson Baillie · commit a737fc988aaf · 2022-04-27T16:22:16.000+01:00
diff --git a/src/test/java/angularjs/pages/DeveloperGuidePage.java b/src/test/java/angularjs/pages/DeveloperGuidePage.java
@@ -7,25 +7,21 @@
 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 com.frameworkium.core.htmlelements.element.Link;
+import com.frameworkium.core.htmlelements.element.TextInput;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 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;
 
@@ -43,7 +39,7 @@ public DeveloperGuidePage setSearchBar(String inputText) {
 
     @Step("Click link from search results with title {0}")
     public DeveloperGuidePage clickLinkWithTitle(String linkTitle) {
-        driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(30));
         var searchResultsLink = driver.findElement(
                 By.xpath(String.format(
                         "//nav[@id='navbar-main']//a[text()='%s']",
diff --git a/src/test/java/angularjs/pages/HomePage.java b/src/test/java/angularjs/pages/HomePage.java
@@ -7,18 +7,15 @@
 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;
 
 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;
 
diff --git a/src/test/java/calcapp/pages/app/CalculatorPage.java b/src/test/java/calcapp/pages/app/CalculatorPage.java
@@ -4,7 +4,7 @@
 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 com.frameworkium.core.htmlelements.element.*;
 
 import java.util.List;
 
diff --git a/src/test/java/github/pages/ExplorePage.java b/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")
diff --git a/src/test/java/github/pages/HomePage.java b/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")
diff --git a/src/test/java/github/pages/SearchResultsPage.java b/src/test/java/github/pages/SearchResultsPage.java
@@ -6,20 +6,17 @@
 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 com.frameworkium.core.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;
 
diff --git a/src/test/java/github/pages/components/HeaderComponent.java b/src/test/java/github/pages/components/HeaderComponent.java
@@ -7,29 +7,23 @@
 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.*;
+import com.frameworkium.core.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;
 
diff --git a/src/test/java/seleniumhq/components/HeaderComponent.java b/src/test/java/seleniumhq/components/HeaderComponent.java
@@ -4,8 +4,8 @@
 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 com.frameworkium.core.htmlelements.element.HtmlElement;
+import com.frameworkium.core.htmlelements.element.Link;
 import seleniumhq.pages.SeleniumDownloadPage;
 
 @FindBy(className = "navbar")
diff --git a/src/test/java/seleniumhq/pages/SeleniumDownloadPage.java b/src/test/java/seleniumhq/pages/SeleniumDownloadPage.java
@@ -4,7 +4,7 @@
 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 com.frameworkium.core.htmlelements.element.Link;
 import seleniumhq.components.HeaderComponent;
 
 public class SeleniumDownloadPage extends BasePage<SeleniumDownloadPage> {
diff --git a/src/test/java/tfl/web/pages/HomePage.java b/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;
diff --git a/src/test/java/tfl/web/pages/JourneyPlannerResultsPage.java b/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;
 
diff --git a/src/test/java/tfl/web/pages/PlanJourneyPage.java b/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;
 
diff --git a/src/test/java/theinternet/pages/BasicAuthSuccessPage.java b/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;
 }
diff --git a/src/test/java/theinternet/pages/CheckboxesPage.java b/src/test/java/theinternet/pages/CheckboxesPage.java
@@ -4,16 +4,14 @@
 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 com.frameworkium.core.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;
 
diff --git a/src/test/java/theinternet/pages/DragAndDropPage.java b/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;
 
diff --git a/src/test/java/theinternet/pages/DropdownPage.java b/src/test/java/theinternet/pages/DropdownPage.java
@@ -4,13 +4,11 @@
 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;
+import com.frameworkium.core.htmlelements.element.Select;
 
 public class DropdownPage extends BasePage<DropdownPage> {
 
     @Visible
-    @Name("Dropdown list")
     @FindBy(css = "select#dropdown")
     private Select dropdown;
 
diff --git a/src/test/java/theinternet/pages/DynamicLoadingExamplePage.java b/src/test/java/theinternet/pages/DynamicLoadingExamplePage.java
@@ -6,23 +6,20 @@
 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 com.frameworkium.core.htmlelements.annotations.Timeout;
+import com.frameworkium.core.htmlelements.element.Button;
+import com.frameworkium.core.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;
 
diff --git a/src/test/java/theinternet/pages/DynamicLoadingPage.java b/src/test/java/theinternet/pages/DynamicLoadingPage.java
@@ -5,17 +5,14 @@
 import com.frameworkium.core.ui.pages.PageFactory;
 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 com.frameworkium.core.htmlelements.element.Link;
 
 public class DynamicLoadingPage extends BasePage<DynamicLoadingPage> {
 
     @Visible
-    @Name("Example 1: Element on page that is hidden link")
     @FindBy(linkText = "Example 1: Element on page that is hidden")
     private Link example1Link;
 
-    @Name("Example 2: Element rendered after the fact")
     @FindBy(linkText = "Example 2: Element rendered after the fact")
     private Link example2Link;
 
diff --git a/src/test/java/theinternet/pages/FileDownloadPage.java b/src/test/java/theinternet/pages/FileDownloadPage.java
@@ -4,16 +4,14 @@
 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.Link;
+import com.frameworkium.core.htmlelements.element.Link;
 
 import java.util.List;
 import java.util.stream.Stream;
 
 public class FileDownloadPage extends BasePage<FileDownloadPage> {
 
     @Visible
-    @Name("Generic download link")
     @FindBy(css = "div.example a")
     private List<Link> allDownloadLinks;
 
diff --git a/src/test/java/theinternet/pages/FileUploadPage.java b/src/test/java/theinternet/pages/FileUploadPage.java
@@ -6,18 +6,15 @@
 import io.qameta.allure.Step;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import ru.yandex.qatools.htmlelements.annotations.Name;
-import ru.yandex.qatools.htmlelements.element.FileInput;
+import com.frameworkium.core.htmlelements.element.FileInput;
 
 public class FileUploadPage extends BasePage<FileUploadPage> {
 
     @Visible
-    @Name("Choose Files button")
     @FindBy(css = "input#file-upload")
     private FileInput chooseFileInput;
 
     @Visible
-    @Name("Upload button")
     @FindBy(css = "input#file-submit")
     private WebElement uploadButton;
 
diff --git a/src/test/java/theinternet/pages/FileUploadSuccessPage.java b/src/test/java/theinternet/pages/FileUploadSuccessPage.java
@@ -5,12 +5,10 @@
 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 FileUploadSuccessPage extends BasePage<FileUploadSuccessPage> {
 
     @Visible
-    @Name("Uploaded Files")
     @FindBy(css = "div#uploaded-files")
     private WebElement uploadedFiles;
 
diff --git a/src/test/java/theinternet/pages/FormAuthenticationPage.java b/src/test/java/theinternet/pages/FormAuthenticationPage.java
diff --git a/src/test/java/theinternet/pages/FormAuthenticationSuccessPage.java b/src/test/java/theinternet/pages/FormAuthenticationSuccessPage.java
diff --git a/src/test/java/theinternet/pages/FramesPage.java b/src/test/java/theinternet/pages/FramesPage.java
diff --git a/src/test/java/theinternet/pages/HoversPage.java b/src/test/java/theinternet/pages/HoversPage.java
diff --git a/src/test/java/theinternet/pages/IFramePage.java b/src/test/java/theinternet/pages/IFramePage.java
diff --git a/src/test/java/theinternet/pages/JavaScriptAlertsPage.java b/src/test/java/theinternet/pages/JavaScriptAlertsPage.java
diff --git a/src/test/java/theinternet/pages/KeyPressesPage.java b/src/test/java/theinternet/pages/KeyPressesPage.java
diff --git a/src/test/java/theinternet/pages/SortableDataTablesPage.java b/src/test/java/theinternet/pages/SortableDataTablesPage.java
diff --git a/src/test/java/theinternet/pages/WelcomePage.java b/src/test/java/theinternet/pages/WelcomePage.java
