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

Commit 93014100 authored by Guang Zhu's avatar Guang Zhu Committed by android-build-merger
Browse files

Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 

am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: If5e573f0fdb7d9ff8e70f4172fb0adf38c2b552a
parents 250468c4 5f95a99d

tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner

LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator

LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator android-support-test



LOCAL_PACKAGE_NAME := DocumentsUITests

LOCAL_INSTRUMENTATION_FOR := DocumentsUI

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
       </provider>

    </application>



    <instrumentation android:name="android.test.InstrumentationTestRunner"

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.documentsui"

        android:label="Tests for DocumentsUI" />