diff options
author | Vadim Tryshev <vadimt@google.com> | 2019-06-25 23:43:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-25 23:43:19 +0000 |
commit | 8a532e0becf953458f9ba7f2b953720639ce0a5e (patch) | |
tree | 3bce2bba7d8f004c6afdf3c304e3e2f09e2da407 /quickstep | |
parent | 8ca7205c24356f35d3e72bdd0ca4b3e2db53925e (diff) | |
parent | 26cfff41bad35e6a4f770dcd45634551a1585ef3 (diff) | |
download | android_packages_apps_Trebuchet-8a532e0becf953458f9ba7f2b953720639ce0a5e.tar.gz android_packages_apps_Trebuchet-8a532e0becf953458f9ba7f2b953720639ce0a5e.tar.bz2 android_packages_apps_Trebuchet-8a532e0becf953458f9ba7f2b953720639ce0a5e.zip |
Merge "Taking screenshots for local tests for FallbackRecentsTest" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index 013591171..e5f949b88 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -43,10 +43,12 @@ import androidx.test.uiautomator.Until; import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.testcomponent.TestCommandReceiver; +import com.android.launcher3.util.rule.FailureWatcher; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.RunWith; import org.junit.runners.model.Statement; @@ -62,10 +64,14 @@ public class FallbackRecentsTest { private final LauncherInstrumentation mLauncher; private final ActivityInfo mOtherLauncherActivity; - @Rule public final TestRule mDisableHeadsUpNotification = disableHeadsUpNotification(); - @Rule public final TestRule mQuickstepOnOffExecutor; + @Rule + public final TestRule mDisableHeadsUpNotification = disableHeadsUpNotification(); - @Rule public final TestRule mSetLauncherCommand; + @Rule + public final TestRule mSetLauncherCommand; + + @Rule + public final TestRule mOrderSensitiveRules; public FallbackRecentsTest() throws RemoteException { Instrumentation instrumentation = getInstrumentation(); @@ -74,7 +80,10 @@ public class FallbackRecentsTest { mDevice.setOrientationNatural(); mLauncher = new LauncherInstrumentation(instrumentation); - mQuickstepOnOffExecutor = new NavigationModeSwitchRule(mLauncher); + mOrderSensitiveRules = RuleChain. + outerRule(new NavigationModeSwitchRule(mLauncher)). + around(new FailureWatcher(mDevice)); + mOtherLauncherActivity = context.getPackageManager().queryIntentActivities( getHomeIntentInPackage(context), MATCH_DISABLED_COMPONENTS).get(0).activityInfo; |