From 57f0c0d368f13a5d67f75948772020c13d5652e1 Mon Sep 17 00:00:00 2001 From: bachinger Date: Wed, 23 Oct 2024 01:51:57 -0700 Subject: [PATCH] Fix flakiness of MediaBrowserListenerWithMediaBrowserServiceCompatTest PiperOrigin-RevId: 688870397 (cherry picked from commit 0038dda3c36568d1f8582db48bd85cd27728f2ff) --- ...iaBrowserListenerWithMediaBrowserServiceCompatTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerWithMediaBrowserServiceCompatTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerWithMediaBrowserServiceCompatTest.java index 10c6367778..748d23a514 100644 --- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerWithMediaBrowserServiceCompatTest.java +++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaBrowserListenerWithMediaBrowserServiceCompatTest.java @@ -698,14 +698,15 @@ public class MediaBrowserListenerWithMediaBrowserServiceCompatTest { } }); - ListenableFuture> future = + LibraryResult result = threadTestRule .getHandler() - .postAndSync(() -> browser.subscribe("parentId", new LibraryParams.Builder().build())); + .postAndSync(() -> browser.subscribe("parentId", new LibraryParams.Builder().build())) + .get(); // Trigger calling onLoadChildren that is rejected. remoteService.notifyChildrenChanged("parentId"); - assertThat(future.get().resultCode).isEqualTo(RESULT_SUCCESS); + assertThat(result.resultCode).isEqualTo(RESULT_SUCCESS); assertThat(onChildrenChangedLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue(); assertThat(changedParentIds).containsExactly("parentId", "parentId"); assertThat(changedItemCounts).containsExactly(2, Integer.MAX_VALUE).inOrder();