summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@google.com>2014-02-20 21:04:09 -0800
committerBrett Chabot <brettchabot@google.com>2014-02-20 21:04:40 -0800
commit7e65b85f087904539252e3a83190058680914999 (patch)
tree853f4c4f16b141297e66b4a2e4dcbd80d89b5a1c /tests
parent51222b3d1e2c3d78595c34bcf3f52b0e6bef9563 (diff)
downloadandroid_packages_apps_UnifiedEmail-7e65b85f087904539252e3a83190058680914999.tar.gz
android_packages_apps_UnifiedEmail-7e65b85f087904539252e3a83190058680914999.tar.bz2
android_packages_apps_UnifiedEmail-7e65b85f087904539252e3a83190058680914999.zip
Convert tests to use android-support-test.
Change-Id: Ia1525904c8bd669305f72c6c1973cc0365ca1251
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.mk1
-rw-r--r--tests/AndroidManifest.xml7
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index bb5e91ca4..06efb23c2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -33,6 +33,7 @@ LOCAL_INSTRUMENTATION_FOR := UnifiedEmail
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
include $(BUILD_PACKAGE)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 7964930ec..a4db0d044 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -36,10 +36,11 @@
<!--
This declares that this app uses the instrumentation test runner targeting
- the package of com.google.android.gm. To run the tests use the command:
- "adb shell am instrument -w com.google.android.gmtests/android.test.InstrumentationTestRunner"
+ the package of com.android.mail. To run the tests use the command:
+ "adb shell am instrument -w com.android.mail.emailtests/android.support.test.runner.AndroidJUnitRunner"
+i
-->
- <instrumentation android:name="android.test.InstrumentationTestRunner"
+ <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.mail"
android:label="Tests for Email."/>