Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add sleep time to start TestActivity" into udc-qpr-dev am: 90bb972779

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23784069

Change-Id: Ia15a621ed74492910062d0e2aa32c66252c628d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Yu
2023-06-26 20:26:15 +00:00
committed by Automerger Merge Worker
parent 001dd0b6d7 90bb972779
commit 5a8363bc92
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/tests/mockingservicestests/src/android/service/games/GameSessionTrampolineActivityTest.java
View File

@@ -47,11 +47,14 @@ import androidx.test.filters.SmallTest;
import com.android.internal.infra.AndroidFuture; import com.android.internal.infra.AndroidFuture;
import com.google.common.util.concurrent.Uninterruptibles;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.time.Duration;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@@ -62,6 +65,8 @@ import java.util.concurrent.TimeUnit;
@Presubmit @Presubmit
public class GameSessionTrampolineActivityTest { public class GameSessionTrampolineActivityTest {
private static final Duration TEST_ACTIVITY_OPEN_DURATION = Duration.ofSeconds(5);
@Before @Before
public void setUp() { public void setUp() {
setAlwaysFinishActivities(false); setAlwaysFinishActivities(false);
@@ -145,10 +150,15 @@ public class GameSessionTrampolineActivityTest {
startTestActivityViaGameSessionTrampolineActivity() { startTestActivityViaGameSessionTrampolineActivity() {
Intent testActivityIntent = new Intent(); Intent testActivityIntent = new Intent();
testActivityIntent.setClass(getInstrumentation().getTargetContext(), TestActivity.class); testActivityIntent.setClass(getInstrumentation().getTargetContext(), TestActivity.class);
sleep(TEST_ACTIVITY_OPEN_DURATION);
return startGameSessionTrampolineActivity(testActivityIntent); return startGameSessionTrampolineActivity(testActivityIntent);
} }
private static void sleep(Duration sleepDuration) {
Uninterruptibles.sleepUninterruptibly(sleepDuration.toMillis(), TimeUnit.MILLISECONDS);
}
private static AndroidFuture<GameSessionActivityResult> startGameSessionTrampolineActivity( private static AndroidFuture<GameSessionActivityResult> startGameSessionTrampolineActivity(
Intent targetIntent) { Intent targetIntent) {
AndroidFuture<GameSessionActivityResult> resultFuture = new AndroidFuture<>(); AndroidFuture<GameSessionActivityResult> resultFuture = new AndroidFuture<>();