From 46b54e7312cf8f2fe51da7ca102af0ce73bbf277 Mon Sep 17 00:00:00 2001
From: Yusuke Matsubara <whym@whym.org>
Date: Thu, 20 Apr 2017 17:48:04 +0900
Subject: [PATCH] Remove redundant Espresso/Travis settings

---
 .travis.yml                                              | 3 ---
 app/build.gradle                                         | 3 +--
 .../java/fr/free/nrw/commons/SettingsActivityTest.java   | 9 ++-------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8754b0e89..267625fdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,6 @@ android:
     - build-tools-25.0.1
     - extra-google-m2repository
     - extra-android-m2repository
-    - extra-google-google_play_services
-    - extra-android-support
     - ${ANDROID_TARGET}
     - android-25
     - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
@@ -23,7 +21,6 @@ before_script:
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
   - emulator -avd test -no-audio -no-window &
   - android-wait-for-emulator
-  - adb shell input keyevent 82 &
 script:
   - ./gradlew test connectedAndroidTest -stacktrace
 after_failure:
diff --git a/app/build.gradle b/app/build.gradle
index 925ee8855..c77aea346 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     compile "com.android.support:support-v4:${project.supportLibVersion}"
     compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
     compile "com.android.support:design:${project.supportLibVersion}"
-    compile "com.android.support:support-annotations:${project.supportLibVersion}"
     compile 'com.google.code.gson:gson:2.7'
     compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
@@ -51,4 +50,4 @@ android {
         disable 'ExtraTranslation'
         abortOnError false
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java
index dc7ead0ab..f2047506b 100644
--- a/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java
+++ b/app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java
@@ -86,8 +86,7 @@ public class SettingsActivityTest {
 
         // click "CC BY-4.0"
         Espresso.onView(
-                // FIXME: just R.string.license_name_cc_by_four should be fine but fails on Travis
-                textAnyOf(R.string.license_name_cc_by_four, R.string.license_name_cc_by_4_0)
+                ViewMatchers.withText(R.string.license_name_cc_by_4_0)
         ).perform(ViewActions.click());
 
         // click "License" (the first item)
@@ -99,14 +98,10 @@ public class SettingsActivityTest {
         // test the value remains "CC BY-4.0"
         Espresso.onView(ViewMatchers.isChecked())
                 .check(ViewAssertions.matches(
-                        textAnyOf(R.string.license_name_cc_by_four, R.string.license_name_cc_by_4_0)
+                        ViewMatchers.withText(R.string.license_name_cc_by_4_0)
                 ));
     }
 
-    private Matcher<View> textAnyOf(int id1, int id2) {
-        return anyOf(ViewMatchers.withText(id1), ViewMatchers.withText(id2));
-    }
-
     private static Matcher<View> findPreferenceList() {
         return allOf(
                 ViewMatchers.isDescendantOfA(ViewMatchers.withId(android.R.id.content)),