diff options
5 files changed, 22 insertions, 9 deletions
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java index 08d366a1384f..adcfef333def 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java @@ -20,6 +20,7 @@ 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; +import android.annotation.Nullable; import android.app.Activity; import android.content.ContentProviderClient; import android.content.ContentResolver; @@ -72,6 +73,17 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen super(activityClass); } + /* + * Returns the root that will be opened within the activity. + * By default tests are started with one of the test roots. + * Override the method if you want to open different root on start. + * @return Root that will be opened. Return null if you want to open activity's default root. + */ + @Nullable + protected RootInfo getInitialRoot() { + return rootDir0; + } + @Override public void setUp() throws Exception { device = UiDevice.getInstance(getInstrumentation()); @@ -106,6 +118,9 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen final Intent intent = context.getPackageManager().getLaunchIntentForPackage( UiBot.TARGET_PKG); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); + if (getInitialRoot() != null) { + intent.setData(getInitialRoot().getUri()); + } setActivityIntent(intent); getActivity(); // Launch the activity. } @@ -127,13 +142,11 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen } void assertDefaultContentOfTestDir0() throws UiObjectNotFoundException { - bots.roots.openRoot(ROOT_0_ID); bots.directory.assertDocumentsCount(4); bots.directory.assertDocumentsPresent(fileName1, fileName2, dirName1, fileNameNoRename); } void assertDefaultContentOfTestDir1() throws UiObjectNotFoundException { - bots.roots.openRoot(ROOT_1_ID); bots.directory.assertDocumentsCount(2); bots.directory.assertDocumentsPresent(fileName3, fileName4); } diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java index 1ffef059a3e8..38e125704f76 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java @@ -23,6 +23,8 @@ import android.os.RemoteException; import android.test.suitebuilder.annotation.LargeTest; import android.view.KeyEvent; +import com.android.documentsui.model.RootInfo; + @LargeTest public class FilesActivityUiTest extends ActivityTest<FilesActivity> { @@ -31,6 +33,11 @@ public class FilesActivityUiTest extends ActivityTest<FilesActivity> { } @Override + protected RootInfo getInitialRoot() { + return null; + } + + @Override public void initTestFiles() throws RemoteException { mDocsHelper.createDocument(rootDir0, "text/plain", "file0.log"); mDocsHelper.createDocument(rootDir0, "image/png", "file1.png"); diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java index b866033f647e..2833418b11d6 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/RenameDocumentUiTest.java @@ -33,7 +33,6 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> { public void setUp() throws Exception { super.setUp(); initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); } public void testRenameEnabled_SingleSelection() throws Exception { diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java index dc41a2c4474b..6141832a4499 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/RootsUiTest.java @@ -33,7 +33,6 @@ public class RootsUiTest extends ActivityTest<FilesActivity> { public void setUp() throws Exception { super.setUp(); initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); } public void testRootTapped_GoToRootFromChildDir() throws Exception { diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java index 478c70ca94c3..8c3fd904762a 100644 --- a/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java +++ b/packages/DocumentsUI/tests/src/com/android/documentsui/SearchViewUiTest.java @@ -53,7 +53,6 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { public void testSearch_ResultsFound() throws Exception { initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); assertDefaultContentOfTestDir0(); String query = "file1"; @@ -71,7 +70,6 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { public void testSearchResultsFound_ClearsOnBack() throws Exception { initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); assertDefaultContentOfTestDir0(); String query = fileName1; @@ -86,7 +84,6 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { public void testSearch_NoResults() throws Exception { initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); assertDefaultContentOfTestDir0(); String query = "chocolate"; @@ -106,7 +103,6 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { public void testSearchNoResults_ClearsOnBack() throws Exception { initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); assertDefaultContentOfTestDir0(); String query = "chocolate"; @@ -122,7 +118,6 @@ public class SearchViewUiTest extends ActivityTest<FilesActivity> { public void testSearchResultsFound_ClearsOnDirectoryChange() throws Exception { initTestFiles(); - bots.roots.openRoot(ROOT_0_ID); assertDefaultContentOfTestDir0(); String query = fileName1; |