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

Commit 3680357a authored by vadimt's avatar vadimt
Browse files

Preparing to enabling Inproc launcher tests as presubmit 

The plan:
1. Skip all tests that fail in inproc mode on CF (this CL)
2. Observe postsubmit and make sure no inproc tests are failing or too
flaky on CF
3. Enable presubmit
4. Switch to skipping tests from step 1 only for inproc presubmit;
they'll start failing in postsubmit
5. Gradually make all tests pass and not flaky and enable them back on
presubmit

Bug: 142828227
Change-Id: I6ea3d53771503e8fd968555bb2e4cb1be10d83ef
parent 64359898

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

+12 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ public class FallbackRecentsTest { 
    @NavigationModeSwitch

    @Test

    public void goToOverviewFromHome() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

            return;

        }

        mDevice.pressHome();

        assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg(

                mOtherLauncherActivity.packageName)), WAIT_TIME_MS));
@@ -140,6 +144,10 @@ public class FallbackRecentsTest { 
    @NavigationModeSwitch

    @Test

    public void goToOverviewFromApp() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

            return;

        }

        startAppFastAndWaitForRecentTask(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));



        mLauncher.getBackground().switchToOverview();
@@ -174,6 +182,10 @@ public class FallbackRecentsTest { 
    @NavigationModeSwitch

    @Test

    public void testOverview() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

            return;

        }

        startAppFastAndWaitForRecentTask(getAppPackageName());

        startAppFastAndWaitForRecentTask(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

        startTestActivity(2);

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

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.test.filters.LargeTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.Launcher;

import com.android.launcher3.tapl.TestHelpers;

import com.android.launcher3.util.RaceConditionReproducer;

import com.android.quickstep.NavigationModeSwitchRule.Mode;

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
@@ -91,6 +92,10 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    public void testStressSwipeToOverview() {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

            return;

        }

        for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) {

            // Destroy Launcher activity.

            closeLauncherActivity();

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

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 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.TestHelpers;

import com.android.launcher3.tapl.Widgets;

import com.android.launcher3.tapl.Workspace;

import com.android.launcher3.views.OptionsPopupView;
@@ -172,6 +173,10 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


    @Test

    public void testWorkspace() throws Exception {

        // b/142828227

        if (android.os.Build.MODEL.contains("Cuttlefish") && TestHelpers.isInLauncherProcess()) {

            return;

        }

        final Workspace workspace = mLauncher.getWorkspace();



        // Test that ensureWorkspaceIsScrollable adds a page by dragging an icon there.