Add android cli commands

Author: ferpasri

cli/resources/settings/cli.settings

@@ -106,6 +106,27 @@ FollowLinks = false
 BrowserFullScreen = true
 SwitchNewTabs = true
 
+#################################################################
+# Android Appium features
+#################################################################
+
+AppiumPlatformName = Android
+AppiumIsApkInstalled = false
+AppiumApp =
+AppiumAppPackage =
+AppiumAppActivity =
+AppiumIsEmulatorDocker = false
+AppiumIpAddress =
+AppiumDeviceName = Android Emulator
+AppiumAutomationName = UiAutomator2
+AppiumNewCommandTimeout = 600
+AppiumAutoGrantPermissions = false
+AppiumAllowInvisibleElements = false
+AppiumIgnoreHiddenApiPolicyError = false
+AppiumAdbExecTimeout = 120000
+AppiumUiautomator2ServerInstallTimeout = 120000
+AppiumUiautomator2ServerLaunchTimeout = 120000
+
 #################################################################
 # Sets whether to keep the SUTs GUI active in the screen (e.g. when its minimised or when a process is started and its UI is in front, etc.)
 #################################################################

cli/src/org/testar/cli/CliDaemonServer.java

@@ -18,9 +18,9 @@
 import java.util.Set;
 
 import org.testar.cli.settings.CliSettingsLoader;
+import org.testar.config.ConfigTags;
 import org.testar.config.settings.Settings;
 import org.testar.core.action.Action;
-import org.testar.core.action.ActionRoles;
 import org.testar.core.action.resolver.ResolvedAction;
 import org.testar.core.state.State;
 import org.testar.core.state.Widget;
@@ -226,9 +226,13 @@ private synchronized void closeActiveSession() {
     }
 
     private PlatformSessionSpec buildSessionSpec(CliRequest request) {
+        Settings settings = CliSettingsLoader.load();
+        return buildSessionSpec(request, settings);
+    }
+
+    PlatformSessionSpec buildSessionSpec(CliRequest request, Settings settings) {
         String platformToken = request.argumentAt(0);
         String target = request.argumentAt(1);
-        Settings settings = CliSettingsLoader.load();
 
         if (platformToken == null) {
             throw new IllegalArgumentException("Expected: startSession <platform> <target>");
@@ -239,6 +243,13 @@ private PlatformSessionSpec buildSessionSpec(CliRequest request) {
         }
 
         OperatingSystems operatingSystem = parseOperatingSystem(platformToken);
+        if (operatingSystem == OperatingSystems.ANDROID) {
+            settings.set(ConfigTags.AppiumIsApkInstalled, false);
+            settings.set(ConfigTags.AppiumApp, target);
+        } else if (operatingSystem == OperatingSystems.WEBDRIVER) {
+            settings.set(ConfigTags.SUTConnectorValue, target);
+        }
+
         return PlatformSessionSpecFactory.create(
                 operatingSystem,
                 PlatformSessionSpec.TargetType.EXECUTABLE,
@@ -256,6 +267,9 @@ private OperatingSystems parseOperatingSystem(String token) {
         if ("webdriver".equals(normalized) || "web".equals(normalized)) {
             return OperatingSystems.WEBDRIVER;
         }
+        if ("android".equals(normalized) || "appium".equals(normalized)) {
+            return OperatingSystems.ANDROID;
+        }
         throw new IllegalArgumentException("Unsupported platform token: " + token);
     }
 

cli/src/org/testar/cli/CliRunner.java

@@ -47,6 +47,7 @@ private void printHelp() {
         output.println("Usage:");
         output.println("  startSession windows <path>");
         output.println("  startSession webdriver <url>");
+        output.println("  startSession android <apk>");
         output.println("  sessionStatus");
         output.println("  getState");
         output.println("  getStateScreenshot");

cli/test/org/testar/cli/CliDaemonServerTest.java

@@ -0,0 +1,65 @@
+package org.testar.cli;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.testar.config.ConfigTags;
+import org.testar.config.settings.Settings;
+import org.testar.config.settings.SettingsDefaults;
+import org.testar.plugin.OperatingSystems;
+import org.testar.plugin.PlatformSessionSpec;
+
+public class CliDaemonServerTest {
+
+    @Test
+    public void buildSessionSpecForAndroidCopiesApkArgumentIntoSettings() {
+        CliDaemonServer server = new CliDaemonServer();
+        Settings settings = defaultSettings();
+
+        PlatformSessionSpec sessionSpec = server.buildSessionSpec(
+                CliRequest.of(CliCommand.START_SESSION, List.of("android", "/tmp/example.apk")),
+                settings
+        );
+
+        Assert.assertEquals(OperatingSystems.ANDROID, sessionSpec.getOperatingSystem());
+        Assert.assertEquals(PlatformSessionSpec.TargetType.EXECUTABLE, sessionSpec.getTargetType());
+        Assert.assertEquals("/tmp/example.apk", sessionSpec.getTarget());
+        Assert.assertFalse(settings.get(ConfigTags.AppiumIsApkInstalled));
+        Assert.assertEquals("/tmp/example.apk", settings.get(ConfigTags.AppiumApp));
+    }
+
+    @Test
+    public void buildSessionSpecForWebdriverCopiesTargetIntoSettings() {
+        CliDaemonServer server = new CliDaemonServer();
+        Settings settings = defaultSettings();
+
+        PlatformSessionSpec sessionSpec = server.buildSessionSpec(
+                CliRequest.of(CliCommand.START_SESSION, List.of("webdriver", "https://example.org")),
+                settings
+        );
+
+        Assert.assertEquals(OperatingSystems.WEBDRIVER, sessionSpec.getOperatingSystem());
+        Assert.assertEquals("https://example.org", sessionSpec.getTarget());
+        Assert.assertEquals("https://example.org", settings.get(ConfigTags.SUTConnectorValue));
+    }
+
+    @Test
+    public void buildSessionSpecForWindowsKeepsTargetInSessionSpec() {
+        CliDaemonServer server = new CliDaemonServer();
+        Settings settings = defaultSettings();
+
+        PlatformSessionSpec sessionSpec = server.buildSessionSpec(
+                CliRequest.of(CliCommand.START_SESSION, List.of("windows", "notepad.exe")),
+                settings
+        );
+
+        Assert.assertEquals(OperatingSystems.WINDOWS, sessionSpec.getOperatingSystem());
+        Assert.assertEquals("notepad.exe", sessionSpec.getTarget());
+    }
+
+    private static Settings defaultSettings() {
+        return new Settings(SettingsDefaults.getSettingsDefaults(), new Properties());
+    }
+}