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

Commit 3c7bde72 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Fix TaplTestsLauncher.testWorkspace's page expectation for 2 panel" into sc-v2-dev

parents 40729fbd fc27bd17

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+10 −5
Original line number Original line Diff line number Diff line
@@ -80,8 +80,12 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        assertTrue(message, failed);

        assertTrue(message, failed);

    }

    }





    private int pagesPerScreen() {

        return mLauncher.isTablet() ? 2 : 1;

    }



    private boolean isWorkspaceScrollable(Launcher launcher) {

    private boolean isWorkspaceScrollable(Launcher launcher) {

        return launcher.getWorkspace().getPageCount() > 1;

        return launcher.getWorkspace().getPageCount() > pagesPerScreen();

    }

    }





    private int getCurrentWorkspacePage(Launcher launcher) {

    private int getCurrentWorkspacePage(Launcher launcher) {
@@ -195,8 +199,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        workspace.ensureWorkspaceIsScrollable();

        workspace.ensureWorkspaceIsScrollable();





        executeOnLauncher(

        executeOnLauncher(

                launcher -> assertEquals("Ensuring workspace scrollable didn't switch to page #1",

                launcher -> assertEquals(

                        1, getCurrentWorkspacePage(launcher)));

                        "Ensuring workspace scrollable didn't switch to next screen",

                        pagesPerScreen(), getCurrentWorkspacePage(launcher)));

        executeOnLauncher(

        executeOnLauncher(

                launcher -> assertTrue("ensureScrollable didn't make workspace scrollable",

                launcher -> assertTrue("ensureScrollable didn't make workspace scrollable",

                        isWorkspaceScrollable(launcher)));

                        isWorkspaceScrollable(launcher)));
@@ -212,8 +217,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 




        workspace.flingForward();

        workspace.flingForward();

        executeOnLauncher(

        executeOnLauncher(

                launcher -> assertEquals("Flinging forward didn't switch workspace to page #1",

                launcher -> assertEquals("Flinging forward didn't switch workspace to next screen",

                        1, getCurrentWorkspacePage(launcher)));

                        pagesPerScreen(), getCurrentWorkspacePage(launcher)));

        assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL));

        assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL));





        // Test starting a workspace app.

        // Test starting a workspace app.

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ public final class Workspace extends Home { 
    }

    }





    private boolean isWorkspaceScrollable(UiObject2 workspace) {

    private boolean isWorkspaceScrollable(UiObject2 workspace) {

        return workspace.getChildCount() > 1;

        return workspace.getChildCount() > (mLauncher.isTablet() ? 2 : 1);

    }

    }





    @NonNull

    @NonNull