From beb0422e2243462efab74c15ba9bad6d77a3a5fb Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 10 Jun 2022 14:32:54 +0000 Subject: [PATCH] Remove ExoPlayerTest.PlayerStateGrabber It's no longer needed PiperOrigin-RevId: 454161070 (cherry picked from commit 86a2f297a5f8eb94fc04820ea943512c078205c4) --- .../android/exoplayer2/ExoPlayerTest.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java index 3b66b47802..21eba518be 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java @@ -3890,13 +3890,19 @@ public final class ExoPlayerTest { ShadowAudioManager shadowAudioManager = shadowOf(context.getSystemService(AudioManager.class)); shadowAudioManager.setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_FAILED); - PlayerStateGrabber playerStateGrabber = new PlayerStateGrabber(); + AtomicBoolean playWhenReady = new AtomicBoolean(); ActionSchedule actionSchedule = new ActionSchedule.Builder(TAG) .setAudioAttributes(AudioAttributes.DEFAULT, /* handleAudioFocus= */ true) .play() .waitForPlaybackState(Player.STATE_READY) - .executeRunnable(playerStateGrabber) + .executeRunnable( + new PlayerRunnable() { + @Override + public void run(ExoPlayer player) { + playWhenReady.set(player.getPlayWhenReady()); + } + }) .build(); AtomicBoolean seenPlaybackSuppression = new AtomicBoolean(); Player.Listener listener = @@ -3914,7 +3920,7 @@ public final class ExoPlayerTest { .start() .blockUntilActionScheduleFinished(TIMEOUT_MS); - assertThat(playerStateGrabber.playWhenReady).isFalse(); + assertThat(playWhenReady.get()).isFalse(); assertThat(seenPlaybackSuppression.get()).isFalse(); } @@ -12230,19 +12236,6 @@ public final class ExoPlayerTest { } } - private static final class PlayerStateGrabber extends PlayerRunnable { - - public boolean playWhenReady; - public @Player.State int playbackState; - @Nullable public Timeline timeline; - - @Override - public void run(ExoPlayer player) { - playWhenReady = player.getPlayWhenReady(); - playbackState = player.getPlaybackState(); - timeline = player.getCurrentTimeline(); - } - } /** * Provides a wrapper for a {@link Runnable} which does collect playback states and window counts. * Can be used with {@link ActionSchedule.Builder#executeRunnable(Runnable)} to verify that a