summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-06-05 18:34:23 -0700
committervadimt <vadimt@google.com>2019-06-05 18:34:23 -0700
commit63013c5e5723117ce7dec97b88cac2abf21f9088 (patch)
tree670db28800732d3c3907a456322b494cffa709ca /tests
parentbfaabbea8150b630bc6b6dd6a98f13a408619cdf (diff)
downloadandroid_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 'tests')
-rw-r--r--tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 17a533523..e5cc858bb 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;