diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2019-09-18 17:10:54 -0700 |
|---|---|---|
| committer | Pinyao Ting <pinyaoting@google.com> | 2019-09-23 13:06:36 -0700 |
| commit | 7752023c08643554ef422447c8ed841476137f8f (patch) | |
| tree | 21be79c2b490b8bb70499a967d27dd71dcaa9c6e /tests/tapl/com | |
| parent | af6daa2873a82e9222cad3589061e5c2b26702b5 (diff) | |
| download | android_packages_apps_Trebuchet-7752023c08643554ef422447c8ed841476137f8f.tar.gz android_packages_apps_Trebuchet-7752023c08643554ef422447c8ed841476137f8f.tar.bz2 android_packages_apps_Trebuchet-7752023c08643554ef422447c8ed841476137f8f.zip | |
fix test for a11y change in supporting -1 page
Bug: 140406263
Change-Id: I0a39db135a5e5b0fe570ace55a368a7f4b6cb453
Test: run TaplTestLauncher3 locally
Diffstat (limited to 'tests/tapl/com')
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Workspace.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index 510ea1409..d556afc9b 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -22,6 +22,7 @@ import static junit.framework.TestCase.assertTrue; import android.graphics.Point; import android.graphics.Rect; +import android.os.Bundle; import android.os.SystemClock; import android.view.KeyEvent; import android.view.MotionEvent; @@ -125,7 +126,7 @@ public final class Workspace extends Home { */ public void ensureWorkspaceIsScrollable() { final UiObject2 workspace = verifyActiveContainer(); - if (!isWorkspaceScrollable(workspace)) { + if (!isWorkspaceScrollable()) { try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( "dragging icon to a second page of workspace to make it scrollable")) { dragIconToWorkspace( @@ -137,12 +138,12 @@ public final class Workspace extends Home { verifyActiveContainer(); } } - assertTrue("Home screen workspace didn't become scrollable", - isWorkspaceScrollable(workspace)); + assertTrue("Home screen workspace didn't become scrollable", isWorkspaceScrollable()); } - private boolean isWorkspaceScrollable(UiObject2 workspace) { - return workspace.isScrollable(); + private boolean isWorkspaceScrollable() { + Bundle result = mLauncher.getTestInfo(TestProtocol.REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE); + return result.getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, false); } @NonNull |