chore: resolve cyclic references

dtopuzov · dtopuzov · commit 593747514bbf · 2019-11-18T11:41:41.000+02:00
diff --git a/src/test/java/uitests/Screens/Components/WebViewBasePage.java b/src/test/java/uitests/Screens/Components/WebViewBasePage.java
@@ -1,9 +1,7 @@
 package uitests.Screens.Components;
 
-import functional.tests.core.enums.PlatformType;
 import functional.tests.core.mobile.basetest.MobileContext;
 import functional.tests.core.mobile.element.UIElement;
-import io.appium.java_client.MobileBy;
 import org.testng.Assert;
 import uitests.Screens.HomePageExtended;
 
@@ -18,36 +16,28 @@ public void navToPage(String page) {
         Assert.assertTrue(result, String.format("Failed to navigate to %s page.", page));
     }
 
-    private UIElement findElement(String text) {
-        if (this.settings.platform == PlatformType.Android) {
-            return this.findElement(text);
-        } else {
-            return this.wait.waitForVisible(MobileBy.AccessibilityId(text));
-        }
-    }
-
     public void tapRelativeBtn() {
-        this.findElement("rel").click();
+        this.find.byText("rel").click();
     }
 
     public void tapAbsoluteBtn() {
-        this.findElement("abs").click();
+        this.find.byText("abs").click();
     }
 
     public void tapFileBtn() {
-        this.findElement("file").click();
+        this.find.byText("file").click();
     }
 
     public void tapStringBtn() {
-        this.findElement("str").click();
+        this.find.byText("str").click();
     }
 
     public UIElement srcWebView() {
-        return this.findElement("someUrl | pathToLocalFile | htmlString");
+        return this.find.byText("someUrl | pathToLocalFile | htmlString");
     }
 
     public UIElement strResult() {
-        return this.findElement("Result");
+        return this.find.byText("Result");
     }
 
     public UIElement strFooBar() {
diff --git a/src/test/java/uitests/Tests/Component/ApplicationTests.java b/src/test/java/uitests/Tests/Component/ApplicationTests.java
@@ -2,9 +2,7 @@
 
 import functional.tests.core.enums.PlatformType;
 import functional.tests.core.mobile.basetest.MobileTest;
-import functional.tests.core.mobile.element.UIElement;
 import functional.tests.core.mobile.find.Wait;
-import io.appium.java_client.MobileBy;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import uitests.Screens.UITestsBasePage;
@@ -52,21 +50,13 @@ public void tabview_with_scrollview_4022() throws Exception {
         UITestsBasePage basePage = new UITestsBasePage("issues", this.context);
         basePage.navigateTo("issues");
         basePage.navigateTo("tabview-with-scrollview_4022");
-        findElement("Tab 2").click();
+        this.find.byText("Tab 2").click();
         this.log.info("Run the application in background.");
         this.app.runInBackground(5);
-        findElement("Tab 1").click();
-        findElement("Tab 2").click();
-        findElement("Tab 3").click();
+        this.find.byText("Tab 1").click();
+        this.find.byText("Tab 2").click();
+        this.find.byText("Tab 3").click();
 
         this.assertScreen(5);
     }
-
-    private UIElement findElement(String text) {
-        if (this.settings.platform == PlatformType.Android) {
-            return this.findElement(text);
-        } else {
-            return this.wait.waitForVisible(MobileBy.AccessibilityId(text));
-        }
-    }
 }
diff --git a/src/test/java/uitests/Tests/Component/HtmlViewTests.java b/src/test/java/uitests/Tests/Component/HtmlViewTests.java
@@ -1,7 +1,8 @@
 package uitests.Tests.Component;
 
-import functional.tests.core.mobile.element.UIElement;
 import functional.tests.core.mobile.basetest.MobileTest;
+import functional.tests.core.mobile.element.UIElement;
+import functional.tests.core.mobile.find.Wait;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import uitests.Screens.HomePageExtended;
@@ -11,9 +12,9 @@ public class HtmlViewTests extends MobileTest {
     HomePageExtended homePage;
 
     @Test(groups = {"android", "ios"})
-    public void htmlView_01() throws Exception {
+    public void htmlView_01() {
         this.homePage = new HomePageExtended("htmlview", this.context);
-        this.homePage.context.client.setWait(1);
+        Wait.sleep(1000);
         UIElement el = this.find.byTextContains("one");
         String htmlContent = el.getText();
         Assert.assertTrue(htmlContent.contains("one"));
