diff options
6 files changed, 13 insertions, 8 deletions
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java index 6f1a89baf525..369ab7dc59ea 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/CopyTest.java @@ -32,6 +32,8 @@ import android.provider.DocumentsContract.Document; import android.test.MoreAsserts; import android.test.ServiceTestCase; import android.test.mock.MockContentResolver; +import android.test.suitebuilder.annotation.MediumTest; +import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; import com.android.documentsui.model.DocumentInfo; @@ -52,6 +54,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +@MediumTest public class CopyTest extends ServiceTestCase<CopyService> { public CopyTest() { @@ -89,9 +92,6 @@ public class CopyTest extends ServiceTestCase<CopyService> { super.tearDown(); } - /** - * Test copying a single file. - */ public void testCopyFile() throws Exception { String srcPath = "/test0.txt"; Uri testFile = mStorage.createFile(SRC_ROOT, srcPath, "text/plain", @@ -131,9 +131,6 @@ public class CopyTest extends ServiceTestCase<CopyService> { MoreAsserts.assertEquals("Moved file contents differ", testContent.getBytes(), dstContent); } - /** - * Test copying multiple files. - */ public void testCopyMultipleFiles() throws Exception { String testContent[] = { "The five boxing wizards jump quickly", diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java index 906051640c6a..ba91c83b95e8 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java @@ -31,11 +31,13 @@ import android.support.test.uiautomator.Configurator; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; import android.test.InstrumentationTestCase; +import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; import android.view.MotionEvent; import com.android.documentsui.model.RootInfo; +@LargeTest public class FilesActivityUiTest extends InstrumentationTestCase { private static final int TIMEOUT = 5000; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java index 746e2117dc02..b250e5d344c4 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/DirectoryFragmentModelTest.java @@ -25,6 +25,7 @@ import android.provider.DocumentsContract.Document; import android.support.v7.widget.RecyclerView; import android.test.AndroidTestCase; import android.test.mock.MockContentResolver; +import android.test.suitebuilder.annotation.SmallTest; import android.view.ViewGroup; import com.android.documentsui.DirectoryResult; @@ -34,6 +35,7 @@ import com.android.documentsui.model.DocumentInfo; import java.util.List; +@SmallTest public class DirectoryFragmentModelTest extends AndroidTestCase { private static final int ITEM_COUNT = 5; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java index d1ce56457a87..b3d45aee48b1 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManagerTest.java @@ -18,6 +18,7 @@ package com.android.documentsui.dirlist; import android.support.v7.widget.RecyclerView; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import android.util.SparseBooleanArray; import android.view.View; import android.view.ViewGroup; @@ -32,6 +33,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +@SmallTest public class MultiSelectManagerTest extends AndroidTestCase { private static final List<String> items; @@ -163,7 +165,6 @@ public class MultiSelectManagerTest extends AndroidTestCase { assertRangeSelection(14, 17); } - public void testSingleTapUp_ShiftReversesSelectionDirection() { longPress(7); shiftTap(17); diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java index c4b6ce5c7f87..c856b2290ea1 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_GridModelTest.java @@ -20,11 +20,13 @@ import android.graphics.Point; import android.graphics.Rect; import android.support.v7.widget.RecyclerView.OnScrollListener; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import android.util.SparseBooleanArray; import android.view.View; import com.android.documentsui.dirlist.MultiSelectManager.GridModel; +@SmallTest public class MultiSelectManager_GridModelTest extends AndroidTestCase { private static final int VIEW_PADDING_PX = 5; diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java index 64da750b1306..72fc10814e72 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/MultiSelectManager_SelectionTest.java @@ -17,10 +17,11 @@ package com.android.documentsui.dirlist; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import com.android.documentsui.dirlist.MultiSelectManager.Selection; - +@SmallTest public class MultiSelectManager_SelectionTest extends AndroidTestCase{ private Selection selection; |