Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flaky testLoadsHomebyDefault."

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2016-02-04 04:38:29 +00:00
committed by Android (Google) Code Review
parent c67aacc76f 1c0b2326b8
commit 30f0fc7f38
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
View File

@@ -53,6 +53,7 @@ public class FilesActivityUiTest extends InstrumentationTestCase {
private ContentProviderClient mClient;
private RootInfo mRoot_0;
private RootInfo mRoot_1;
private FilesActivity mActivity;
public void setUp() throws Exception {
// Initialize UiDevice instance.
@@ -76,7 +77,8 @@ public class FilesActivityUiTest extends InstrumentationTestCase {
// Launch app.
Intent intent = mContext.getPackageManager().getLaunchIntentForPackage(TARGET_PKG);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
mContext.startActivity(intent);
mActivity = launchActivityWithIntent(TARGET_PKG, FilesActivity.class, intent);
assertNotNull("Activity not started.", mActivity);
// Wait for the app to appear.
mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT);
@@ -90,6 +92,12 @@ public class FilesActivityUiTest extends InstrumentationTestCase {
@Override
protected void tearDown() throws Exception {
super.tearDown();
if (mActivity != null) {
mActivity.finish();
mActivity = null;
}
Log.d(TAG, "Resetting storage from setUp");
resetStorage();
mClient.release();