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

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

Merge "Re-promoting some tests to postsubmit" into main

parents 05dc6db7 5cc6b2ba

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

+5 −3
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import static com.android.launcher3.ui.TaplTestsLauncher3Test.getAppPackageName; 
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.rule.ShellCommandRule.disableHeadsUpNotification;

import static com.android.launcher3.util.rule.ShellCommandRule.getLauncherCommand;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;
@@ -67,7 +69,6 @@ import com.android.quickstep.views.RecentsView; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.RuleChain;
@@ -185,9 +186,10 @@ public class FallbackRecentsTest { 
        mLauncher.getLaunchedAppState().switchToOverview();

    }



    // b/143488140

    // Staging; will be promoted to presubmit if stable

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT)



    //@NavigationModeSwitch

    @Ignore

    @Test

    public void goToOverviewFromApp() {

        startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

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

+9 −5
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.quickstep.views.RecentsView; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -210,11 +209,12 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        return launcher.<RecentsView>getOverviewPanel().getBottomRowTaskCountForTablet();

    }



    @Ignore

    // Staging; will be promoted to presubmit if stable

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT)



    @Test

    @NavigationModeSwitch

    @PortraitLandscape

    @ScreenRecord // b/238461765

    public void testSwitchToOverview() throws Exception {

        startTestAppsWithCheck();

        assertNotNull("Workspace.switchToOverview() returned null",
@@ -236,7 +236,9 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        }

    }



    @Ignore

    // Staging; will be promoted to presubmit if stable

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT)



    @Test

    @NavigationModeSwitch

    @PortraitLandscape
@@ -293,9 +295,11 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        launchedAppState.switchToOverview();

    }



    // Staging; will be promoted to presubmit if stable

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT)



    @Test

    @TaskbarModeSwitch

    @Ignore // b/314873201

    public void testQuickSwitchToPreviousAppForTablet() throws Exception {

        assumeTrue(mLauncher.isTablet());

        startTestActivity(2);

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

+6 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import static com.android.launcher3.LauncherState.NORMAL; 
import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;

import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL;

import static com.android.launcher3.util.TestUtil.installDummyAppForUser;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;
@@ -40,10 +42,10 @@ import com.android.launcher3.allapps.WorkPausedCard; 
import com.android.launcher3.allapps.WorkProfileManager;

import com.android.launcher3.tapl.LauncherInstrumentation;

import com.android.launcher3.util.TestUtil;

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



import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;



import java.io.IOException;
@@ -135,8 +137,10 @@ public class TaplWorkProfileTest extends AbstractLauncherUiTest { 
                LauncherInstrumentation.WAIT_TIME_MS);

    }



    // Staging; will be promoted to presubmit if stable

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT)



    @Test

    @Ignore("b/243855320")

    public void toggleWorks() {

        assumeTrue(mWorkProfileSetupSuccessful);

        waitForWorkTabSetup();