diff options
author | vadimt <vadimt@google.com> | 2019-06-05 18:34:23 -0700 |
---|---|---|
committer | vadimt <vadimt@google.com> | 2019-06-05 18:34:23 -0700 |
commit | 63013c5e5723117ce7dec97b88cac2abf21f9088 (patch) | |
tree | 670db28800732d3c3907a456322b494cffa709ca /quickstep/tests/src | |
parent | bfaabbea8150b630bc6b6dd6a98f13a408619cdf (diff) | |
download | android_packages_apps_Trebuchet-63013c5e5723117ce7dec97b88cac2abf21f9088.tar.gz android_packages_apps_Trebuchet-63013c5e5723117ce7dec97b88cac2abf21f9088.tar.bz2 android_packages_apps_Trebuchet-63013c5e5723117ce7dec97b88cac2abf21f9088.zip |
Temporarily not using RuleChain as it mysteriously breaks tests
Change-Id: I8bdd9a8ea12cfdbd92fe724181e7479cadcb26fe
Diffstat (limited to 'quickstep/tests/src')
-rw-r--r-- | quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java index cc79c9d28..c2c568bb6 100644 --- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java +++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java @@ -18,14 +18,13 @@ package com.android.quickstep; import com.android.launcher3.ui.AbstractLauncherUiTest; -import org.junit.rules.RuleChain; +import org.junit.Rule; +import org.junit.rules.TestRule; /** * Base class for all instrumentation tests that deal with Quickstep. */ public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest { - protected AbstractQuickStepTest() { - mOrderSensitiveRules = RuleChain.outerRule(new NavigationModeSwitchRule(mLauncher)). - around(mOrderSensitiveRules); - } + @Rule + public TestRule mNavigationModeSwitcher = new NavigationModeSwitchRule(mLauncher); } |