loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid rare NPE in MediaSessionServiceTest

Browse Source 
PiperOrigin-RevId: 730363453
This commit is contained in:
bachinger 2025-02-24 02:28:25 -08:00 committed by Copybara-Service
parent 67e99f4648
commit 76df13d390
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionServiceTest.java
View File

@ -323,6 +323,8 @@ public class MediaSessionServiceTest {
RemoteMediaController remoteController = RemoteMediaController remoteController =
controllerTestRule.createRemoteController(token, /* waitForConnection= */ true, testHints); controllerTestRule.createRemoteController(token, /* waitForConnection= */ true, testHints);
MockMediaSessionService service =
(MockMediaSessionService) TestServiceRegistry.getInstance().getServiceInstance();
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue(); assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat( assertThat(
controllerInfoList controllerInfoList
@ -352,8 +354,7 @@ public class MediaSessionServiceTest {
assertThat(customAction2.getName().toString()).isEqualTo("button3"); assertThat(customAction2.getName().toString()).isEqualTo("button3");
assertThat(customAction2.getIcon()).isEqualTo(R.drawable.media3_notification_small_icon); assertThat(customAction2.getIcon()).isEqualTo(R.drawable.media3_notification_small_icon);
mediaSession.release(); mediaSession.release();
((MockMediaSessionService) TestServiceRegistry.getInstance().getServiceInstance()) service.blockUntilAllControllersUnbind(TIMEOUT_MS);
.blockUntilAllControllersUnbind(TIMEOUT_MS);
} }
@Test @Test
@ -438,6 +439,8 @@ public class MediaSessionServiceTest {
RemoteMediaController remoteController = RemoteMediaController remoteController =
controllerTestRule.createRemoteController(token, /* waitForConnection= */ true, testHints); controllerTestRule.createRemoteController(token, /* waitForConnection= */ true, testHints);
MockMediaSessionService service =
(MockMediaSessionService) TestServiceRegistry.getInstance().getServiceInstance();
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue(); assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
assertThat( assertThat(
controllerInfoList controllerInfoList
@ -467,8 +470,7 @@ public class MediaSessionServiceTest {
assertThat(customAction2.getName().toString()).isEqualTo("button3"); assertThat(customAction2.getName().toString()).isEqualTo("button3");
assertThat(customAction2.getIcon()).isEqualTo(R.drawable.media3_notification_small_icon); assertThat(customAction2.getIcon()).isEqualTo(R.drawable.media3_notification_small_icon);
mediaSession.release(); mediaSession.release();
((MockMediaSessionService) TestServiceRegistry.getInstance().getServiceInstance()) service.blockUntilAllControllersUnbind(TIMEOUT_MS);
.blockUntilAllControllersUnbind(TIMEOUT_MS);
} }
/** /**