reference aquality.selenium.

update appium version.
removed copypasted classes, referenced from aquality.selenium.
implemented elements and factory

Author: mialeska

src/main/java/aquality/appium/application/Application.java

@@ -1,12 +1,14 @@
 package aquality.appium.application;
 
 import aquality.appium.configuration.IConfiguration;
-import aquality.selenium.configuration.ITimeoutConfiguration;
+import aquality.appium.configuration.ITimeoutConfiguration;
 import aquality.selenium.localization.LocalizationManager;
 import aquality.selenium.logger.Logger;
 import io.appium.java_client.AppiumDriver;
 import org.openqa.selenium.remote.service.DriverService;
 
+import java.util.concurrent.TimeUnit;
+
 public class Application {
 
     private final Logger logger = Logger.getInstance();
@@ -22,12 +24,7 @@ public Application(AppiumDriver appiumDriver, IConfiguration configuration) {
         this.configuration = configuration;
         this.timeouts = configuration.getTimeoutConfiguration();
         this.timeoutImpl = timeouts.getImplicit();
-        /*
-        todo: determine if all of these timeouts are necessary to be set this way
         getDriver().manage().timeouts().implicitlyWait(timeoutImpl, TimeUnit.SECONDS);
-        setPageLoadTimeout(timeouts.getPageLoad());
-        setScriptTimeout(timeouts.getScript());
-         */
     }
 
     public Application(DriverService driverService, AppiumDriver appiumDriver, IConfiguration configuration) {
@@ -36,6 +33,7 @@ public Application(DriverService driverService, AppiumDriver appiumDriver, IConf
         this.configuration = configuration;
         this.timeouts = configuration.getTimeoutConfiguration();
         this.timeoutImpl = timeouts.getImplicit();
+        getDriver().manage().timeouts().implicitlyWait(timeoutImpl, TimeUnit.SECONDS);
     }
 
     /**
@@ -62,6 +60,19 @@ public final PlatformName getPlatformName() {
         return configuration.getApplicationProfile().getPlatformName();
     }
 
+    /**
+     * Sets web driver implicit wait timeout
+     * Be careful with using this method. Implicit timeout can affect to duration of driver operations
+     * @param timeout seconds to wait
+     */
+    public void setImplicitWaitTimeout(Long timeout) {
+        logger.debug(String.format(getLocManager().getValue("loc.browser.implicit.timeout"), timeout));
+        if(!timeout.equals(getImplicitWaitTimeout())){
+            getDriver().manage().timeouts().implicitlyWait(timeout, TimeUnit.SECONDS);
+            timeoutImpl = timeout;
+        }
+    }
+
     public void quit() {
         logger.info(LocalizationManager.getInstance().getValue("loc.browser.driver.quit"));
         if (getDriver() != null) {
@@ -72,4 +83,12 @@ public void quit() {
             getDriverService().stop();
         }
     }
+
+    private Long getImplicitWaitTimeout() {
+        return timeoutImpl;
+    }
+
+    private LocalizationManager getLocManager(){
+        return LocalizationManager.getInstance();
+    }
 }

src/main/java/aquality/appium/application/ApplicationFactory.java

@@ -5,11 +5,18 @@
 import aquality.selenium.logger.Logger;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.android.AndroidDriver;
+import io.appium.java_client.android.AndroidElement;
 import io.appium.java_client.ios.IOSDriver;
+import io.appium.java_client.ios.IOSElement;
 import io.appium.java_client.windows.WindowsDriver;
+import io.appium.java_client.windows.WindowsElement;
 import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.remote.http.HttpClient;
+import org.openqa.selenium.remote.http.HttpClient.Builder;
+import org.openqa.selenium.remote.http.HttpClient.Factory;
 
 import java.net.URL;
+import java.time.Duration;
 
 abstract class ApplicationFactory implements IApplicationFactory {
 
@@ -24,23 +31,49 @@ IllegalArgumentException getLoggedWrongPlatformNameException() {
     AppiumDriver getDriver(URL serviceUrl, IConfiguration configuration) {
         PlatformName platformName = configuration.getApplicationProfile().getPlatformName();
         Capabilities capabilities = configuration.getApplicationProfile().getDriverSettings().getCapabilities();
+        Factory httpClientFactory = new ClientFactory(configuration);
         AppiumDriver driver;
         switch (platformName) {
             case ANDROID:
-                driver = new AndroidDriver<>(serviceUrl, capabilities);
+                driver = new AndroidDriver<AndroidElement>(serviceUrl, httpClientFactory, capabilities);
                 break;
             case IOS:
-                driver = new IOSDriver<>(serviceUrl, capabilities);
+                driver = new IOSDriver<IOSElement>(serviceUrl, httpClientFactory, capabilities);
                 break;
             case WINDOWS:
-                driver = new WindowsDriver<>(serviceUrl, capabilities);
+                driver = new WindowsDriver<WindowsElement>(serviceUrl, httpClientFactory, capabilities);
                 break;
             default:
                 throw getLoggedWrongPlatformNameException();
         }
         return driver;
     }
 
+    class ClientFactory implements Factory{
+
+        private final Factory defaultClientFactory = Factory.createDefault();
+        private final Duration timeoutCommand;
+
+        ClientFactory(IConfiguration configuration){
+            timeoutCommand = Duration.ofSeconds(configuration.getTimeoutConfiguration().getCommand());
+        }
+
+        @Override
+        public Builder builder() {
+            return defaultClientFactory.builder().readTimeout(timeoutCommand);
+        }
+
+        @Override
+        public HttpClient createClient(URL url) {
+            return this.builder().createClient(url);
+        }
+
+        @Override
+        public void cleanupIdleClients() {
+            defaultClientFactory.cleanupIdleClients();
+        }
+    }
+
     void logApplicationIsReady(PlatformName platformName) {
         Logger.getInstance().info(getLocManager().getValue("loc.browser.ready"), platformName.toString());
     }

src/main/java/aquality/appium/configuration/Configuration.java

@@ -1,6 +1,9 @@
 package aquality.appium.configuration;
 
-import aquality.selenium.configuration.*;
+import aquality.selenium.configuration.ILoggerConfiguration;
+import aquality.selenium.configuration.IRetryConfiguration;
+import aquality.selenium.configuration.LoggerConfiguration;
+import aquality.selenium.configuration.RetryConfiguration;
 import aquality.selenium.utils.JsonFile;
 
 public class Configuration implements IConfiguration{
@@ -14,8 +17,8 @@ public class Configuration implements IConfiguration{
     private Configuration() {
         JsonFile settings = getSettings();
         timeoutConfiguration = new TimeoutConfiguration(settings);
-        retryConfiguration = new RetryConfiguration(settings);
         applicationProfile = new ApplicationProfile(settings);
+        retryConfiguration = new RetryConfiguration(settings);
         loggerConfiguration = new LoggerConfiguration(settings);
     }
 

src/main/java/aquality/appium/configuration/IConfiguration.java

@@ -2,7 +2,6 @@
 
 import aquality.selenium.configuration.ILoggerConfiguration;
 import aquality.selenium.configuration.IRetryConfiguration;
-import aquality.selenium.configuration.ITimeoutConfiguration;
 
 public interface IConfiguration {
 

src/main/java/aquality/appium/configuration/ITimeoutConfiguration.java

@@ -0,0 +1,12 @@
+package aquality.appium.configuration;
+
+public interface ITimeoutConfiguration {
+
+    long getImplicit();
+
+    long getCondition();
+
+    long getPollingInterval();
+
+    long getCommand();
+}

src/main/java/aquality/appium/configuration/TimeoutConfiguration.java

@@ -0,0 +1,57 @@
+package aquality.appium.configuration;
+
+import aquality.selenium.utils.JsonFile;
+
+public class TimeoutConfiguration implements ITimeoutConfiguration {
+    private final JsonFile settingsFile;
+
+    private final long condition;
+    private final long pollInterval;
+    private final long implicit;
+    private final long command;
+    
+    public TimeoutConfiguration(JsonFile settingsFile) {
+        this.settingsFile = settingsFile;
+        condition = getTimeout(TIMEOUT.CONDITION);
+        pollInterval = getTimeout(TIMEOUT.POLL_INTERVAL);
+        implicit = getTimeout(TIMEOUT.IMPLICIT);
+        command = getTimeout(TIMEOUT.COMMAND);
+    }
+
+    private long getTimeout(TIMEOUT timeout){
+        return Long.valueOf(settingsFile.getValue("/timeouts/" + timeout.getKey()).toString());
+    }
+
+
+    public long getImplicit(){
+        return implicit;
+    }
+
+    public long getCondition(){
+        return condition;
+    }
+
+    public long getPollingInterval(){
+        return pollInterval;
+    }
+
+    public long getCommand(){
+        return command;
+    }
+
+    private enum TIMEOUT {
+        IMPLICIT("timeoutImplicit"),
+        CONDITION("timeoutCondition"),
+        POLL_INTERVAL("timeoutPollingInterval"),
+        COMMAND("timeoutCommand");
+
+        private String key;
+        TIMEOUT(String key){
+            this.key = key;
+        }
+
+        private String getKey(){
+            return key;
+        }
+    }
+}

src/main/java/aquality/appium/elements/Button.java

@@ -0,0 +1,18 @@
+package aquality.appium.elements;
+
+import aquality.appium.elements.interfaces.IButton;
+import org.openqa.selenium.By;
+
+/**
+ * Class describing element button
+ */
+public class Button extends Element implements IButton {
+
+    protected Button(final By locator, final String name) {
+        super(locator, name);
+    }
+
+    protected String getElementType() {
+        return getLocManager().getValue("loc.button");
+    }
+}

src/main/java/aquality/appium/elements/CheckBox.java

@@ -0,0 +1,55 @@
+package aquality.appium.elements;
+
+import aquality.appium.elements.interfaces.ICheckBox;
+import org.openqa.selenium.By;
+
+/**
+ * Class describing the checkbox
+ */
+public class CheckBox extends Element implements ICheckBox {
+
+    protected CheckBox(final By locator, final String name) {
+        super(locator, name);
+    }
+
+    protected String getElementType() {
+        return getLocManager().getValue("loc.checkbox");
+    }
+
+    @Override
+    public void check() {
+        setState(true);
+    }
+
+    @Override
+    public void uncheck() {
+        setState(false);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return getState();
+    }
+
+    @Override
+    public void toggle() {
+        setState(!isChecked());
+    }
+
+    /**
+     * Set value
+     *
+     * @param state value (true/false)
+     */
+    private void setState(boolean state) {
+        getLogger().info(String.format("%1$s '%2$s'", getLocManager().getValue("loc.setting.value"), state));
+        if (state != getState()) {
+            click();
+        }
+    }
+
+    private boolean getState() {
+        info(getLocManager().getValue("loc.checkbox.get.state"));
+        return getElement().isSelected();
+    }
+}