Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63013c5e authored by vadimt's avatar vadimt
Browse files

Temporarily not using RuleChain as it mysteriously breaks tests

Change-Id: I8bdd9a8ea12cfdbd92fe724181e7479cadcb26fe
parent bfaabbea
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -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);
}
+2 −2
Original line number Diff line number Diff line
@@ -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;