Potential fix for flaky tests.
1) Fixing orientation of test devices to their natural orientation
(Phone is usually portrait, and most big tablets are landscape). We
unfreeze the orientation at tearDown because if we don't, the device
will be permanently locked to that orientation.
2) Adding closerDrawer() to FileManagementUiTest and RootsUiTest.
Bug: 30190207
Change-Id: Iec90ee8d46fef1acbf5b04fe718810edbf99da0c
(cherry picked from commit 73a59e9a02f09e61037e4fb8275d283f3861fe90)
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java
index 8ad30d7..1400fe6 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/ActivityTest.java
@@ -113,14 +113,22 @@
mClient = mResolver.acquireUnstableContentProviderClient(getTestingProviderAuthority());
mDocsHelper = new DocumentsProviderHelper(getTestingProviderAuthority(), mClient);
+ device.setOrientationNatural();
setupTestingRoots();
launchActivity();
resetStorage();
+
+ // Since at the launch of activity, ROOT_0 and ROOT_1 have no files, drawer will
+ // automatically open for phone devices. Espresso register click() as (x, y) MotionEvents,
+ // so if a drawer is on top of a file we want to select, it will actually click the drawer.
+ // Thus to start a clean state, we always try to close first.
+ bots.roots.closeDrawer();
}
@Override
public void tearDown() throws Exception {
+ device.unfreezeRotation();
mClient.release();
super.tearDown();
}