Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea38c258 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

removed extra test protocol for unit test 

Bug: 140406263
Test: run TaplTestsLauncher3
Change-Id: I73b3098bd3aa92fed41d22a94cb58fd07263d26a
parent 10b14147

src/com/android/launcher3/PagedView.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -1708,11 +1708,4 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
        mTmpIntPair[1] = rightChild;

        mTmpIntPair[1] = rightChild;

        return mTmpIntPair;

        return mTmpIntPair;

    }

    }



    /**

     * Returns true if overscroll is allowed, otherwise false.

     */

    public boolean allowOverScroll() {

        return mAllowOverScroll;

    }

}
 
}

src/com/android/launcher3/testing/TestInformationHandler.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -82,14 +82,6 @@ public class TestInformationHandler implements ResourceBasedOverride { 
                break;

                break;

            }

            }





            case TestProtocol.REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE: {

                if (mLauncher == null) return null;



                response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,

                        mLauncher.getWorkspace().getPageCount() > 1);

                break;

            }



            case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: {

            case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: {

                response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, true);

                response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, true);

                break;

                break;

src/com/android/launcher3/testing/TestProtocol.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -66,8 +66,6 @@ public final class TestProtocol { 
            "all-apps-to-overview-swipe-height";

            "all-apps-to-overview-swipe-height";

    public static final String REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT =

    public static final String REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT =

            "home-to-all-apps-swipe-height";

            "home-to-all-apps-swipe-height";

    public static final String REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE =

            "does-workspace-have-second-page";

    public static final String REQUEST_HOTSEAT_TOP = "hotseat-top";

    public static final String REQUEST_HOTSEAT_TOP = "hotseat-top";

    public static final String REQUEST_IS_LAUNCHER_INITIALIZED = "is-launcher-initialized";

    public static final String REQUEST_IS_LAUNCHER_INITIALIZED = "is-launcher-initialized";

    public static final String REQUEST_FREEZE_APP_LIST = "freeze-app-list";

    public static final String REQUEST_FREEZE_APP_LIST = "freeze-app-list";

tests/tapl/com/android/launcher3/tapl/Workspace.java

+5 −6
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import static junit.framework.TestCase.assertTrue; 




import android.graphics.Point;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.SystemClock;

import android.os.SystemClock;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.MotionEvent;
@@ -124,7 +123,7 @@ public final class Workspace extends Home { 
     */

     */

    public void ensureWorkspaceIsScrollable() {

    public void ensureWorkspaceIsScrollable() {

        final UiObject2 workspace = verifyActiveContainer();

        final UiObject2 workspace = verifyActiveContainer();

        if (!isWorkspaceScrollable()) {

        if (!isWorkspaceScrollable(workspace)) {

            try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(

            try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(

                    "dragging icon to a second page of workspace to make it scrollable")) {

                    "dragging icon to a second page of workspace to make it scrollable")) {

                dragIconToWorkspace(

                dragIconToWorkspace(
@@ -136,12 +135,12 @@ public final class Workspace extends Home { 
                verifyActiveContainer();

                verifyActiveContainer();

            }

            }

        }

        }

        assertTrue("Home screen workspace didn't become scrollable", isWorkspaceScrollable());

        assertTrue("Home screen workspace didn't become scrollable",

                isWorkspaceScrollable(workspace));

    }

    }





    private boolean isWorkspaceScrollable() {

    private boolean isWorkspaceScrollable(UiObject2 workspace) {

        Bundle result = mLauncher.getTestInfo(TestProtocol.REQUEST_DOES_WORKSPACE_HAVE_SECOND_PAGE);

        return workspace.getChildCount() > 1;

        return result.getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, false);

    }

    }





    @NonNull

    @NonNull