Move functional tests into separate test target.

Also separate out support code from unittests.

Change-Id: I81490950373e170c857b23468da8d97d6aaf50d9

95 files changed, 42 insertions, 29 deletions

diff --git a/perf-tests/Android.mk b/perf-tests/Android.mk
index 7cbc5fe3d..62b331b50 100644
--- a/perf-tests/Android.mk
+++ b/perf-tests/Android.mk
@@ -5,10 +5,8 @@ LOCAL_MODULE_TAGS := tests
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, ../tests/src/com/android/documentsui/bots) \
-    ../tests/src/com/android/documentsui/DocumentsProviderHelper.java \
-    ../tests/src/com/android/documentsui/StubProvider.java \
-    ../tests/src/com/android/documentsui/functional/ActivityTest.java
+    $(call all-java-files-under, ../tests/common/com/android/documentsui) \
+    ../tests/functional/com/android/documentsui/ActivityTest.java
 
 LOCAL_JAVA_LIBRARIES := android-support-v4 android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator ub-janktesthelper espresso-core
diff --git a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
index 921a3eae8..ee0c9299c 100644
--- a/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
+++ b/perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java
@@ -28,7 +28,7 @@ import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.documentsui.BaseActivity.EventListener;
 import com.android.documentsui.base.RootInfo;
-import com.android.documentsui.functional.ActivityTest;
+import com.android.documentsui.ActivityTest;
 import com.android.documentsui.manager.ManageActivity;
 
 import java.util.ArrayList;
diff --git a/tests/Android.mk b/tests/Android.mk
index febc54209..a190eb7b9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,19 +1,28 @@
 
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 
+# unittests
 LOCAL_MODULE_TAGS := tests
-#LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-java-files-under, common, unit)
+LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+LOCAL_PACKAGE_NAME := DocumentsUIUnitTests
+LOCAL_INSTRUMENTATION_FOR := DocumentsUI
+LOCAL_CERTIFICATE := platform
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+include $(CLEAR_VARS)
 
+# functional tests
+LOCAL_MODULE_TAGS := tests
+LOCAL_SRC_FILES := $(call all-java-files-under, common, functional)
 LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ub-uiautomator espresso-core guava
 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-
-LOCAL_PACKAGE_NAME := DocumentsUITests
+LOCAL_PACKAGE_NAME := DocumentsUIFunctionalTests
 LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/tests/README b/tests/README
new file mode 100644
index 000000000..9fc4e0449
--- /dev/null
+++ b/tests/README
@@ -0,0 +1,8 @@
+Welcome to our tests!
+
+unit tests are under the 'unit/' dir, function under 'functional/'.
+
+To run just small tests"
+adb shell am instrument -w -e debug false -e log false -e timeout_msec 300000 -e size small com.android.documentsui.tests/android.support.test.runner.AndroidJUnitRunner
+
+Replace '-e size small' with '-e size large'.
diff --git a/tests/src/com/android/documentsui/DocumentsProviderHelper.java b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
index beb7e5c84..beb7e5c84 100644
--- a/tests/src/com/android/documentsui/DocumentsProviderHelper.java
+++ b/tests/common/com/android/documentsui/DocumentsProviderHelper.java
diff --git a/tests/src/com/android/documentsui/StubProvider.java b/tests/common/com/android/documentsui/StubProvider.java
index f71ce5d1b..f71ce5d1b 100644
--- a/tests/src/com/android/documentsui/StubProvider.java
+++ b/tests/common/com/android/documentsui/StubProvider.java
diff --git a/tests/src/com/android/documentsui/bots/Bots.java b/tests/common/com/android/documentsui/bots/Bots.java
index bd6be3b88..bd6be3b88 100644
--- a/tests/src/com/android/documentsui/bots/Bots.java
+++ b/tests/common/com/android/documentsui/bots/Bots.java
diff --git a/tests/src/com/android/documentsui/bots/BreadBot.java b/tests/common/com/android/documentsui/bots/BreadBot.java
index 92653d467..92653d467 100644
--- a/tests/src/com/android/documentsui/bots/BreadBot.java
+++ b/tests/common/com/android/documentsui/bots/BreadBot.java
diff --git a/tests/src/com/android/documentsui/bots/DirectoryListBot.java b/tests/common/com/android/documentsui/bots/DirectoryListBot.java
index d985edc13..d985edc13 100644
--- a/tests/src/com/android/documentsui/bots/DirectoryListBot.java
+++ b/tests/common/com/android/documentsui/bots/DirectoryListBot.java
diff --git a/tests/src/com/android/documentsui/bots/GestureBot.java b/tests/common/com/android/documentsui/bots/GestureBot.java
index a6f3b7723..a6f3b7723 100644
--- a/tests/src/com/android/documentsui/bots/GestureBot.java
+++ b/tests/common/com/android/documentsui/bots/GestureBot.java
diff --git a/tests/src/com/android/documentsui/bots/KeyboardBot.java b/tests/common/com/android/documentsui/bots/KeyboardBot.java
index 2e715777c..2e715777c 100644
--- a/tests/src/com/android/documentsui/bots/KeyboardBot.java
+++ b/tests/common/com/android/documentsui/bots/KeyboardBot.java
diff --git a/tests/src/com/android/documentsui/bots/Matchers.java b/tests/common/com/android/documentsui/bots/Matchers.java
index 9d33adc48..9d33adc48 100644
--- a/tests/src/com/android/documentsui/bots/Matchers.java
+++ b/tests/common/com/android/documentsui/bots/Matchers.java
diff --git a/tests/src/com/android/documentsui/bots/SearchBot.java b/tests/common/com/android/documentsui/bots/SearchBot.java
index 66be677ce..66be677ce 100644
--- a/tests/src/com/android/documentsui/bots/SearchBot.java
+++ b/tests/common/com/android/documentsui/bots/SearchBot.java
diff --git a/tests/src/com/android/documentsui/bots/SidebarBot.java b/tests/common/com/android/documentsui/bots/SidebarBot.java
index ae899d3c9..ae899d3c9 100644
--- a/tests/src/com/android/documentsui/bots/SidebarBot.java
+++ b/tests/common/com/android/documentsui/bots/SidebarBot.java
diff --git a/tests/src/com/android/documentsui/bots/SortHeaderBot.java b/tests/common/com/android/documentsui/bots/SortHeaderBot.java
index 24bdc70c7..24bdc70c7 100644
--- a/tests/src/com/android/documentsui/bots/SortHeaderBot.java
+++ b/tests/common/com/android/documentsui/bots/SortHeaderBot.java
diff --git a/tests/src/com/android/documentsui/bots/UiBot.java b/tests/common/com/android/documentsui/bots/UiBot.java
index 67d5c3fab..67d5c3fab 100644
--- a/tests/src/com/android/documentsui/bots/UiBot.java
+++ b/tests/common/com/android/documentsui/bots/UiBot.java
diff --git a/tests/src/com/android/documentsui/dirlist/TestContentProvider.java b/tests/common/com/android/documentsui/dirlist/TestContentProvider.java
index 6d58dcffd..c0505f279 100644
--- a/tests/src/com/android/documentsui/dirlist/TestContentProvider.java
+++ b/tests/common/com/android/documentsui/dirlist/TestContentProvider.java
@@ -16,6 +16,8 @@
 
 package com.android.documentsui.dirlist;
 
+import static org.junit.Assert.assertTrue;
+
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.DocumentsContract;
@@ -45,6 +47,6 @@ class TestContentProvider extends MockContentProvider {
     }
 
     public void assertWasDeleted(DocumentInfo doc) {
-        ModelTest.assertTrue(mDeleted.contains(doc.derivedUri));
+        assertTrue(mDeleted.contains(doc.derivedUri));
     }
 }
\ No newline at end of file
diff --git a/tests/src/com/android/documentsui/dirlist/TestContext.java b/tests/common/com/android/documentsui/dirlist/TestContext.java
index 714062d50..714062d50 100644
--- a/tests/src/com/android/documentsui/dirlist/TestContext.java
+++ b/tests/common/com/android/documentsui/dirlist/TestContext.java
diff --git a/tests/src/com/android/documentsui/dirlist/TestData.java b/tests/common/com/android/documentsui/dirlist/TestData.java
index 5c1d987d4..5c1d987d4 100644
--- a/tests/src/com/android/documentsui/dirlist/TestData.java
+++ b/tests/common/com/android/documentsui/dirlist/TestData.java
diff --git a/tests/src/com/android/documentsui/dirlist/TestDocumentsAdapter.java b/tests/common/com/android/documentsui/dirlist/TestDocumentsAdapter.java
index bd87e0339..bd87e0339 100644
--- a/tests/src/com/android/documentsui/dirlist/TestDocumentsAdapter.java
+++ b/tests/common/com/android/documentsui/dirlist/TestDocumentsAdapter.java
diff --git a/tests/src/com/android/documentsui/dirlist/TestFocusHandler.java b/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java
index 4b872298a..4b872298a 100644
--- a/tests/src/com/android/documentsui/dirlist/TestFocusHandler.java
+++ b/tests/common/com/android/documentsui/dirlist/TestFocusHandler.java
diff --git a/tests/src/com/android/documentsui/dirlist/TestModel.java b/tests/common/com/android/documentsui/dirlist/TestModel.java
index 3e6682428..3e6682428 100644
--- a/tests/src/com/android/documentsui/dirlist/TestModel.java
+++ b/tests/common/com/android/documentsui/dirlist/TestModel.java
diff --git a/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java b/tests/common/com/android/documentsui/dirlist/TestSelectionEnvironment.java
index b69787c69..b69787c69 100644
--- a/tests/src/com/android/documentsui/dirlist/TestSelectionEnvironment.java
+++ b/tests/common/com/android/documentsui/dirlist/TestSelectionEnvironment.java
diff --git a/tests/src/com/android/documentsui/services/TestContentResolver.java b/tests/common/com/android/documentsui/services/TestContentResolver.java
index 8f39b1403..8f39b1403 100644
--- a/tests/src/com/android/documentsui/services/TestContentResolver.java
+++ b/tests/common/com/android/documentsui/services/TestContentResolver.java
diff --git a/tests/src/com/android/documentsui/services/TestJob.java b/tests/common/com/android/documentsui/services/TestJob.java
index 8198a685c..8198a685c 100644
--- a/tests/src/com/android/documentsui/services/TestJob.java
+++ b/tests/common/com/android/documentsui/services/TestJob.java
diff --git a/tests/src/com/android/documentsui/services/TestJobListener.java b/tests/common/com/android/documentsui/services/TestJobListener.java
index 3488650f4..3488650f4 100644
--- a/tests/src/com/android/documentsui/services/TestJobListener.java
+++ b/tests/common/com/android/documentsui/services/TestJobListener.java
diff --git a/tests/src/com/android/documentsui/testing/Bitmaps.java b/tests/common/com/android/documentsui/testing/Bitmaps.java
index 1b94b15eb..1b94b15eb 100644
--- a/tests/src/com/android/documentsui/testing/Bitmaps.java
+++ b/tests/common/com/android/documentsui/testing/Bitmaps.java
diff --git a/tests/src/com/android/documentsui/testing/ClipDatas.java b/tests/common/com/android/documentsui/testing/ClipDatas.java
index 525a02e4f..525a02e4f 100644
--- a/tests/src/com/android/documentsui/testing/ClipDatas.java
+++ b/tests/common/com/android/documentsui/testing/ClipDatas.java
diff --git a/tests/src/com/android/documentsui/testing/DocsProviders.java b/tests/common/com/android/documentsui/testing/DocsProviders.java
index c08157fb3..c08157fb3 100644
--- a/tests/src/com/android/documentsui/testing/DocsProviders.java
+++ b/tests/common/com/android/documentsui/testing/DocsProviders.java
diff --git a/tests/src/com/android/documentsui/testing/DragEvents.java b/tests/common/com/android/documentsui/testing/DragEvents.java
index 4ad9ec070..4ad9ec070 100644
--- a/tests/src/com/android/documentsui/testing/DragEvents.java
+++ b/tests/common/com/android/documentsui/testing/DragEvents.java
diff --git a/tests/src/com/android/documentsui/testing/MultiSelectManagers.java b/tests/common/com/android/documentsui/testing/MultiSelectManagers.java
index e3b426133..e3b426133 100644
--- a/tests/src/com/android/documentsui/testing/MultiSelectManagers.java
+++ b/tests/common/com/android/documentsui/testing/MultiSelectManagers.java
diff --git a/tests/src/com/android/documentsui/testing/Parcelables.java b/tests/common/com/android/documentsui/testing/Parcelables.java
index cd44a9a0a..cd44a9a0a 100644
--- a/tests/src/com/android/documentsui/testing/Parcelables.java
+++ b/tests/common/com/android/documentsui/testing/Parcelables.java
diff --git a/tests/src/com/android/documentsui/testing/SortModels.java b/tests/common/com/android/documentsui/testing/SortModels.java
index d7d68e79b..d7d68e79b 100644
--- a/tests/src/com/android/documentsui/testing/SortModels.java
+++ b/tests/common/com/android/documentsui/testing/SortModels.java
diff --git a/tests/src/com/android/documentsui/testing/TestDirectoryDetails.java b/tests/common/com/android/documentsui/testing/TestDirectoryDetails.java
index 81bbbefc5..81bbbefc5 100644
--- a/tests/src/com/android/documentsui/testing/TestDirectoryDetails.java
+++ b/tests/common/com/android/documentsui/testing/TestDirectoryDetails.java
diff --git a/tests/src/com/android/documentsui/testing/TestDrawable.java b/tests/common/com/android/documentsui/testing/TestDrawable.java
index bc3831ec5..bc3831ec5 100644
--- a/tests/src/com/android/documentsui/testing/TestDrawable.java
+++ b/tests/common/com/android/documentsui/testing/TestDrawable.java
diff --git a/tests/src/com/android/documentsui/testing/TestEvent.java b/tests/common/com/android/documentsui/testing/TestEvent.java
index 9fd6215ee..9fd6215ee 100644
--- a/tests/src/com/android/documentsui/testing/TestEvent.java
+++ b/tests/common/com/android/documentsui/testing/TestEvent.java
diff --git a/tests/src/com/android/documentsui/testing/TestHandler.java b/tests/common/com/android/documentsui/testing/TestHandler.java
index 143ec71b3..143ec71b3 100644
--- a/tests/src/com/android/documentsui/testing/TestHandler.java
+++ b/tests/common/com/android/documentsui/testing/TestHandler.java
diff --git a/tests/src/com/android/documentsui/testing/TestMenu.java b/tests/common/com/android/documentsui/testing/TestMenu.java
index d61db1136..d61db1136 100644
--- a/tests/src/com/android/documentsui/testing/TestMenu.java
+++ b/tests/common/com/android/documentsui/testing/TestMenu.java
diff --git a/tests/src/com/android/documentsui/testing/TestMenuItem.java b/tests/common/com/android/documentsui/testing/TestMenuItem.java
index 110617b4a..110617b4a 100644
--- a/tests/src/com/android/documentsui/testing/TestMenuItem.java
+++ b/tests/common/com/android/documentsui/testing/TestMenuItem.java
diff --git a/tests/src/com/android/documentsui/testing/TestPredicate.java b/tests/common/com/android/documentsui/testing/TestPredicate.java
index 738b09674..738b09674 100644
--- a/tests/src/com/android/documentsui/testing/TestPredicate.java
+++ b/tests/common/com/android/documentsui/testing/TestPredicate.java
diff --git a/tests/src/com/android/documentsui/testing/TestRecyclerView.java b/tests/common/com/android/documentsui/testing/TestRecyclerView.java
index 8759a9a21..8759a9a21 100644
--- a/tests/src/com/android/documentsui/testing/TestRecyclerView.java
+++ b/tests/common/com/android/documentsui/testing/TestRecyclerView.java
diff --git a/tests/src/com/android/documentsui/testing/TestScheduledExecutorService.java b/tests/common/com/android/documentsui/testing/TestScheduledExecutorService.java
index f5001ee41..f5001ee41 100644
--- a/tests/src/com/android/documentsui/testing/TestScheduledExecutorService.java
+++ b/tests/common/com/android/documentsui/testing/TestScheduledExecutorService.java
diff --git a/tests/src/com/android/documentsui/testing/TestSearchViewManager.java b/tests/common/com/android/documentsui/testing/TestSearchViewManager.java
index a8d4ce0c0..a8d4ce0c0 100644
--- a/tests/src/com/android/documentsui/testing/TestSearchViewManager.java
+++ b/tests/common/com/android/documentsui/testing/TestSearchViewManager.java
diff --git a/tests/src/com/android/documentsui/testing/TestSelectionDetails.java b/tests/common/com/android/documentsui/testing/TestSelectionDetails.java
index e7f9b6ccd..e7f9b6ccd 100644
--- a/tests/src/com/android/documentsui/testing/TestSelectionDetails.java
+++ b/tests/common/com/android/documentsui/testing/TestSelectionDetails.java
diff --git a/tests/src/com/android/documentsui/testing/TestTimer.java b/tests/common/com/android/documentsui/testing/TestTimer.java
index 04af28366..04af28366 100644
--- a/tests/src/com/android/documentsui/testing/TestTimer.java
+++ b/tests/common/com/android/documentsui/testing/TestTimer.java
diff --git a/tests/src/com/android/documentsui/testing/Views.java b/tests/common/com/android/documentsui/testing/Views.java
index d2b920d39..d2b920d39 100644
--- a/tests/src/com/android/documentsui/testing/Views.java
+++ b/tests/common/com/android/documentsui/testing/Views.java
diff --git a/tests/src/com/android/documentsui/testing/dirlist/SelectionProbe.java b/tests/common/com/android/documentsui/testing/dirlist/SelectionProbe.java
index 12f464211..12f464211 100644
--- a/tests/src/com/android/documentsui/testing/dirlist/SelectionProbe.java
+++ b/tests/common/com/android/documentsui/testing/dirlist/SelectionProbe.java
diff --git a/tests/src/com/android/documentsui/testing/dirlist/TestSelectionListener.java b/tests/common/com/android/documentsui/testing/dirlist/TestSelectionListener.java
index 06c221927..06c221927 100644
--- a/tests/src/com/android/documentsui/testing/dirlist/TestSelectionListener.java
+++ b/tests/common/com/android/documentsui/testing/dirlist/TestSelectionListener.java
diff --git a/tests/src/com/android/documentsui/functional/ActivityTest.java b/tests/functional/com/android/documentsui/ActivityTest.java
index 920b1465d..4aa2f33f1 100644
--- a/tests/src/com/android/documentsui/functional/ActivityTest.java
+++ b/tests/functional/com/android/documentsui/ActivityTest.java
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
-
-import static com.android.documentsui.StubProvider.DEFAULT_AUTHORITY;
-import static com.android.documentsui.StubProvider.ROOT_0_ID;
-import static com.android.documentsui.StubProvider.ROOT_1_ID;
+package com.android.documentsui;
 
 import android.app.Activity;
 import android.content.ContentProviderClient;
@@ -32,8 +28,8 @@ import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.MotionEvent;
-
 import com.android.documentsui.DocumentsProviderHelper;
+import com.android.documentsui.StubProvider;
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.bots.Bots;
 import com.android.documentsui.bots.UiBot;
@@ -89,15 +85,15 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen
      * @return Authority of the provider.
      */
     protected String getTestingProviderAuthority() {
-        return DEFAULT_AUTHORITY;
+        return StubProvider.DEFAULT_AUTHORITY;
     }
 
     /**
      * Resolves testing roots.
      */
     protected void setupTestingRoots() throws RemoteException {
-        rootDir0 = mDocsHelper.getRoot(ROOT_0_ID);
-        rootDir1 = mDocsHelper.getRoot(ROOT_1_ID);
+        rootDir0 = mDocsHelper.getRoot(StubProvider.ROOT_0_ID);
+        rootDir1 = mDocsHelper.getRoot(StubProvider.ROOT_1_ID);
     }
 
     @Override
diff --git a/tests/src/com/android/documentsui/functional/BandSelectionUiTest.java b/tests/functional/com/android/documentsui/BandSelectionUiTest.java
index c2987ff47..c2987ff47 100644
--- a/tests/src/com/android/documentsui/functional/BandSelectionUiTest.java
+++ b/tests/functional/com/android/documentsui/BandSelectionUiTest.java
diff --git a/tests/src/com/android/documentsui/functional/FileManagementUiTest.java b/tests/functional/com/android/documentsui/FileManagementUiTest.java
index 9ad6d1060..f9a47217a 100644
--- a/tests/src/com/android/documentsui/functional/FileManagementUiTest.java
+++ b/tests/functional/com/android/documentsui/FileManagementUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import static com.android.documentsui.StubProvider.ROOT_0_ID;
 import static com.android.documentsui.StubProvider.ROOT_1_ID;
diff --git a/tests/src/com/android/documentsui/functional/FilesActivityDefaultsUiTest.java b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
index 47a4f9e2f..8c0dc164b 100644
--- a/tests/src/com/android/documentsui/functional/FilesActivityDefaultsUiTest.java
+++ b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import static com.android.documentsui.StubProvider.ROOT_0_ID;
 import static com.android.documentsui.StubProvider.ROOT_1_ID;
diff --git a/tests/src/com/android/documentsui/functional/FilesActivityUiTest.java b/tests/functional/com/android/documentsui/FilesActivityUiTest.java
index d2a670782..4454e208b 100644
--- a/tests/src/com/android/documentsui/functional/FilesActivityUiTest.java
+++ b/tests/functional/com/android/documentsui/FilesActivityUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import android.net.Uri;
 import android.os.RemoteException;
diff --git a/tests/src/com/android/documentsui/functional/GestureSelectionUiTest.java b/tests/functional/com/android/documentsui/GestureSelectionUiTest.java
index a0b819671..a0b819671 100644
--- a/tests/src/com/android/documentsui/functional/GestureSelectionUiTest.java
+++ b/tests/functional/com/android/documentsui/GestureSelectionUiTest.java
diff --git a/tests/src/com/android/documentsui/functional/IntegratedDownloadsUiTest.java b/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java
index dd92c4163..5462461b8 100644
--- a/tests/src/com/android/documentsui/functional/IntegratedDownloadsUiTest.java
+++ b/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import android.app.DownloadManager;
 import android.app.DownloadManager.Request;
diff --git a/tests/src/com/android/documentsui/functional/KeyboardNavigationUiTest.java b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
index 1dbf60223..c45eaed9a 100644
--- a/tests/src/com/android/documentsui/functional/KeyboardNavigationUiTest.java
+++ b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import android.net.Uri;
 import android.os.RemoteException;
diff --git a/tests/src/com/android/documentsui/functional/RenameDocumentUiTest.java b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
index f1ba6916f..3bbf691f4 100644
--- a/tests/src/com/android/documentsui/functional/RenameDocumentUiTest.java
+++ b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.test.suitebuilder.annotation.LargeTest;
diff --git a/tests/src/com/android/documentsui/functional/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java
index 8f79cdbbd..39c438397 100644
--- a/tests/src/com/android/documentsui/functional/SearchViewUiTest.java
+++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import static com.android.documentsui.StubProvider.ROOT_0_ID;
 import static com.android.documentsui.StubProvider.ROOT_1_ID;
diff --git a/tests/src/com/android/documentsui/functional/SidebarUiTest.java b/tests/functional/com/android/documentsui/SidebarUiTest.java
index 28cac95e4..cd56d1be3 100644
--- a/tests/src/com/android/documentsui/functional/SidebarUiTest.java
+++ b/tests/functional/com/android/documentsui/SidebarUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import static com.android.documentsui.StubProvider.ROOT_0_ID;
 import static com.android.documentsui.StubProvider.ROOT_1_ID;
diff --git a/tests/src/com/android/documentsui/functional/SortDocumentUiTest.java b/tests/functional/com/android/documentsui/SortDocumentUiTest.java
index 0a1be5863..a20292597 100644
--- a/tests/src/com/android/documentsui/functional/SortDocumentUiTest.java
+++ b/tests/functional/com/android/documentsui/SortDocumentUiTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.functional;
+package com.android.documentsui;
 
 import android.net.Uri;
 import android.support.test.filters.LargeTest;
diff --git a/tests/src/com/android/documentsui/DocumentsMenuManagerTest.java b/tests/unit/com/android/documentsui/DocumentsMenuManagerTest.java
index ad790625a..ad790625a 100644
--- a/tests/src/com/android/documentsui/DocumentsMenuManagerTest.java
+++ b/tests/unit/com/android/documentsui/DocumentsMenuManagerTest.java
diff --git a/tests/src/com/android/documentsui/FilesMenuManagerTest.java b/tests/unit/com/android/documentsui/FilesMenuManagerTest.java
index 9dd5705fd..9dd5705fd 100644
--- a/tests/src/com/android/documentsui/FilesMenuManagerTest.java
+++ b/tests/unit/com/android/documentsui/FilesMenuManagerTest.java
diff --git a/tests/src/com/android/documentsui/ItemDragListenerTest.java b/tests/unit/com/android/documentsui/ItemDragListenerTest.java
index e1fb87a5a..e1fb87a5a 100644
--- a/tests/src/com/android/documentsui/ItemDragListenerTest.java
+++ b/tests/unit/com/android/documentsui/ItemDragListenerTest.java
diff --git a/tests/src/com/android/documentsui/ThumbnailCacheTest.java b/tests/unit/com/android/documentsui/ThumbnailCacheTest.java
index ee6ab01c2..ee6ab01c2 100644
--- a/tests/src/com/android/documentsui/ThumbnailCacheTest.java
+++ b/tests/unit/com/android/documentsui/ThumbnailCacheTest.java
diff --git a/tests/src/com/android/documentsui/base/DocumentInfoTest.java b/tests/unit/com/android/documentsui/base/DocumentInfoTest.java
index 12b4165ca..12b4165ca 100644
--- a/tests/src/com/android/documentsui/base/DocumentInfoTest.java
+++ b/tests/unit/com/android/documentsui/base/DocumentInfoTest.java
diff --git a/tests/src/com/android/documentsui/base/StateTest.java b/tests/unit/com/android/documentsui/base/StateTest.java
index 1f01b6714..1f01b6714 100644
--- a/tests/src/com/android/documentsui/base/StateTest.java
+++ b/tests/unit/com/android/documentsui/base/StateTest.java
diff --git a/tests/src/com/android/documentsui/clipping/ClipStorageTest.java b/tests/unit/com/android/documentsui/clipping/ClipStorageTest.java
index 73366f871..73366f871 100644
--- a/tests/src/com/android/documentsui/clipping/ClipStorageTest.java
+++ b/tests/unit/com/android/documentsui/clipping/ClipStorageTest.java
diff --git a/tests/src/com/android/documentsui/clipping/UrisSupplierTest.java b/tests/unit/com/android/documentsui/clipping/UrisSupplierTest.java
index 1cdb09979..1cdb09979 100644
--- a/tests/src/com/android/documentsui/clipping/UrisSupplierTest.java
+++ b/tests/unit/com/android/documentsui/clipping/UrisSupplierTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/BandController_GridModelTest.java b/tests/unit/com/android/documentsui/dirlist/BandController_GridModelTest.java
index 59547adc0..59547adc0 100644
--- a/tests/src/com/android/documentsui/dirlist/BandController_GridModelTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/BandController_GridModelTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java b/tests/unit/com/android/documentsui/dirlist/DocumentHolderTest.java
index 9f9663f42..9f9663f42 100644
--- a/tests/src/com/android/documentsui/dirlist/DocumentHolderTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/DocumentHolderTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/DragScrollListenerTest.java b/tests/unit/com/android/documentsui/dirlist/DragScrollListenerTest.java
index 3e0d74782..3e0d74782 100644
--- a/tests/src/com/android/documentsui/dirlist/DragScrollListenerTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/DragScrollListenerTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/DragStartListenerTest.java b/tests/unit/com/android/documentsui/dirlist/DragStartListenerTest.java
index cec5ba8e9..cec5ba8e9 100644
--- a/tests/src/com/android/documentsui/dirlist/DragStartListenerTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/DragStartListenerTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/FocusManagerTest.java b/tests/unit/com/android/documentsui/dirlist/FocusManagerTest.java
index 295b857c5..295b857c5 100644
--- a/tests/src/com/android/documentsui/dirlist/FocusManagerTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/FocusManagerTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/GestureSelectorTest.java b/tests/unit/com/android/documentsui/dirlist/GestureSelectorTest.java
index 266854a0a..266854a0a 100644
--- a/tests/src/com/android/documentsui/dirlist/GestureSelectorTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/GestureSelectorTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java b/tests/unit/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java
index 0680e332b..0680e332b 100644
--- a/tests/src/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/ModelTest.java b/tests/unit/com/android/documentsui/dirlist/ModelTest.java
index 75273c9f8..75273c9f8 100644
--- a/tests/src/com/android/documentsui/dirlist/ModelTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/ModelTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java b/tests/unit/com/android/documentsui/dirlist/MultiSelectManagerTest.java
index fef5672c9..fef5672c9 100644
--- a/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/MultiSelectManagerTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java b/tests/unit/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
index dcdc842c4..dcdc842c4 100644
--- a/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SingleSelectTest.java b/tests/unit/com/android/documentsui/dirlist/MultiSelectManager_SingleSelectTest.java
index 020f316f6..020f316f6 100644
--- a/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SingleSelectTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/MultiSelectManager_SingleSelectTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java b/tests/unit/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java
index f19b912a2..f19b912a2 100644
--- a/tests/src/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/SectionBreakDocumentsAdapterWrapperTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java b/tests/unit/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java
index 8d2642441..8d2642441 100644
--- a/tests/src/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/UserInputHandler_MouseTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java b/tests/unit/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java
index be408ba62..be408ba62 100644
--- a/tests/src/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/UserInputHandler_RangeTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java b/tests/unit/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java
index 051c1cf96..051c1cf96 100644
--- a/tests/src/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/UserInputHandler_TouchTest.java
diff --git a/tests/src/com/android/documentsui/dirlist/ViewAutoScrollerTest.java b/tests/unit/com/android/documentsui/dirlist/ViewAutoScrollerTest.java
index e2aaa843e..e2aaa843e 100644
--- a/tests/src/com/android/documentsui/dirlist/ViewAutoScrollerTest.java
+++ b/tests/unit/com/android/documentsui/dirlist/ViewAutoScrollerTest.java
diff --git a/tests/src/com/android/documentsui/roots/RootsCacheTest.java b/tests/unit/com/android/documentsui/roots/RootsCacheTest.java
index 6adead8c0..6adead8c0 100644
--- a/tests/src/com/android/documentsui/roots/RootsCacheTest.java
+++ b/tests/unit/com/android/documentsui/roots/RootsCacheTest.java
diff --git a/tests/src/com/android/documentsui/services/AbstractCopyJobTest.java b/tests/unit/com/android/documentsui/services/AbstractCopyJobTest.java
index 6b52fdd16..6b52fdd16 100644
--- a/tests/src/com/android/documentsui/services/AbstractCopyJobTest.java
+++ b/tests/unit/com/android/documentsui/services/AbstractCopyJobTest.java
diff --git a/tests/src/com/android/documentsui/services/AbstractJobTest.java b/tests/unit/com/android/documentsui/services/AbstractJobTest.java
index c2034d24f..c2034d24f 100644
--- a/tests/src/com/android/documentsui/services/AbstractJobTest.java
+++ b/tests/unit/com/android/documentsui/services/AbstractJobTest.java
diff --git a/tests/src/com/android/documentsui/services/CopyJobTest.java b/tests/unit/com/android/documentsui/services/CopyJobTest.java
index 64211c20e..64211c20e 100644
--- a/tests/src/com/android/documentsui/services/CopyJobTest.java
+++ b/tests/unit/com/android/documentsui/services/CopyJobTest.java
diff --git a/tests/src/com/android/documentsui/services/DeleteJobTest.java b/tests/unit/com/android/documentsui/services/DeleteJobTest.java
index 9dbe7cee5..9dbe7cee5 100644
--- a/tests/src/com/android/documentsui/services/DeleteJobTest.java
+++ b/tests/unit/com/android/documentsui/services/DeleteJobTest.java
diff --git a/tests/src/com/android/documentsui/services/FileOperationServiceTest.java b/tests/unit/com/android/documentsui/services/FileOperationServiceTest.java
index 306be3ca1..306be3ca1 100644
--- a/tests/src/com/android/documentsui/services/FileOperationServiceTest.java
+++ b/tests/unit/com/android/documentsui/services/FileOperationServiceTest.java
diff --git a/tests/src/com/android/documentsui/services/MoveJobTest.java b/tests/unit/com/android/documentsui/services/MoveJobTest.java
index 56d96ccae..56d96ccae 100644
--- a/tests/src/com/android/documentsui/services/MoveJobTest.java
+++ b/tests/unit/com/android/documentsui/services/MoveJobTest.java
diff --git a/tests/src/com/android/documentsui/sorting/SortControllerTest.java b/tests/unit/com/android/documentsui/sorting/SortControllerTest.java
index 32ac3dcdf..32ac3dcdf 100644
--- a/tests/src/com/android/documentsui/sorting/SortControllerTest.java
+++ b/tests/unit/com/android/documentsui/sorting/SortControllerTest.java
diff --git a/tests/src/com/android/documentsui/sorting/SortController_TabletLayoutTest.java b/tests/unit/com/android/documentsui/sorting/SortController_TabletLayoutTest.java
index 042335534..042335534 100644
--- a/tests/src/com/android/documentsui/sorting/SortController_TabletLayoutTest.java
+++ b/tests/unit/com/android/documentsui/sorting/SortController_TabletLayoutTest.java
diff --git a/tests/src/com/android/documentsui/sorting/SortDimensionTest.java b/tests/unit/com/android/documentsui/sorting/SortDimensionTest.java
index 9468b84ed..9468b84ed 100644
--- a/tests/src/com/android/documentsui/sorting/SortDimensionTest.java
+++ b/tests/unit/com/android/documentsui/sorting/SortDimensionTest.java
diff --git a/tests/src/com/android/documentsui/sorting/SortModelTest.java b/tests/unit/com/android/documentsui/sorting/SortModelTest.java
index e41884878..e41884878 100644
--- a/tests/src/com/android/documentsui/sorting/SortModelTest.java
+++ b/tests/unit/com/android/documentsui/sorting/SortModelTest.java