From 1ebd8416aebd6ac48c32af3aee3aaf469695a5a4 Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Mon, 6 Jun 2016 11:24:31 -0400
Subject: [PATCH] migrate documents UI tests to use AndroidJUnitRunner

The runner replaces deprecated InstrumentationTestRunner, provides
equivalent functionality, and in addition support JUnit4, sharding
and per test method timeout.

Change-Id: I1c76996d347d3f0f378997f5e7b871279c2b032f
---
 packages/DocumentsUI/tests/Android.mk          | 2 +-
 packages/DocumentsUI/tests/AndroidManifest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/DocumentsUI/tests/Android.mk b/packages/DocumentsUI/tests/Android.mk
index 3983f780ad627..c004315a6d180 100644
--- a/packages/DocumentsUI/tests/Android.mk
+++ b/packages/DocumentsUI/tests/Android.mk
@@ -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
diff --git a/packages/DocumentsUI/tests/AndroidManifest.xml b/packages/DocumentsUI/tests/AndroidManifest.xml
index b9862858558f9..0b767662f2ea4 100644
--- a/packages/DocumentsUI/tests/AndroidManifest.xml
+++ b/packages/DocumentsUI/tests/AndroidManifest.xml
@@ -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" />