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

Commit 025bc000 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Removing a dead test" into sc-v2-dev am: d5884f1c am: 239d9dfb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16249737

Change-Id: I93e7b822833c82f76b8375011c012527531f9b8e
parents 2f082127 239d9dfb

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

+0 −8
Original line number Diff line number Diff line
@@ -107,14 +107,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        mLauncher.pressHome();

    }



    @Ignore

    public void testOpenHomeSettingsFromWorkspace() {

        mDevice.pressMenu();

        mDevice.waitForIdle();

        mLauncher.getOptionsPopupMenu().getMenuItem("Home settings")

                .launch(mDevice.getLauncherPackageName());

    }



    @Test

    public void testPressHomeOnAllAppsContextMenu() throws Exception {

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

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

+0 −14
Original line number Diff line number Diff line
@@ -1025,20 +1025,6 @@ public final class LauncherInstrumentation { 
        }

    }



    /**

     * Gets the Options Popup Menu object if the current state is showing the popup menu. Fails if

     * the launcher is not in that state.

     *

     * @return Options Popup Menu object.

     */

    @NonNull

    public OptionsPopupMenu getOptionsPopupMenu() {

        try (LauncherInstrumentation.Closable c = addContextLayer(

                "want to get context menu object")) {

            return new OptionsPopupMenu(this);

        }

    }



    void waitUntilLauncherObjectGone(String resId) {

        waitUntilGoneBySelector(getLauncherObjectSelector(resId));

    }

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

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 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.tapl;



import androidx.annotation.NonNull;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiObject2;



public class OptionsPopupMenu {



    private final LauncherInstrumentation mLauncher;

    private final UiObject2 mDeepShortcutsContainer;



    OptionsPopupMenu(LauncherInstrumentation launcher) {

        mLauncher = launcher;

        mDeepShortcutsContainer = launcher.waitForLauncherObject("popup_container");

    }



    /**

     * Returns a menu item with a given label. Fails if it doesn't exist.

     */

    @NonNull

    public OptionsPopupMenuItem getMenuItem(@NonNull final String label) {

        final UiObject2 menuItem = mLauncher.waitForObjectInContainer(mDeepShortcutsContainer,

                By.text(label));

        return new OptionsPopupMenuItem(mLauncher, menuItem);

    }

}