Additional changes of the #473:

- AuthenticatesByFinger was added to `io.appium.java_client.android`
- Some improvements of the FingerPrintTest

Author: TikhomirovSergey

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

@@ -18,7 +18,6 @@
 
 import static io.appium.java_client.MobileCommand.longPressKeyCodeCommand;
 import static io.appium.java_client.MobileCommand.pressKeyCodeCommand;
-import static io.appium.java_client.android.AndroidMobileCommandHelper.fingerPrintCommand;
 
 public interface PressesKeyCode extends ExecutesMethod {
 
@@ -42,15 +41,6 @@ default void pressKeyCode(int key, Integer metastate) {
         CommandExecutionHelper.execute(this, pressKeyCodeCommand(key, metastate));
     }
 
-    /**
-     * Authenticate users by using their finger print scans on supported emulators.
-     *
-     * @param fingerPrintId finger prints stored in Android Keystore system (from 1 to 10)
-     */
-    default void fingerPrint(int fingerPrintId) {
-        CommandExecutionHelper.execute(this, fingerPrintCommand(fingerPrintId));
-    }
-
     /**
      * Send a long key event to the device.
      *

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

@@ -47,7 +47,7 @@ public class AndroidDriver<T extends WebElement>
     extends AppiumDriver<T>
     implements PressesKeyCode, HasNetworkConnection, PushesFiles, StartsActivity,
         FindsByAndroidUIAutomator<T>, LocksAndroidDevice, HasAndroidSettings, HasDeviceDetails,
-            HasSupportedPerformanceDataType {
+            HasSupportedPerformanceDataType, AuthenticatesByFinger {
 
     private static final String ANDROID_PLATFORM = MobilePlatform.ANDROID;
 

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

@@ -0,0 +1,18 @@
+package io.appium.java_client.android;
+
+import static io.appium.java_client.android.AndroidMobileCommandHelper.fingerPrintCommand;
+
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
+public interface AuthenticatesByFinger extends ExecutesMethod {
+
+    /**
+     * Authenticate users by using their finger print scans on supported emulators.
+     *
+     * @param fingerPrintId finger prints stored in Android Keystore system (from 1 to 10)
+     */
+    default void fingerPrint(int fingerPrintId) {
+        CommandExecutionHelper.execute(this, fingerPrintCommand(fingerPrintId));
+    }
+}

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

@@ -16,6 +16,8 @@
 
 package io.appium.java_client.android;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import io.appium.java_client.remote.MobileCapabilityType;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import org.junit.After;
@@ -28,8 +30,11 @@
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import java.util.concurrent.TimeUnit;
-
+/**
+ * It is necessary to make this test passing
+ * - emulator API Level 23 Nexus device
+ * - perform 'adb emu finger touch' 1 on Windows
+ */
 public class FingerPrintTest {
 
     private static final String PASSWORD_INPUT_ID = "com.android.settings:id/password_entry";
@@ -62,17 +67,15 @@ public class FingerPrintTest {
      */
     @Before public void before() throws Exception {
         final AndroidDriver driver = getAndroidDriver("ChooseLockGeneric");
-        TimeUnit.SECONDS.sleep(2);
         // clicking the pin lock mode
         driver.findElement(By.xpath("//android.widget.LinearLayout[4]")).click();
-        TimeUnit.SECONDS.sleep(2);
         try {
             // line below will throw exception if secure startup window is popped up
             driver.findElementById(PASSWORD_INPUT_ID);
         } catch (NoSuchElementException e) {
             // in secure startup window
             driver.findElementById("com.android.settings:id/encrypt_require_password").click();
-            TimeUnit.SECONDS.sleep(2);
+            SECONDS.sleep(2);
             clickOKInPopup(driver);
             clickNext(driver);
         }
@@ -87,13 +90,10 @@ public class FingerPrintTest {
      */
     @Test public void pressKeyCodeTest() throws InterruptedException {
         final AndroidDriver driver = getAndroidDriver(".fingerprint.FingerprintSettings");
-        TimeUnit.SECONDS.sleep(2);
         enterPasswordAndContinue(driver);
         // click add fingerprint
         driver.findElementByXPath(FIRST_IN_LIST_XPATH).click();
-        TimeUnit.SECONDS.sleep(2);
         driver.fingerPrint(2);
-        TimeUnit.SECONDS.sleep(2);
         try {
             clickNext(driver);
         } catch (Exception e) {
@@ -108,34 +108,31 @@ public class FingerPrintTest {
      */
     @After public void after() throws InterruptedException {
         final AndroidDriver driver = getAndroidDriver("ChooseLockGeneric");
-        TimeUnit.SECONDS.sleep(2);
         enterPasswordAndContinue(driver);
         driver.findElementByXPath(FIRST_IN_LIST_XPATH).click();
-        TimeUnit.SECONDS.sleep(2);
         clickOKInPopup(driver);
         driver.quit();
     }
 
-    private AndroidDriver getAndroidDriver(String activity) {
+    private static AndroidDriver getAndroidDriver(String activity) {
         DesiredCapabilities capabilities = new DesiredCapabilities();
         capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
         capabilities.setCapability("appPackage", "com.android.settings");
         capabilities.setCapability("appActivity", activity);
-        return new AndroidDriver<AndroidElement>(service.getUrl(), capabilities);
+        AndroidDriver<AndroidElement> driver = new AndroidDriver<AndroidElement>(service.getUrl(), capabilities);
+        driver.manage().timeouts().implicitlyWait(15, SECONDS);
+        return driver;
     }
 
     private void enterPasswordAndContinue(AndroidDriver driver) throws InterruptedException {
         driver.findElementById(PASSWORD_INPUT_ID).sendKeys("1234\n");
-        TimeUnit.SECONDS.sleep(2);
     }
 
     private void clickNext(AndroidDriver driver) throws InterruptedException {
         driver.findElementById("com.android.settings:id/next_button").click();
-        TimeUnit.SECONDS.sleep(2);
     }
 
     private void clickOKInPopup(AndroidDriver driver) throws InterruptedException {
         driver.findElementById("android:id/button1").click();
-        TimeUnit.SECONDS.sleep(2);
     }
 }