aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily not using RuleChain as it mysteriously breaks tests

Browse Source 
Change-Id: I8bdd9a8ea12cfdbd92fe724181e7479cadcb26fe
This commit is contained in:
vadimt
2019-06-05 18:34:23 -07:00
parent bfaabbea81
commit 63013c5e57
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
View File

@@ -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);
}

4
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -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;