Fix Android tests and add them to CI (#1002)

* Fix Android tests and add them to CI

* Get the appium version from ENV variable in travis

Author: shridharkalagi

.gitignore

@@ -10,7 +10,7 @@ settings.xml
 build/
 .gradle
 .gradle/*
-
+classes/
 # Eclipse
 /bin
 /target

.travis.yml

@@ -16,33 +16,42 @@ matrix:
         - npm install -g $appiumVersion
       script:
         - ./gradlew clean build xcuiTest -x test -x signArchives
-#    - language: android
-#      install: true
-#      os: linux
-#      jdk: oraclejdk8
-#      android:
-#        components:
-#          - build-tools-26.0.2
-#          - platform-tools
-#          - tools
-#          - android-22
-#          - extra-android-m2repository
-#          - extra-google-google_play_services
-#          - extra-google-m2repository
-#          - sys-img-armeabi-v7a-android-22
-#      before_install:
-#        # node stuff
-#        - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
-#        - nvm install 6
-#        - node --version
-#        - npm --version
-#        - npm install -g [email protected]
-#        - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
-#        - emulator -avd test -no-audio -no-window &
-#        - android-wait-for-emulator
-#        - adb devices
-#      script:
-#      - ./gradlew clean test --tests "io.appium.java_client.android.*" --exclude-task signArchives
+
+    - language: android
+      install: true
+      install:
+        - echo y | android update sdk -u -a -t tools
+        - echo y | android update sdk -u -a -t platform-tools
+        - echo y | android update sdk -u -a -t build-tools-25.0.2
+        - echo y | android update sdk -u -a -t android-25
+        - echo y | android update sdk -u -a -t extra-google-m2repository
+        - echo y | android update sdk -u -a -t extra-android-m2repository
+      os: linux
+      jdk: oraclejdk8
+      android:
+        components:
+          - extra-android-support
+          - sys-img-armeabi-v7a-android-24
+      before_install:
+        - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
+        - nvm install 8
+        - node --version
+        - npm --version
+        - npm install -g $appiumVersion
+        - echo y | android update sdk -a --no-ui --filter android-24
+        - echo y | android update sdk -a --no-ui --filter sys-img-armeabi-v7a-android-24
+        - android list targets | grep -E '^id:' | awk -F '"' '{$1=""; print $2}' # list all targets
+        - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
+        - emulator -avd test -no-skin -no-window &
+        - android-wait-for-emulator
+        - adb shell input keyevent 82 &
+        - adb wait-for-device get-serialno
+        - sleep 100
+        - chmod +x gradlew
+        - ./gradlew --version
+        - echo y |adb devices
+      script:
+      - ./gradlew clean build uiAutomationTest -x test -x signArchives
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock

build.gradle

@@ -229,5 +229,9 @@ task uiAutomationTest( type: Test ) {
     useJUnit()
     testLogging.showStandardStreams = true
     testLogging.exceptionFormat = 'full'
-    include '**/UIAutomationTest.class'
+    filter {
+        includeTestsMatching '*.SettingTest'
+        includeTestsMatching 'io.appium.java_client.android.ClipboardTest'
+        includeTestsMatching '*.AndroidAppStringsTest'
+    }
 }

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

@@ -23,10 +23,10 @@ public enum Setting {
 
     IGNORE_UNIMPORTANT_VIEWS("ignoreUnimportantViews"),
     WAIT_FOR_IDLE_TIMEOUT("waitForIdleTimeout"),
-    WAIT_FOR_SELECTOR_TIMEOUT("setWaitForSelectorTimeout"),
-    WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT("setScrollAcknowledgmentTimeout"),
-    WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT("setActionAcknowledgmentTimeout"),
-    KEY_INJECTION_DELAY("setKeyInjectionDelay"),
+    WAIT_FOR_SELECTOR_TIMEOUT("waitForSelectorTimeout"),
+    WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT("scrollAcknowledgmentTimeout"),
+    WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT("actionAcknowledgmentTimeout"),
+    KEY_INJECTION_DELAY("keyInjectionDelay"),
     NATIVE_WEB_TAP("nativeWebTap"),
     IMAGE_MATCH_THRESHOLD("imageMatchThreshold"),
     FIX_IMAGE_FIND_SCREENSHOT_DIMENSIONS("fixImageFindScreenshotDims"),

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

@@ -49,11 +49,11 @@ public class AndroidActivityTest extends BaseAndroidTest {
     }
 
     @Test public void startActivityInNewAppTestCase() {
-        Activity activity = new Activity("com.android.contacts", ".ContactsListActivity");
+        Activity activity = new Activity("com.android.settings", ".Settings");
         driver.startActivity(activity);
-        assertEquals(driver.currentActivity(), ".ContactsListActivity");
+        assertEquals(driver.currentActivity(), ".Settings");
         driver.pressKey(new KeyEvent(AndroidKey.BACK));
-        assertEquals(driver.currentActivity(), ".ContactsListActivity");
+        assertEquals(driver.currentActivity(), ".ApiDemos");
     }
 
     @Test public void startActivityInNewAppTestCaseWithoutClosingApp() {
@@ -62,12 +62,12 @@ public class AndroidActivityTest extends BaseAndroidTest {
         driver.startActivity(activity);
         assertEquals(driver.currentActivity(), ".accessibility.AccessibilityNodeProviderActivity");
 
-        Activity newActivity = new Activity("com.android.contacts", ".ContactsListActivity")
-                .setAppWaitPackage("com.android.contacts")
-                .setAppWaitActivity(".ContactsListActivity")
+        Activity newActivity = new Activity("com.android.settings", ".Settings")
+                .setAppWaitPackage("com.android.settings")
+                .setAppWaitActivity(".Settings")
                 .setStopApp(false);
         driver.startActivity(newActivity);
-        assertEquals(driver.currentActivity(), ".ContactsListActivity");
+        assertEquals(driver.currentActivity(), ".Settings");
         driver.pressKey(new KeyEvent(AndroidKey.BACK));
         assertEquals(driver.currentActivity(), ".accessibility.AccessibilityNodeProviderActivity");
     }

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

@@ -44,6 +44,7 @@ public class AndroidContextTest extends BaseAndroidTest {
         driver.context("WEBVIEW_io.appium.android.apis");
         assertEquals(driver.getContext(), "WEBVIEW_io.appium.android.apis");
         driver.context("NATIVE_APP");
+        assertEquals(driver.getContext(), "NATIVE_APP");
     }
 
     @Test(expected = NoSuchContextException.class) public void testContextError() {

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

@@ -210,7 +210,7 @@ public class AndroidDriverTest extends BaseAndroidTest {
 
     @Test public void pullFileTest() {
         byte[] data =
-            driver.pullFile("data/system/registered_services/android.content.SyncAdapter.xml");
+            driver.pullFile("/data/system/users/userlist.xml");
         assert (data.length > 0);
     }
 

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

@@ -65,18 +65,22 @@ public class AndroidFunctionTest extends BaseAndroidTest {
         return null;
     };
 
-    @BeforeClass public static void startWebViewActivity() {
+    @BeforeClass
+    public static void startWebViewActivity() {
         if (driver != null) {
             Activity activity = new Activity("io.appium.android.apis", ".view.WebView1");
             driver.startActivity(activity);
         }
     }
 
-    @Before public void setUp() {
+    @Before
+    public void setUp() {
+
         driver.context("NATIVE_APP");
     }
 
-    @Test public void complexWaitingTestWithPreCondition() {
+    @Test
+    public void complexWaitingTestWithPreCondition() {
         AppiumFunction<Pattern, List<WebElement>> compositeFunction =
                 searchingFunction.compose(contextFunction);
 
@@ -123,13 +127,15 @@ public class AndroidFunctionTest extends BaseAndroidTest {
         assertThat("There should be 3 calls", calls.size(), is(3));
     }
 
-    @Test(expected = TimeoutException.class) public void nullPointerExceptionSafetyTestWithPrecondition() {
+    @Test(expected = TimeoutException.class)
+    public void nullPointerExceptionSafetyTestWithPrecondition() {
         Wait<Pattern> wait = new FluentWait<>(Pattern.compile("Fake_context"))
                 .withTimeout(ofSeconds(30)).pollingEvery(ofMillis(500));
         assertTrue(wait.until(searchingFunction.compose(contextFunction)).size() > 0);
     }
 
-    @Test(expected = TimeoutException.class) public void nullPointerExceptionSafetyTestWithPostConditions() {
+    @Test(expected = TimeoutException.class)
+    public void nullPointerExceptionSafetyTestWithPostConditions() {
         Wait<Pattern> wait = new FluentWait<>(Pattern.compile("Fake_context"))
                 .withTimeout(ofSeconds(30)).pollingEvery(ofMillis(500));
         assertTrue(wait.until(contextFunction.andThen(searchingFunction).andThen(filteringFunction)).size() > 0);

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

@@ -72,10 +72,14 @@ private AndroidElement findElementByText(String text) {
                         new NoSuchElementException(String.format("There is no element with the text '%s'", text)));
     }
 
-    private void clickNext()  {
+    private void clickNext() {
         driver.findElementById("com.android.settings:id/next_button").click();
     }
 
+    private void clickFingerPrintNext() {
+        driver.findElementById("com.android.settings:id/fingerprint_next_button").click();
+    }
+
     private void clickOKInPopup() {
         driver.findElementById("android:id/button1").click();
     }
@@ -88,13 +92,14 @@ private void enterPasswordAndContinue() {
     private void clickOnSecurity() {
         driver.findElement(AndroidUIAutomator("new UiScrollable(new UiSelector()"
                 + ".scrollable(true)).scrollIntoView("
-                + "new UiSelector().text(\"Security\"));")).click();
+                + "new UiSelector().text(\"Security & location\"));")).click();
     }
 
     /**
      * enable system security which is required for finger print activation.
      */
-    @Before public void before() {
+    @Before
+    public void before() {
         initDriver();
         clickOnSecurity();
         findElementByText("Screen lock").click();
@@ -107,13 +112,14 @@ private void clickOnSecurity() {
     /**
      * add a new finger print to security.
      */
-    @Test public void fingerPrintTest() {
+    @Test
+    public void fingerPrintTest() {
         findElementByText("Fingerprint").click();
-        clickNext();
+        clickFingerPrintNext();
         enterPasswordAndContinue();
-        clickNext();
-
-        driver.fingerPrint(2);
+        driver.fingerPrint(1234);
+        driver.fingerPrint(1234);
+        driver.fingerPrint(1234);
         try {
             clickNext();
         } catch (Exception e) {
@@ -124,7 +130,8 @@ private void clickOnSecurity() {
     /**
      * disabling pin lock mode.
      */
-    @After public void after() {
+    @After
+    public void after() {
         driver.quit();
 
         initDriver();

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

@@ -17,7 +17,7 @@ public void openNotification() {
         WebDriverWait wait = new WebDriverWait(driver, 20);
         assertNotEquals(0, wait.until(input -> {
             List<AndroidElement> result = input
-                    .findElements(id("com.android.systemui:id/carrier_label"));
+                    .findElements(id("com.android.systemui:id/settings_button"));
 
             return result.isEmpty() ? null : result;
         }).size());