Merge "Add capability to launch to a document in file manager." into arc-apps
diff --git a/tests/functional/com/android/documentsui/FilesActivityUiTest.java b/tests/functional/com/android/documentsui/FilesActivityUiTest.java
index a798f16..867c04f 100644
--- a/tests/functional/com/android/documentsui/FilesActivityUiTest.java
+++ b/tests/functional/com/android/documentsui/FilesActivityUiTest.java
@@ -73,7 +73,7 @@
"file0.log", "file1.png", "file2.csv", "Ham & Cheese.sandwich");
}
- public void testNavigateByBreadcrumb() throws Exception {
+ public void testNavigate_inFixedLayout_byBreadcrumb() throws Exception {
bots.directory.openDocument(dirName1);
bots.directory.waitForDocument(childDir1); // wait for known content
bots.directory.assertDocumentsPresent(childDir1);
@@ -86,6 +86,17 @@
bots.directory.waitForDocument(dirName1);
}
+ public void testNavigate_inFixedLayout_whileHasSelection() throws Exception {
+ if (bots.main.inFixedLayout()) {
+ bots.roots.openRoot(rootDir0.title);
+ device.waitForIdle();
+ bots.directory.selectDocument("file0.log", 1);
+
+ // ensure no exception is thrown while navigating to a different root
+ bots.roots.openRoot(rootDir1.title);
+ }
+ }
+
public void testRootChange_UpdatesSortHeader() throws Exception {
// switch to separate display modes for two separate roots. Each