Merge "Remove revealLauncher and revealApp from tests." into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
88d5592ff2
@@ -93,7 +93,6 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen
|
|||||||
bots = new Bots(device, context, TIMEOUT);
|
bots = new Bots(device, context, TIMEOUT);
|
||||||
|
|
||||||
Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_MOUSE);
|
Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_MOUSE);
|
||||||
bots.main.revealLauncher();
|
|
||||||
|
|
||||||
mResolver = context.getContentResolver();
|
mResolver = context.getContentResolver();
|
||||||
mClient = mResolver.acquireUnstableContentProviderClient(DEFAULT_AUTHORITY);
|
mClient = mResolver.acquireUnstableContentProviderClient(DEFAULT_AUTHORITY);
|
||||||
@@ -103,8 +102,6 @@ public abstract class ActivityTest<T extends Activity> extends ActivityInstrumen
|
|||||||
rootDir1 = mDocsHelper.getRoot(ROOT_1_ID);
|
rootDir1 = mDocsHelper.getRoot(ROOT_1_ID);
|
||||||
|
|
||||||
launchActivity();
|
launchActivity();
|
||||||
|
|
||||||
bots.main.revealApp();
|
|
||||||
resetStorage();
|
resetStorage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -212,16 +212,6 @@ public class UiBot extends BaseBot {
|
|||||||
return mDevice.findObject(selector);
|
return mDevice.findObject(selector);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void revealLauncher() {
|
|
||||||
mDevice.pressHome();
|
|
||||||
mDevice.wait(Until.hasObject(By.pkg(LAUNCHER_PKG).depth(0)), mTimeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void revealApp() {
|
|
||||||
mDevice.wait(Until.hasObject(By.pkg(TARGET_PKG).depth(0)), mTimeout);
|
|
||||||
mDevice.waitForIdle();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void pressKey(int keyCode) {
|
public void pressKey(int keyCode) {
|
||||||
mDevice.pressKeyCode(keyCode);
|
mDevice.pressKeyCode(keyCode);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user