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

Commit 87cf3efe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing some instrumentation for a workarounded bug" into sc-v2-dev

parents 99b5d139 a1e0b01a

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ import com.android.launcher3.testcomponent.TestCommandReceiver; 
import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.FailureWatcher;

import com.android.launcher3.util.rule.FailureWatcher;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.RecentsView;





import org.junit.After;

import org.junit.After;
@@ -215,7 +214,6 @@ public class FallbackRecentsTest { 
    // b/143488140

    // b/143488140

    //@NavigationModeSwitch

    //@NavigationModeSwitch

    @Test

    @Test

    @ScreenRecord // b/187080582

    public void testOverview() {

    public void testOverview() {

        startAppFast(getAppPackageName());

        startAppFast(getAppPackageName());

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.launcher3.tapl.AppIconMenu; 
import com.android.launcher3.tapl.AppIconMenuItem;

import com.android.launcher3.tapl.AppIconMenuItem;

import com.android.launcher3.tapl.Widgets;

import com.android.launcher3.tapl.Widgets;

import com.android.launcher3.tapl.Workspace;

import com.android.launcher3.tapl.Workspace;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.launcher3.views.OptionsPopupView;

import com.android.launcher3.views.OptionsPopupView;

import com.android.launcher3.widget.picker.WidgetsFullSheet;

import com.android.launcher3.widget.picker.WidgetsFullSheet;

import com.android.launcher3.widget.picker.WidgetsRecyclerView;

import com.android.launcher3.widget.picker.WidgetsRecyclerView;
@@ -97,7 +96,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    }

    }





    @Test

    @Test

    @ScreenRecord //b/187080582

    public void testDevicePressMenu() throws Exception {

    public void testDevicePressMenu() throws Exception {

        mDevice.pressMenu();

        mDevice.pressMenu();

        mDevice.waitForIdle();

        mDevice.waitForIdle();

tests/src/com/android/launcher3/util/rule/ShellCommandRule.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.launcher3.tapl.TestHelpers.getLauncherInMyProcess; 




import android.content.ComponentName;

import android.content.ComponentName;

import android.content.pm.ActivityInfo;

import android.content.pm.ActivityInfo;

import android.util.Log;





import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;
@@ -103,8 +102,6 @@ public class ShellCommandRule implements TestRule { 
     */

     */

    public static ShellCommandRule setDefaultLauncher() {

    public static ShellCommandRule setDefaultLauncher() {

        final ActivityInfo launcher = getLauncherInMyProcess();

        final ActivityInfo launcher = getLauncherInMyProcess();

        Log.d("b/187080582", "Launcher: " + new ComponentName(launcher.packageName, launcher.name)

                .flattenToString());

        return new ShellCommandRule(getLauncherCommand(launcher), null, true, () ->

        return new ShellCommandRule(getLauncherCommand(launcher), null, true, () ->

                Assert.assertEquals("Setting default launcher failed",

                Assert.assertEquals("Setting default launcher failed",

                        new ComponentName(launcher.packageName, launcher.name)

                        new ComponentName(launcher.packageName, launcher.name)

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -763,9 +763,6 @@ public final class LauncherInstrumentation { 
                    try (LauncherInstrumentation.Closable c1 = addContextLayer(

                    try (LauncherInstrumentation.Closable c1 = addContextLayer(

                            "Swiped up from context menu to home")) {

                            "Swiped up from context menu to home")) {

                        waitUntilLauncherObjectGone(CONTEXT_MENU_RES_ID);

                        waitUntilLauncherObjectGone(CONTEXT_MENU_RES_ID);

                        // Swiping up can temporarily bring Nexus Launcher if the current

                        // Launcher is a Launcher3 one. Wait for the current launcher to reappear.

                        SystemClock.sleep(5000); // b/187080582

                        waitForLauncherObject(getAnyObjectSelector());

                        waitForLauncherObject(getAnyObjectSelector());

                    }

                    }

                }

                }