Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c522013f authored by Adrian Velicu's avatar Adrian Velicu Committed by Android (Google) Code Review
Browse files

Merge "Switching to AndroidJUnitRunner instrumentation"

parents 0055d261 329dbe22

tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>