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

Merge "Experimenting with detecting whether a test runs in presubmit" into ub-launcher3-qt-qpr1-dev

Browse Source 
am: 37cc797fd0

Change-Id: I0ab81659ea9aaf6b75cd1106bbbaf9c75c679a41
This commit is contained in:
Vadim Tryshev
2019-09-18 19:33:40 -07:00
committed by android-build-merger
parent 47ea8eb8fd 37cc797fd0
commit 493ea23bfd
3 changed files with 149 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ import com.android.launcher3.util.Wait;
import com.android.launcher3.util.rule.FailureWatcher;
import com.android.launcher3.util.rule.LauncherActivityRule;
import com.android.launcher3.util.rule.ShellCommandRule;
import com.android.launcher3.util.rule.TestStabilityRule;
import org.junit.After;
import org.junit.Before;
@@ -156,7 +157,8 @@ public abstract class AbstractLauncherUiTest {
@Rule
public TestRule mOrderSensitiveRules = RuleChain.
outerRule(mActivityMonitor).
outerRule(new TestStabilityRule()).
around(mActivityMonitor).
around(getRulesInsideActivityMonitor());
public UiDevice getDevice() {