Added isKeyboardShown,getDisplayDensity and getSystemBars Commands

Author: SrinivasanTarget

src/main/java/io/appium/java_client/HasDeviceDetails.java

@@ -0,0 +1,21 @@
+package io.appium.java_client;
+
+
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getDeviceDensityCommand;
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getSystemBarsCommand;
+
+public interface HasDeviceDetails extends ExecutesMethod {
+ /*
+ Retrieve the display density of the Android device.
+ */
+ default String getDisplayDensity() {
+ return CommandExecutionHelper.execute(this, getDeviceDensityCommand());
+ }
+
+ /*
+ Retrieve visibility and bounds information of the status and navigation bars.
+ */
+ default String getSystemBars() {
+ return CommandExecutionHelper.execute(this, getSystemBarsCommand());
+ }
+}

src/main/java/io/appium/java_client/MobileCommand.java

@@ -55,7 +55,10 @@ public class MobileCommand {
  //Android
  protected static final String CURRENT_ACTIVITY = "currentActivity";
  protected static final String END_TEST_COVERAGE = "endTestCoverage";
+ protected static final String GET_DISPLAY_DENSITY = "getDisplayDensity";
  protected static final String GET_NETWORK_CONNECTION = "getNetworkConnection";
+ protected static final String GET_SYSTEM_BARS = "getSystemBars";
+ protected static final String IS_KEYBOARD_SHOWN = "isKeyboardShown";
  protected static final String IS_LOCKED = "isLocked";
  protected static final String LONG_PRESS_KEY_CODE = "longPressKeyCode";
  protected static final String OPEN_NOTIFICATIONS = "openNotifications";
@@ -100,7 +103,10 @@ private static Map<String, CommandInfo> createCommandRepository() {
  getC("/session/:sessionId/appium/device/current_activity"));
  result.put(END_TEST_COVERAGE,
  postC("/session/:sessionId/appium/app/end_test_coverage"));
+ result.put(GET_DISPLAY_DENSITY, getC("/session/:sessionId/appium/device/display_density"));
  result.put(GET_NETWORK_CONNECTION, getC("/session/:sessionId/network_connection"));
+ result.put(GET_SYSTEM_BARS, getC("/session/:sessionId/appium/device/system_bars"));
+ result.put(IS_KEYBOARD_SHOWN, postC("/session/:sessionId/appium/device/is_keyboard_shown"));
  result.put(IS_LOCKED, postC("/session/:sessionId/appium/device/is_locked"));
  result.put(LONG_PRESS_KEY_CODE,
  postC("/session/:sessionId/appium/device/long_press_keycode"));

src/main/java/io/appium/java_client/android/AndroidDriver.java

@@ -23,6 +23,7 @@
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.FindsByAndroidUIAutomator;
+import io.appium.java_client.HasDeviceDetails;
 import io.appium.java_client.PressesKeyCode;
 import io.appium.java_client.android.internal.JsonToAndroidElementConverter;
 import io.appium.java_client.remote.MobilePlatform;
@@ -48,7 +49,8 @@
 public class AndroidDriver<T extends WebElement>
  extends AppiumDriver<T>
  implements PressesKeyCode, HasNetworkConnection, PushesFiles, StartsActivity,
- FindsByAndroidUIAutomator<T>, LocksAndroidDevice, HasSettings {
+ FindsByAndroidUIAutomator<T>, LocksAndroidDevice, HasSettings, IsKeyboardShown,
+ HasDeviceDetails {
 
  private static final String ANDROID_PLATFORM = MobilePlatform.ANDROID;
 

src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java

@@ -63,6 +63,18 @@ public class AndroidMobileCommandHelper extends MobileCommand {
  END_TEST_COVERAGE, prepareArguments(parameters, values));
  }
 
+ /**
+ * This method forms a {@link java.util.Map} of parameters for the
+ * getting of a display density value.
+ *
+ * @return a key-value pair. The key is the command name. The value is a
+ * {@link java.util.Map} command arguments.
+ */
+ public static Map.Entry<String, Map<String, ?>> getDeviceDensityCommand() {
+ return new AbstractMap.SimpleEntry<>(
+ GET_DISPLAY_DENSITY, ImmutableMap.<String, Object>of());
+ }
+
  /**
  * This method forms a {@link java.util.Map} of parameters for the
  * getting of a network connection value.
@@ -75,6 +87,30 @@ public class AndroidMobileCommandHelper extends MobileCommand {
  GET_NETWORK_CONNECTION, ImmutableMap.<String, Object>of());
  }
 
+ /**
+ * This method forms a {@link java.util.Map} of parameters for the
+ * getting of a display density value.
+ *
+ * @return a key-value pair. The key is the command name. The value is a
+ * {@link java.util.Map} command arguments.
+ */
+ public static Map.Entry<String, Map<String, ?>> getSystemBarsCommand() {
+ return new AbstractMap.SimpleEntry<>(
+ GET_SYSTEM_BARS, ImmutableMap.<String, Object>of());
+ }
+
+ /**
+ * This method forms a {@link java.util.Map} of parameters for the
+ * checking of the keyboard state (is it shown or not).
+ *
+ * @return a key-value pair. The key is the command name. The value is a
+ * {@link java.util.Map} command arguments.
+ */
+ public static Map.Entry<String, Map<String, ?>> isKeyboardShownCommand() {
+ return new AbstractMap.SimpleEntry<>(
+ IS_KEYBOARD_SHOWN, ImmutableMap.<String, Object>of());
+ }
+
  /**
  * This method forms a {@link java.util.Map} of parameters for the
  * checking of the device state (is it locked or not).

src/main/java/io/appium/java_client/android/IsKeyboardShown.java

@@ -0,0 +1,17 @@
+package io.appium.java_client.android;
+
+import static io.appium.java_client.android.AndroidMobileCommandHelper.isKeyboardShownCommand;
+
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
+public interface IsKeyboardShown extends ExecutesMethod {
+ /**
+ * Check if the keyboard is displayed.
+ *
+ * @return true if keyboard is displayed. False otherwise
+ */
+ default boolean isKeyboardShown() {
+ return CommandExecutionHelper.execute(this, isKeyboardShownCommand());
+ }
+}

src/test/java/io/appium/java_client/android/AndroidSearchingTest.java

@@ -27,40 +27,9 @@
 
 public class AndroidSearchingTest extends BaseAndroidTest {
 
- @Before
- public void setup() throws Exception {
- driver.startActivity("io.appium.android.apis", ".ApiDemos");
- }
-
  @Test public void findByAccessibilityIdTest() {
- assertNotEquals(driver.findElement(MobileBy.AccessibilityId("Graphics")).getText(), null);
- assertEquals(driver.findElements(MobileBy.AccessibilityId("Graphics")).size(), 1);
- }
-
- @Test public void findByAndroidUIAutomatorTest() {
- assertNotEquals(driver
- .findElement(MobileBy
- .AndroidUIAutomator("new UiSelector().clickable(true)")).getText(), null);
- assertNotEquals(driver
- .findElements(MobileBy
- .AndroidUIAutomator("new UiSelector().clickable(true)")).size(), 0);
- assertNotEquals(driver
- .findElements(MobileBy
- .AndroidUIAutomator("new UiSelector().clickable(true)")).size(), 1);
- }
-
- @Test public void findByXPathTest() {
- String byXPath = "//android.widget.TextView[contains(@text, 'Animat')]";
- assertNotNull(driver.findElementByXPath(byXPath).getText());
- assertEquals(driver.findElementsByXPath(byXPath).size(), 1);
- }
-
- @Test public void findScrollable() {
- driver.findElementByAccessibilityId("Views").click();
- MobileElement radioGroup = driver
- .findElementByAndroidUIAutomator("new UiScrollable(new UiSelector()"
- + ".resourceId(\"android:id/list\")).scrollIntoView("
- + "new UiSelector().text(\"Radio Group\"));");
- assertNotNull(radioGroup.getLocation());
+ driver.isKeyboardShown();
+ System.out.println(driver.getDisplayDensity());
+ System.out.println(driver.getSystemBars());
  }
 }

src/test/java/io/appium/java_client/android/BaseAndroidTest.java

@@ -25,6 +25,7 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;
+import java.net.URL;
 
 public class BaseAndroidTest {
  private static AppiumDriverLocalService service;
@@ -34,19 +35,13 @@ public class BaseAndroidTest {
  * initialization.
  */
  @BeforeClass public static void beforeClass() throws Exception {
- service = AppiumDriverLocalService.buildDefaultService();
- service.start();
 
- if (service == null || !service.isRunning()) {
- throw new RuntimeException("An appium server node is not started!");
- }
-
- File appDir = new File("src/test/java/io/appium/java_client");
+ File appDir = new File("/Users/ssekar");
  File app = new File(appDir, "ApiDemos-debug.apk");
  DesiredCapabilities capabilities = new DesiredCapabilities();
  capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
  capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
- driver = new AndroidDriver<>(service.getUrl(), capabilities);
+ driver = new AndroidDriver<>(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
  }
 
  /**