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

Merge "Migrate *ActivityUiTest to use ActivityInstrumentationTestCase2."

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2016-02-04 06:07:43 +00:00
committed by Android (Google) Code Review
parent 7c1cb59fab 24586893ba
commit e21d23515f
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/DocumentsUI/tests/src/com/android/documentsui/DownloadsActivityUiTest.java
View File

@@ -30,7 +30,7 @@ import android.support.test.uiautomator.By;
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.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.MotionEvent;
@@ -38,7 +38,7 @@ import android.view.MotionEvent;
import com.android.documentsui.model.RootInfo;
@LargeTest
public class DownloadsActivityUiTest extends InstrumentationTestCase {
public class DownloadsActivityUiTest extends ActivityInstrumentationTestCase2<DownloadsActivity> {
private static final int TIMEOUT = 5000;
private static final String TAG = "DownloadsActivityUiTest";
@@ -53,6 +53,10 @@ public class DownloadsActivityUiTest extends InstrumentationTestCase {
private ContentProviderClient mClient;
private RootInfo mRoot;
public DownloadsActivityUiTest() {
super(DownloadsActivity.class);
}
public void setUp() throws Exception {
// Initialize UiDevice instance.
Instrumentation instrumentation = getInstrumentation();
@@ -79,7 +83,8 @@ public class DownloadsActivityUiTest extends InstrumentationTestCase {
intent.setDataAndType(mRoot.getUri(), DocumentsContract.Root.MIME_TYPE_ITEM);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
mContext.startActivity(intent);
setActivityIntent(intent);
getActivity(); // Start the activity.
// Wait for the app to appear.
mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT);
@@ -92,11 +97,11 @@ public class DownloadsActivityUiTest extends InstrumentationTestCase {
@Override
protected void tearDown() throws Exception {
// Need to kill off the task we started.
super.tearDown();
Log.d(TAG, "Resetting storage from setUp");
resetStorage();
mClient.release();
super.tearDown();
}
private void resetStorage() throws RemoteException {

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

@@ -30,7 +30,7 @@ import android.support.test.uiautomator.By;
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.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.MotionEvent;
@@ -38,7 +38,7 @@ import android.view.MotionEvent;
import com.android.documentsui.model.RootInfo;
@LargeTest
public class FilesActivityUiTest extends InstrumentationTestCase {
public class FilesActivityUiTest extends ActivityInstrumentationTestCase2<FilesActivity> {
private static final int TIMEOUT = 5000;
private static final String TAG = "FilesActivityUiTest";
@@ -53,7 +53,10 @@ public class FilesActivityUiTest extends InstrumentationTestCase {
private ContentProviderClient mClient;
private RootInfo mRoot_0;
private RootInfo mRoot_1;
private FilesActivity mActivity;
public FilesActivityUiTest() {
super(FilesActivity.class);
}
public void setUp() throws Exception {
// Initialize UiDevice instance.
@@ -72,13 +75,14 @@ public class FilesActivityUiTest extends InstrumentationTestCase {
mResolver = mContext.getContentResolver();
mClient = mResolver.acquireUnstableContentProviderClient(DEFAULT_AUTHORITY);
assertNotNull("Failed to acquire ContentProviderClient.", mClient);
mDocsHelper = new DocumentsProviderHelper(DEFAULT_AUTHORITY, mClient);
// Launch app.
Intent intent = mContext.getPackageManager().getLaunchIntentForPackage(TARGET_PKG);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
mActivity = launchActivityWithIntent(TARGET_PKG, FilesActivity.class, intent);
assertNotNull("Activity not started.", mActivity);
setActivityIntent(intent);
getActivity(); // Start the activity.
// Wait for the app to appear.
mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), TIMEOUT);
@@ -91,16 +95,11 @@ 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();
super.tearDown();
}
private void resetStorage() throws RemoteException {