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

Commit 754549ca authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Reenable tablet tests for OOP TAPL tests."

parents 14568de2 30c28a0a

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

+3 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assume.assumeTrue;



import android.content.Intent;
@@ -37,7 +38,6 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel; 
import com.android.launcher3.tapl.Overview;

import com.android.launcher3.tapl.OverviewActions;

import com.android.launcher3.tapl.OverviewTask;

import com.android.launcher3.tapl.TestHelpers;

import com.android.launcher3.ui.TaplTestsLauncher3;

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

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
@@ -322,10 +322,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @PortraitLandscape

    public void testOverviewForTablet() throws Exception {

        // TODO(b/210158657): Re-enable for OOP

        if (!mLauncher.isTablet() || !TestHelpers.isInLauncherProcess()) {

            return;

        }

        assumeTrue(mLauncher.isTablet());



        for (int i = 2; i <= 14; i++) {

            startTestActivity(i);

        }

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ filegroup { 
      "src/com/android/launcher3/util/rule/TestStabilityRule.java",

      "src/com/android/launcher3/ui/TaplTestsLauncher3.java",

      "src/com/android/launcher3/testcomponent/BaseTestingActivity.java",

      "src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java",

      "src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java",

      "src/com/android/launcher3/testcomponent/TestCommandReceiver.java",

      "src/com/android/launcher3/testcomponent/TestLauncherActivity.java",