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

Commit 90bb9727 authored by Andy Yu's avatar Andy Yu Committed by Android (Google) Code Review
Browse files

Merge "Add sleep time to start TestActivity" into udc-qpr-dev

parents 0dca8381 57561e7e
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -47,11 +47,14 @@ import androidx.test.filters.SmallTest;

import com.android.internal.infra.AndroidFuture;

import com.google.common.util.concurrent.Uninterruptibles;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.time.Duration;
import java.util.concurrent.TimeUnit;

/**
@@ -62,6 +65,8 @@ import java.util.concurrent.TimeUnit;
@Presubmit
public class GameSessionTrampolineActivityTest {

    private static final Duration TEST_ACTIVITY_OPEN_DURATION = Duration.ofSeconds(5);

    @Before
    public void setUp() {
        setAlwaysFinishActivities(false);
@@ -145,10 +150,15 @@ public class GameSessionTrampolineActivityTest {
            startTestActivityViaGameSessionTrampolineActivity() {
        Intent testActivityIntent = new Intent();
        testActivityIntent.setClass(getInstrumentation().getTargetContext(), TestActivity.class);
        sleep(TEST_ACTIVITY_OPEN_DURATION);

        return startGameSessionTrampolineActivity(testActivityIntent);
    }

    private static void sleep(Duration sleepDuration) {
        Uninterruptibles.sleepUninterruptibly(sleepDuration.toMillis(), TimeUnit.MILLISECONDS);
    }

    private static AndroidFuture<GameSessionActivityResult> startGameSessionTrampolineActivity(
            Intent targetIntent) {
        AndroidFuture<GameSessionActivityResult> resultFuture = new AndroidFuture<>();