From bcf0d1e08217a98830ee3838619d9802c8cc33f4 Mon Sep 17 00:00:00 2001 From: vadimt Date: Wed, 1 May 2019 14:32:05 -0700 Subject: Reenabling switching between nav modes in tests Bug: 130558787 Bug: 131419978 Bug: 131630813 Change-Id: I8d62c7f2b33ac94bd4f899f7c8ed00c8293841e7 --- quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java | 3 --- .../tests/src/com/android/quickstep/NavigationModeSwitchRule.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'quickstep/tests') diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index 960d907dc..20fdff2c5 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -44,7 +44,6 @@ import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.testcomponent.TestCommandReceiver; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; @@ -98,7 +97,6 @@ public class FallbackRecentsTest { @NavigationModeSwitch(mode = THREE_BUTTON) @Test - @Ignore // b/131630813 public void goToOverviewFromHome() { mDevice.pressHome(); assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg( @@ -109,7 +107,6 @@ public class FallbackRecentsTest { @NavigationModeSwitch(mode = THREE_BUTTON) @Test - @Ignore // b/131630813 public void goToOverviewFromApp() { startAppFast("com.android.settings"); diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index 93e403cc8..e552f56ba 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -71,8 +71,7 @@ public class NavigationModeSwitchRule implements TestRule { @Override public Statement apply(Statement base, Description description) { - // b/130558787; b/131419978 - if (false && TestHelpers.isInLauncherProcess() && + if (TestHelpers.isInLauncherProcess() && description.getAnnotation(NavigationModeSwitch.class) != null) { Mode mode = description.getAnnotation(NavigationModeSwitch.class).mode(); return new Statement() { -- cgit v1.2.3