From 63013c5e5723117ce7dec97b88cac2abf21f9088 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Wed, 5 Jun 2019 18:34:23 -0700
Subject: [PATCH] Temporarily not using RuleChain as it mysteriously breaks
 tests

Change-Id: I8bdd9a8ea12cfdbd92fe724181e7479cadcb26fe
---
 .../src/com/android/quickstep/AbstractQuickStepTest.java | 9 ++++-----
 .../com/android/launcher3/ui/AbstractLauncherUiTest.java | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index cc79c9d282..c2c568bb61 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);
 }
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 17a533523b..e5cc858bb2 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -65,8 +65,8 @@ import com.android.launcher3.util.rule.ShellCommandRule;
 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 @@ public abstract class AbstractLauncherUiTest {
             } : base;
 
     @Rule
-    public RuleChain mOrderSensitiveRules = RuleChain.outerRule(new FailureWatcher(this));
+    public TestWatcher mFailureWatcher = new FailureWatcher(this);
 
     public UiDevice getDevice() {
         return mDevice;