Refactor screen class

Author: mialeska

src/main/java/aquality/appium/mobile/elements/Link.java

@@ -19,6 +19,6 @@ protected String getElementType() {
 
     @Override
     public String getHref() {
-        return getAttribute("href");
+        return getAttribute(Attributes.HREF.toString());
     }
 }

src/main/java/aquality/appium/mobile/screens/Screen.java

@@ -4,6 +4,7 @@
 import aquality.appium.mobile.application.PlatformName;
 import aquality.appium.mobile.elements.interfaces.IElementFactory;
 import aquality.appium.mobile.elements.interfaces.ILabel;
+import aquality.selenium.core.elements.interfaces.IElementStateProvider;
 import io.appium.java_client.AppiumDriver;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
@@ -13,21 +14,17 @@
 
 public abstract class Screen {
 
-    /**
-     * Locator for specified screen
-     */
-    protected final By locator;
-    /**
-     * Name of specified screen
-     */
-    protected final String name;
+    private final By locator;
+    private final String name;
+    private final ILabel screenLabel;
 
     /**
      * Constructor with parameters
      */
     protected Screen(By locator, String name) {
         this.locator = locator;
         this.name = name;
+        screenLabel = getElementFactory().getLabel(locator, name);
     }
 
     protected abstract AppiumDriver getDriver();
@@ -39,7 +36,7 @@ protected Screen(By locator, String name) {
      * False - screen is not opened
      */
     public boolean isDisplayed() {
-        return getFormLabel().state().waitForDisplayed();
+        return screenLabel.state().waitForDisplayed();
     }
 
     /**
@@ -50,21 +47,17 @@ public boolean isDisplayed() {
      * False - screen is not opened
      */
     public boolean isDisplayed(Duration timeout) {
-        return getFormLabel().state().waitForDisplayed(timeout);
+        return screenLabel.state().waitForDisplayed(timeout);
     }
 
-    public Dimension getScreenSize() {
-       return getFormLabel().getElement().getSize();
+    public Dimension getSize() {
+       return screenLabel.getElement().getSize();
     }
 
     protected IElementFactory getElementFactory(){
         return AqualityServices.getElementFactory();
     }
 
-    private ILabel getFormLabel(){
-        return getElementFactory().getLabel(locator, name);
-    }
-
     void ensureApplicationPlatformCorrect(PlatformName targetPlatform) {
         PlatformName currentPlatform = AqualityServices.getApplication().getPlatformName();
         if(targetPlatform != currentPlatform) {
@@ -74,4 +67,27 @@ void ensureApplicationPlatformCorrect(PlatformName targetPlatform) {
                     targetPlatform));
         }
     }
+
+    /**
+     * Locator for specified screen
+     */
+    public By getLocator() {
+        return locator;
+    }
+
+    /**
+     * Name of specified screen
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Provides ability to define of element's state (whether it is displayed, exists or not) and respective waiting functions
+     *
+     * @return provider to define element's state
+     */
+    public IElementStateProvider state() {
+        return screenLabel.state();
+    }
 }

src/test/java/samples/android/AndroidBasicInteractionsTest.java

@@ -2,8 +2,6 @@
 
 import aquality.appium.mobile.application.AqualityServices;
 import aquality.appium.mobile.application.MobileModule;
-import aquality.selenium.core.logging.Logger;
-import io.appium.java_client.android.AndroidDriver;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -14,16 +12,11 @@
 import samples.android.apidemos.screens.TwoButtonsAlert;
 
 public class AndroidBasicInteractionsTest {
-    private AndroidDriver<?> driver;
-    private final String SEARCH_ACTIVITY = ".app.SearchInvoke";
-    private final String ALERT_DIALOG_ACTIVITY = ".app.AlertDialogSamples";
-    private final String PACKAGE = "io.appium.android.apis";
 
     @BeforeClass
     public void setUp() {
         System.clearProperty("profile");
         AqualityServices.initInjector(new MobileModule(AqualityServices::getApplication));
-        driver = (AndroidDriver<?>) AqualityServices.getApplication().getDriver();
     }
 
     @AfterClass
@@ -32,10 +25,11 @@ public void tearDown() {
     }
 
 
-    @Test()
+    @Test
     public void testSendKeys() {
         new MainMenuScreen().startSearch();
         InvokeSearchScreen searchScreen = new InvokeSearchScreen();
+        Assert.assertTrue(searchScreen.isDisplayed(), searchScreen.getName() + " should be opened from the menu");
         String query = "Hello world!";
         searchScreen.submitSearch(query);
         Assert.assertEquals(searchScreen.getSearchResult(), query, "Search result don't match to entered query");
@@ -44,19 +38,23 @@ public void testSendKeys() {
     @Test
     public void testOpensAlert() {
 
-        Logger.getInstance().info("Open the 'Alert Dialog' activity of the android app");
+        logStep("Open the 'Alert Dialog' activity of the android app");
         new MainMenuScreen().openAlerts();
 
-        Logger.getInstance().info("Click button that opens a dialog");
+        logStep("Click button that opens a dialog");
         new AlertsMenuScreen().openTwoButtonsDialog();
 
-        Logger.getInstance().info("Check that the dialog is there");
+        logStep("Check that the dialog is there");
         TwoButtonsAlert alertDialog = new TwoButtonsAlert();
         Assert.assertEquals(alertDialog.getAlertText(),
                 "Lorem ipsum dolor sit aie consectetur adipiscing\nPlloaso mako nuto siwuf cakso dodtos anr koop.",
                 "Alert text should match to expected");
 
-        Logger.getInstance().info("Close the dialog");
-        alertDialog.closeDialog();
+        logStep("Close the dialog");
+        alertDialog.close();
+    }
+
+    private void logStep(String step) {
+        AqualityServices.getLogger().info(step);
     }
 }

src/test/java/samples/android/apidemos/screens/InvokeSearchScreen.java

@@ -13,7 +13,7 @@ public class InvokeSearchScreen extends AndroidScreen {
     private final ILabel lblSearchResult = getElementFactory().getLabel(By.id("android:id/search_src_text"), "Search results");
 
     public InvokeSearchScreen() {
-        super(By.xpath("//*[contains(.,'App/Search/Invoke Search')]"), "Invoke Search");
+        super(By.xpath("//android.widget.TextView[@text='App/Search/Invoke Search']"), "Invoke Search");
     }
 
     public void submitSearch(String query) {

src/test/java/samples/android/apidemos/screens/TwoButtonsAlert.java

@@ -20,7 +20,7 @@ public String getAlertText() {
         return lblAlertTitle.getText();
     }
 
-    public void closeDialog(){
+    public void close(){
         btnClose.click();
     }
 }