aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAdrian Velicu <adrianv@google.com>2014-09-18 19:56:04 +0900
committerAdrian Velicu <adrianv@google.com>2014-09-18 19:57:18 +0900
commit329dbe22396491d8700e0fa1bf1156dab9ac6cc3 (patch)
tree946246a29e0be00d21dd3448b4e6a4ed969c7aa0 /tests
parent5dda75b538ee53351fdfd800e0e5a9f329ad7c2e (diff)
downloadlatinime-329dbe22396491d8700e0fa1bf1156dab9ac6cc3.tar.gz
latinime-329dbe22396491d8700e0fa1bf1156dab9ac6cc3.tar.xz
latinime-329dbe22396491d8700e0fa1bf1156dab9ac6cc3.zip
Switching to AndroidJUnitRunner instrumentation
Bug: 16864527 Change-Id: I8a79a78f24cbc52935743311f5f0dceeb780358f
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.mk2
-rw-r--r--tests/AndroidManifest.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 5baebbdbf..a084ad10d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,6 +24,8 @@ LOCAL_AAPT_FLAGS += -0 .dict
# Do not compress test data file
LOCAL_AAPT_FLAGS += -0 .txt
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target android-support-test
+
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 8a628cdac..26195d39f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -26,7 +26,7 @@
<!-- meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" /-->
</application>
- <instrumentation android:name="android.test.InstrumentationTestRunner"
+ <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.inputmethod.latin"
android:label="LatinIME tests">
</instrumentation>