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

Commit 6327dabc authored by vadimt's avatar vadimt
Browse files

Not assuming reverse order of menu shortcuts 

For Launcher3 tests the order can be either
Shortcut 0
Shortcut 1
Shortcut 2

or
Shortcut 2
Shortcut 1
Shortcut 0

Test: presubmit
Bug: 182006150
Change-Id: Ie014f5e5655a5b0bff05316c2a1457a5b5f703ef
parent c668a2a5

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

+21 −10
Original line number Diff line number Diff line
@@ -334,20 +334,31 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        // 1. Open all apps and wait for load complete.

        // 2. Find the app and long press it to show shortcuts.

        // 3. Press icon center until shortcuts appear

        final AllApps allApps = mLauncher.

                getWorkspace().

                switchToAllApps();

        final AllApps allApps = mLauncher

                .getWorkspace()

                .switchToAllApps();

        allApps.freeze();

        try {

            final AppIconMenuItem menuItem = allApps.

                    getAppIcon(APP_NAME).

                    openMenu().

                    getMenuItem(0);

            final String shortcutName = menuItem.getText();

            assertEquals("Wrong menu item", "Shortcut 3", shortcutName);

            final AppIconMenu menu = allApps

                    .getAppIcon(APP_NAME)

                    .openMenu();

            final AppIconMenuItem menuItem0 = menu.getMenuItem(0);

            final AppIconMenuItem menuItem2 = menu.getMenuItem(2);



            final AppIconMenuItem menuItem;



            final String expectedShortcutName = "Shortcut 3";

            if (menuItem0.getText().equals(expectedShortcutName)) {

                menuItem = menuItem0;

            } else {

                final String shortcutName2 = menuItem2.getText();

                assertEquals("Wrong menu item", expectedShortcutName, shortcutName2);

                menuItem = menuItem2;

            }



            menuItem.dragToWorkspace(false, false);

            mLauncher.getWorkspace().getWorkspaceAppIcon(shortcutName).launch(getAppPackageName());

            mLauncher.getWorkspace().getWorkspaceAppIcon(expectedShortcutName)

                    .launch(getAppPackageName());

        } finally {

            allApps.unfreeze();

        }