From 5a6b88d7512e02500936967140c0ffba95cb9cb6 Mon Sep 17 00:00:00 2001 From: tianyifeng Date: Tue, 29 Aug 2023 04:25:57 -0700 Subject: [PATCH] De-flake MediaSessionCompatCallbackWithMediaControllerTest.onStop test The `controller.prepare()` call can trigger the callback `onPrepare()`, however, this will count down the latch by one before the callback `onStop()` is triggered. PiperOrigin-RevId: 560988209 --- ...ssionCompatCallbackWithMediaControllerTest.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCompatCallbackWithMediaControllerTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCompatCallbackWithMediaControllerTest.java index 95b4c06bdc..f47432b63d 100644 --- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCompatCallbackWithMediaControllerTest.java +++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCompatCallbackWithMediaControllerTest.java @@ -73,9 +73,6 @@ public class MediaSessionCompatCallbackWithMediaControllerTest { // The maximum time to wait for an operation. private static final long TIMEOUT_MS = 3000L; - // Timeout used where the test expects no operation. - private static final long NOOP_TIMEOUT_MS = 500L; - @ClassRule public static MainLooperTestRule mainLooperTestRule = new MainLooperTestRule(); @Rule public final HandlerThreadTestRule threadTestRule = new HandlerThreadTestRule(TAG); @@ -171,13 +168,14 @@ public class MediaSessionCompatCallbackWithMediaControllerTest { session.setQueue(testQueue); session.setFlags(FLAG_HANDLES_QUEUE_COMMANDS); RemoteMediaController controller = createControllerAndWaitConnection(); - controller.prepare(); - sessionCallback.reset(1); + sessionCallback.reset(/* count= */ 2); + controller.prepare(); controller.stop(); assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue(); - assertThat(sessionCallback.onStopCalled).isEqualTo(true); + assertThat(sessionCallback.onPrepareCalled).isTrue(); + assertThat(sessionCallback.onStopCalled).isTrue(); } @Test @@ -188,7 +186,7 @@ public class MediaSessionCompatCallbackWithMediaControllerTest { controller.seekToDefaultPosition(); assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue(); assertThat(sessionCallback.onSeekToCalled).isTrue(); - assertThat(sessionCallback.seekPosition).isEqualTo(/* pos= */ 0); + assertThat(sessionCallback.seekPosition).isEqualTo(0); } @Test @@ -208,7 +206,7 @@ public class MediaSessionCompatCallbackWithMediaControllerTest { assertThat(sessionCallback.queueItemId) .isEqualTo(testQueue.get(testMediaItemIndex).getQueueId()); assertThat(sessionCallback.onSeekToCalled).isTrue(); - assertThat(sessionCallback.seekPosition).isEqualTo(/* pos= */ 0); + assertThat(sessionCallback.seekPosition).isEqualTo(0); } @Test