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

Commit 894c2d97 authored by Sebastian Franco's avatar Sebastian Franco
Browse files

Moving test related to the app icon menu to their own file 

Bug: 298234173
Test: atest TaplAppIconMenuTest
Change-Id: Ifa3422a835d87163a16895b0c011e118dde40044
parent 44bd6883

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ filegroup { 
    name: "launcher-oop-tests-src",

    srcs: [

      "src/com/android/launcher3/allapps/OopTaplOpenCloseAllApps.java",

      "src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java",

      "src/com/android/launcher3/dragging/TaplDragTest.java",

      "src/com/android/launcher3/dragging/TaplUninstallRemove.java",

      "src/com/android/launcher3/ui/AbstractLauncherUiTest.java",

tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java

0 → 100644
+106 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.appiconmenu;



import static com.android.launcher3.ui.TaplTestsLauncher3.APP_NAME;

import static com.android.launcher3.ui.TaplTestsLauncher3.initialize;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;



import android.platform.test.annotations.PlatinumTest;



import com.android.launcher3.Launcher;

import com.android.launcher3.popup.ArrowPopup;

import com.android.launcher3.tapl.AllApps;

import com.android.launcher3.tapl.AppIconMenu;

import com.android.launcher3.tapl.AppIconMenuItem;

import com.android.launcher3.tapl.HomeAllApps;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape;



import org.junit.Before;

import org.junit.Test;



/**

 * This test run in both Out of process (Oop) and in-process (Ipc).

 * Tests the AppIconMenu (the menu that appears when you long press an app icon) and also make sure

 * we can launch a shortcut from it.

 */

public class TaplAppIconMenuTest extends AbstractLauncherUiTest {



    @Before

    public void setUp() throws Exception {

        super.setUp();

        initialize(this);

    }



    private boolean isOptionsPopupVisible(Launcher launcher) {

        final ArrowPopup<?> popup = launcher.getOptionsPopup();

        return popup != null && popup.isShown();

    }



    /**

     * Open All apps then open the AppIconMenu then launch a shortcut from the menu and make sure it

     * launches.

     */

    @Test

    @PortraitLandscape

    @PlatinumTest(focusArea = "launcher")

    public void testLaunchMenuItem() {

        final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();

        allApps.freeze();

        try {

            final AppIconMenu menu = allApps.getAppIcon(APP_NAME).openDeepShortcutMenu();



            executeOnLauncher(

                    launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",

                            isOptionsPopupVisible(launcher)));



            final AppIconMenuItem menuItem = menu.getMenuItem(1);

            assertEquals("Wrong menu item", "Shortcut 2", menuItem.getText());

            menuItem.launch(getAppPackageName());

        } finally {

            allApps.unfreeze();

        }

    }



    /**

     * Drag icon from AllApps to the workspace and then open the AppIconMenu and launch a shortcut

     * from it.

     */

    @Test

    public void testLaunchHomeScreenMenuItem() {

        // Drag the test app icon to home screen and open short cut menu from the icon

        final HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps();

        allApps.freeze();

        try {

            allApps.getAppIcon(APP_NAME).dragToWorkspace(false, false);

            final AppIconMenu menu = mLauncher.getWorkspace().getWorkspaceAppIcon(

                    APP_NAME).openDeepShortcutMenu();



            executeOnLauncher(

                    launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",

                            isOptionsPopupVisible(launcher)));



            final AppIconMenuItem menuItem = menu.getMenuItem(1);

            assertEquals("Wrong menu item", "Shortcut 2", menuItem.getText());

            menuItem.launch(getAppPackageName());

        } finally {

            allApps.unfreeze();

        }

    }

}

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

+0 −52
Original line number Diff line number Diff line
@@ -36,11 +36,8 @@ import androidx.test.runner.AndroidJUnit4; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.popup.ArrowPopup;

import com.android.launcher3.tapl.AllApps;

import com.android.launcher3.tapl.AppIcon;

import com.android.launcher3.tapl.AppIconMenu;

import com.android.launcher3.tapl.AppIconMenuItem;

import com.android.launcher3.tapl.HomeAllApps;

import com.android.launcher3.tapl.HomeAppIcon;

import com.android.launcher3.tapl.Widgets;
@@ -248,55 +245,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        return getWidgetsView(launcher).computeVerticalScrollOffset();

    }



    private boolean isOptionsPopupVisible(Launcher launcher) {

        final ArrowPopup<?> popup = launcher.getOptionsPopup();

        return popup != null && popup.isShown();

    }



    @Test

    @PortraitLandscape

    @PlatinumTest(focusArea = "launcher")

    public void testLaunchMenuItem() throws Exception {

        final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();

        allApps.freeze();

        try {

            final AppIconMenu menu = allApps.

                    getAppIcon(APP_NAME).

                    openDeepShortcutMenu();



            executeOnLauncher(

                    launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",

                            isOptionsPopupVisible(launcher)));



            final AppIconMenuItem menuItem = menu.getMenuItem(1);

            assertEquals("Wrong menu item", "Shortcut 2", menuItem.getText());

            menuItem.launch(getAppPackageName());

        } finally {

            allApps.unfreeze();

        }

    }



    @Test

    public void testLaunchHomeScreenMenuItem() {

        // Drag the test app icon to home screen and open short cut menu from the icon

        final HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps();

        allApps.freeze();

        try {

            allApps.getAppIcon(APP_NAME).dragToWorkspace(false, false);

            final AppIconMenu menu = mLauncher.getWorkspace().getWorkspaceAppIcon(

                    APP_NAME).openDeepShortcutMenu();



            executeOnLauncher(

                    launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",

                            isOptionsPopupVisible(launcher)));



            final AppIconMenuItem menuItem = menu.getMenuItem(1);

            assertEquals("Wrong menu item", "Shortcut 2", menuItem.getText());

            menuItem.launch(getAppPackageName());

        } finally {

            allApps.unfreeze();

        }

    }

    @FlakyTest(bugId = 256615483)

    @Test

    @PortraitLandscape