Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev am: 56cf05291e

Browse Source 
am: 217e152229

* commit '217e152229c51a6d535e6b739ab48c4091d6cd0e':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: I9b28c0c844c1d8a88e9869c9a525c32500ebc05b
This commit is contained in:
Guang Zhu
2016-06-06 19:31:31 +00:00
committed by android-build-merger
parent bc7b5c13f2 217e152229
commit dffb037bb8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/DocumentsUI/tests/Android.mk
View File

@@ -8,7 +8,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner 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_PACKAGE_NAME := DocumentsUITests
LOCAL_INSTRUMENTATION_FOR := DocumentsUI LOCAL_INSTRUMENTATION_FOR := DocumentsUI

2
packages/DocumentsUI/tests/AndroidManifest.xml
View File

@@ -19,7 +19,7 @@
</provider> </provider>
</application> </application>
<instrumentation android:name="android.test.InstrumentationTestRunner" <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.documentsui" android:targetPackage="com.android.documentsui"
android:label="Tests for DocumentsUI" /> android:label="Tests for DocumentsUI" />