Temporarily not using RuleChain as it mysteriously breaks tests
Change-Id: I8bdd9a8ea12cfdbd92fe724181e7479cadcb26fe
diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index cc79c9d..c2c568b 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
@@ -18,14 +18,13 @@
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);
}
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 17a5335..e5cc858 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -65,8 +65,8 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
-import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
import org.junit.runners.model.Statement;
import java.io.IOException;
@@ -164,7 +164,7 @@
} : base;
@Rule
- public RuleChain mOrderSensitiveRules = RuleChain.outerRule(new FailureWatcher(this));
+ public TestWatcher mFailureWatcher = new FailureWatcher(this);
public UiDevice getDevice() {
return mDevice;