diff options
| author | vadimt <vadimt@google.com> | 2019-06-06 13:40:05 -0700 |
|---|---|---|
| committer | vadimt <vadimt@google.com> | 2019-06-06 14:02:33 -0700 |
| commit | 44e9a873fcbdfb726eea84d801b708ed8aae860c (patch) | |
| tree | 476c174bbdceafebdf4d0e707cbe6bc3c6e74607 /quickstep/tests | |
| parent | 63013c5e5723117ce7dec97b88cac2abf21f9088 (diff) | |
| download | android_packages_apps_Trebuchet-44e9a873fcbdfb726eea84d801b708ed8aae860c.tar.gz android_packages_apps_Trebuchet-44e9a873fcbdfb726eea84d801b708ed8aae860c.tar.bz2 android_packages_apps_Trebuchet-44e9a873fcbdfb726eea84d801b708ed8aae860c.zip | |
Test: using RuleChain to create a correct order of rules.
Change-Id: I2eeb933eab8e5f19b1f80d47566a511ddbdeb28b
Diffstat (limited to 'quickstep/tests')
| -rw-r--r-- | quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java index c2c568bb6..a412b3970 100644 --- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java +++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java @@ -18,13 +18,17 @@ package com.android.quickstep; import com.android.launcher3.ui.AbstractLauncherUiTest; -import org.junit.Rule; +import org.junit.rules.RuleChain; import org.junit.rules.TestRule; /** * Base class for all instrumentation tests that deal with Quickstep. */ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest { - @Rule - public TestRule mNavigationModeSwitcher = new NavigationModeSwitchRule(mLauncher); + @Override + protected TestRule getRulesInsideActivityMonitor() { + return RuleChain. + outerRule(new NavigationModeSwitchRule(mLauncher)). + around(super.getRulesInsideActivityMonitor()); + } } |