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

Commit 5c97cb68 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Not assuming reverse order of menu shortcuts" into sc-dev

parents 93f2b752 6327dabc
Loading
Loading
Loading
Loading
+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();
        }