diff options
author | vadimt <vadimt@google.com> | 2019-04-11 13:50:14 -0700 |
---|---|---|
committer | Vadim Tryshev <vadimt@google.com> | 2019-04-12 19:26:01 +0000 |
commit | ab472e8c0619309c051d6a584aa43d4937203316 (patch) | |
tree | 99d6110e0331d234498a702e3f204a8768195651 /tests/tapl | |
parent | 6938276da1c82882aa2f208b01a58f946c7cbd6f (diff) | |
download | android_packages_apps_Trebuchet-ab472e8c0619309c051d6a584aa43d4937203316.tar.gz android_packages_apps_Trebuchet-ab472e8c0619309c051d6a584aa43d4937203316.tar.bz2 android_packages_apps_Trebuchet-ab472e8c0619309c051d6a584aa43d4937203316.zip |
Simplifying and removing unnecessary checks from app-drag tests
Change-Id: Iab6603f62b8e3c95b2c3351bfe41f35f15f59246
(cherry picked from commit 8dc1dbe814d295c35c39c757a741dc7dec1cdcc2)
Diffstat (limited to 'tests/tapl')
-rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Launchable.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/Launchable.java b/tests/tapl/com/android/launcher3/tapl/Launchable.java index d940412a4..1b372ec13 100644 --- a/tests/tapl/com/android/launcher3/tapl/Launchable.java +++ b/tests/tapl/com/android/launcher3/tapl/Launchable.java @@ -45,24 +45,17 @@ abstract class Launchable { * Clicks the object to launch its app. */ public Background launch(String expectedPackageName) { - return launch(expectedPackageName, By.pkg(expectedPackageName).depth(0)); + return launch(By.pkg(expectedPackageName)); } - /** - * Clicks the object to launch its app. - */ - public Background launch(String expectedPackageName, String expectedAppText) { - return launch(expectedPackageName, By.pkg(expectedPackageName).text(expectedAppText)); - } - - private Background launch(String errorMessage, BySelector selector) { + private Background launch(BySelector selector) { LauncherInstrumentation.log("Launchable.launch before click " + mObject.getVisibleCenter()); mLauncher.assertTrue( "Launching an app didn't open a new window: " + mObject.getText(), mObject.clickAndWait(Until.newWindow(), LauncherInstrumentation.WAIT_TIME_MS)); mLauncher.assertTrue( - "App didn't start: " + errorMessage, + "App didn't start: " + selector, mLauncher.getDevice().wait(Until.hasObject(selector), LauncherInstrumentation.WAIT_TIME_MS)); return new Background(mLauncher); |