diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-30 20:46:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-30 20:46:15 +0000 |
| commit | d8aef47393d681b2b018d1fad350cdcb77c0089e (patch) | |
| tree | 18f33dbd6aa438fa5ccf34b225bbbe5922fbe083 /tests | |
| parent | 5500f3513e6d59136565050469570a4f5a5799f1 (diff) | |
| parent | ea38c25854e87b0fe564cff465038a91f4156be2 (diff) | |
| download | android_packages_apps_Trebuchet-d8aef47393d681b2b018d1fad350cdcb77c0089e.tar.gz android_packages_apps_Trebuchet-d8aef47393d681b2b018d1fad350cdcb77c0089e.tar.bz2 android_packages_apps_Trebuchet-d8aef47393d681b2b018d1fad350cdcb77c0089e.zip | |
Merge "removed extra test protocol for unit test" into ub-launcher3-qt-future-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tapl/com/android/launcher3/tapl/Workspace.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index ad2feb4b5..0aa36ddbb 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -22,7 +22,6 @@ 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; @@ -124,7 +123,7 @@ public final class Workspace extends Home { */ public void ensureWorkspaceIsScrollable() { final UiObject2 workspace = verifyActiveContainer(); - if (!isWorkspaceScrollable()) { + if (!isWorkspaceScrollable(workspace)) { try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer( "dragging icon to a second page of workspace to make it scrollable")) { dragIconToWorkspace( @@ -136,12 +135,12 @@ public final class Workspace extends Home { verifyActiveContainer(); } } - assertTrue("Home screen workspace didn't become scrollable", isWorkspaceScrollable()); + assertTrue("Home screen workspace didn't become scrollable", + isWorkspaceScrollable(workspace)); } - private boolean isWorkspaceScrollable() { - Bundle result = mLauncher.getTestInfo(TestProtocol.REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE); - return result.getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, false); + private boolean isWorkspaceScrollable(UiObject2 workspace) { + return workspace.getChildCount() > 1; } @NonNull |