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

Commit e50abcb7 authored by Antonio Kantek's avatar Antonio Kantek Committed by Android (Google) Code Review
Browse files

Merge "Roll-forward of "Add bedstead dependency"" into main

parents 1b0720b9 2285505a
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ android_test {
        "platform-test-annotations",
        "platform-test-rules",
        "truth",

        // beadstead
        "Nene",
        "Harrier",
        "TestApp",
    ],
    test_suites: [
        "general-tests",
+10 −2
Original line number Diff line number Diff line
@@ -23,14 +23,22 @@ import android.content.pm.PackageManager;

import androidx.test.platform.app.InstrumentationRegistry;

import com.android.bedstead.harrier.BedsteadJUnit4;
import com.android.bedstead.harrier.DeviceState;

import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
@RunWith(BedsteadJUnit4.class)
public final class ConcurrentMultiUserTest {

    @ClassRule
    @Rule
    public static final DeviceState sDeviceState = new DeviceState();

    @Before
    public void doBeforeEachTest() {
        // No op