Merge "Enable FallbackRecentsTest" into ub-launcher3-rvc-dev (aeacb7c8) · Commits · e / os / android_packages_apps_Trebuchet

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

+8 −10

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertTrue;

		import android.app.Instrumentation;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ActivityInfo;
		@@ -58,10 +57,8 @@ import com.android.launcher3.testcomponent.TestCommandReceiver;
		import com.android.launcher3.util.Wait;
		import com.android.launcher3.util.rule.FailureRewriterRule;
		import com.android.launcher3.util.rule.FailureWatcher;
		import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
		import com.android.quickstep.views.RecentsView;

		import org.junit.Ignore;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.rules.RuleChain;
		@@ -95,7 +92,8 @@ public class FallbackRecentsTest {
		mDevice = UiDevice.getInstance(instrumentation);
		mDevice.setOrientationNatural();
		mLauncher = new LauncherInstrumentation();
		mLauncher.enableCheckEventsForSuccessfulGestures();
		// b/143488140
		//mLauncher.enableCheckEventsForSuccessfulGestures();

		if (TestHelpers.isInLauncherProcess()) {
		Utilities.enableRunningInTestHarnessForTests();
		@@ -132,9 +130,9 @@ public class FallbackRecentsTest {
		}
		}

		@NavigationModeSwitch
		// b/143488140
		//@NavigationModeSwitch
		@Test
		@Ignore // b/143488140
		public void goToOverviewFromHome() {
		mDevice.pressHome();
		assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg(
		@@ -143,9 +141,9 @@ public class FallbackRecentsTest {
		mLauncher.getBackground().switchToOverview();
		}

		@NavigationModeSwitch
		// b/143488140
		//@NavigationModeSwitch
		@Test
		@Ignore // b/143488140
		public void goToOverviewFromApp() {
		startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

		@@ -178,9 +176,9 @@ public class FallbackRecentsTest {
		return mLauncher.getBackground().switchToOverview();
		}

		@NavigationModeSwitch
		// b/143488140
		//@NavigationModeSwitch
		@Test
		@Ignore // b/143488140
		public void testOverview() {
		startAppFast(getAppPackageName());
		startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
		@Before
		public void setUp() throws Exception {
		super.setUp();
		// b/143488140
		mLauncher.pressHome();
		// Start an activity where the gestures start.
		startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
		}