nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am c522013f: Merge "Switching to AndroidJUnitRunner instrumentation" 

* commit 'c522013f88ffb29fb1f980e258684370e86e3d76':
  Switching to AndroidJUnitRunner instrumentation
main
Adrian Velicu 2014-09-18 11:13:35 +00:00 committed by Android Git Automerger
parent 3d54f42511 c522013f88
commit e624c74c85
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Android.mk
View File

@ -24,6 +24,8 @@ LOCAL_AAPT_FLAGS += -0 .dict
# Do not compress test data file # Do not compress test data file
LOCAL_AAPT_FLAGS += -0 .txt LOCAL_AAPT_FLAGS += -0 .txt
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target android-support-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
tests/AndroidManifest.xml
View File

@ -26,7 +26,7 @@
<!-- meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" /--> <!-- meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" /-->
</application> </application>
<instrumentation android:name="android.test.InstrumentationTestRunner" <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.inputmethod.latin" android:targetPackage="com.android.inputmethod.latin"
android:label="LatinIME tests"> android:label="LatinIME tests">
</instrumentation> </instrumentation>