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

Commit 8997e562 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Branching Taskbar visible/hidden assertion from... 

Merge "Branching Taskbar visible/hidden assertion from testQuickSwitchToPreviousAppForTablet" into udc-qpr-dev
parents 55b55344 ee8db054

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

+15 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.quickstep;



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

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

import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
@@ -27,6 +28,7 @@ import static org.junit.Assume.assumeTrue; 


import android.content.Intent;

import android.platform.test.annotations.PlatinumTest;

import android.util.Log;



import androidx.test.filters.LargeTest;

import androidx.test.platform.app.InstrumentationRegistry;
@@ -44,6 +46,7 @@ import com.android.launcher3.tapl.OverviewActions; 
import com.android.launcher3.tapl.OverviewTask;

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

import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.Wait;

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

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
@@ -313,7 +316,6 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @ScreenRecord // b/242163205

    @PlatinumTest(focusArea = "launcher")

    @TaskbarModeSwitch(mode = PERSISTENT)

    public void testQuickSwitchToPreviousAppForTablet() throws Exception {

        assumeTrue(mLauncher.isTablet());

        startTestActivity(2);
@@ -331,10 +333,19 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


        assertTrue("The first app we should have quick switched to is not running",

                isTestActivityRunning(2));

        // Expect task bar visible when the launched app was the test activity.



        launchedAppState = getAndAssertLaunchedApp();



        Log.e(FLAKY_QUICK_SWITCH_TO_PREVIOUS_APP,

                "is Taskbar Transient : " + DisplayController.isTransientTaskbar(mTargetContext));

        // TODO(b/286084688): Remove this branching check after test corruption is resolved.

        // Branching this check because of test corruption.

        if (DisplayController.isTransientTaskbar(mTargetContext)) {

            launchedAppState.assertTaskbarHidden();

        } else {

            launchedAppState.assertTaskbarVisible();

        }

    }



    private boolean isTestActivityRunning(int activityNumber) {

        return mDevice.wait(Until.hasObject(By.pkg(getAppPackageName())

tests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ public final class TestProtocol { 
    public static final String PERMANENT_DIAG_TAG = "TaplTarget";

    public static final String TWO_TASKBAR_LONG_CLICKS = "b/262282528";

    public static final String FLAKY_ACTIVITY_COUNT = "b/260260325";

    public static final String FLAKY_QUICK_SWITCH_TO_PREVIOUS_APP = "b/286084688";

    public static final String ICON_MISSING = "b/282963545";

    public static final String LAUNCH_SPLIT_PAIR = "b/288939273";