diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaSessionUtilTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaSessionUtilTest.java index 7ef176071b..20e552c9b7 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaSessionUtilTest.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaSessionUtilTest.java @@ -16,6 +16,7 @@ package com.google.android.exoplayer2.ext.media2; import static com.google.common.truth.Truth.assertThat; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import android.content.Context; import android.os.Looper; @@ -32,7 +33,6 @@ import com.google.android.exoplayer2.ext.media2.test.R; import com.google.android.exoplayer2.util.Assertions; import com.google.common.util.concurrent.ListenableFuture; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -89,11 +89,8 @@ public class MediaSessionUtilTest { throw new IllegalStateException(e); } }); - assertThat( - prepareResult - .get(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS) - .getResultCode()) + assertThat(prepareResult.get(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS).getResultCode()) .isEqualTo(PlayerResult.RESULT_SUCCESS); - assertThat(latch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(latch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } } diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java index e9a1bcc3b3..9741f7014c 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java @@ -19,6 +19,7 @@ package com.google.android.exoplayer2.ext.media2; import static com.google.android.exoplayer2.ext.media2.TestUtils.assertPlayerResultSuccess; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import android.content.Context; import android.net.Uri; @@ -52,7 +53,6 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -156,7 +156,7 @@ public class SessionCallbackBuilderTest { latch.countDown(); }; try (MediaController controller = createConnectedController(session, listener, null)) { - assertThat(latch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(latch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, MILLISECONDS)).isTrue(); assertSessionResultFailure(controller.skipToNextPlaylistItem()); assertSessionResultFailure(controller.skipToPreviousPlaylistItem()); @@ -223,9 +223,7 @@ public class SessionCallbackBuilderTest { createConnectedController(session, connectedListener, allowedCommandChangedListener)) { assertPlayerResultSuccess(sessionPlayerConnector.skipToNextPlaylistItem()); - assertThat( - allowedCommandChangedLatch.await( - CONTROLLER_COMMAND_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(allowedCommandChangedLatch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); // Also test whether the rewind fails as expected. @@ -251,9 +249,7 @@ public class SessionCallbackBuilderTest { @Override public int readAt(long position, byte[] buffer, int offset, int size) { try { - assertThat( - readAllowedLatch.await( - PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(readAllowedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } catch (Exception e) { assertWithMessage("Unexpected exception %s", e).fail(); @@ -297,7 +293,7 @@ public class SessionCallbackBuilderTest { readAllowedLatch.countDown(); assertThat( seekToAllowedForSecondMediaItem.await( - CONTROLLER_COMMAND_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + CONTROLLER_COMMAND_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } } @@ -326,7 +322,7 @@ public class SessionCallbackBuilderTest { try (MediaController controller = createConnectedController(session)) { assertSessionResultSuccess( controller.setRating(testMediaId, testRating), CONTROLLER_COMMAND_WAIT_TIME_MS); - assertThat(latch.await(0, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(latch.await(0, MILLISECONDS)).isTrue(); } } } @@ -378,7 +374,7 @@ public class SessionCallbackBuilderTest { try (MediaController controller = createConnectedController(session, null, listener)) { assertSessionResultSuccess( controller.sendCustomCommand(testCommand, null), CONTROLLER_COMMAND_WAIT_TIME_MS); - assertThat(latch.await(0, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(latch.await(0, MILLISECONDS)).isTrue(); } } } @@ -508,10 +504,9 @@ public class SessionCallbackBuilderTest { assertSessionResultSuccess( controller.setMediaItem(testMediaIdUri.toString()), PLAYER_STATE_CHANGE_OVER_SESSION_WAIT_TIME_MS); - assertThat(providerLatch.await(0, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(providerLatch.await(0, MILLISECONDS)).isTrue(); assertThat( - currentMediaItemChangedLatch.await( - CONTROLLER_COMMAND_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + currentMediaItemChangedLatch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } } @@ -543,7 +538,7 @@ public class SessionCallbackBuilderTest { .build())) { try (MediaController controller = createConnectedController(session)) { assertSessionResultSuccess(controller.skipBackward(), CONTROLLER_COMMAND_WAIT_TIME_MS); - assertThat(skipBackwardCalledLatch.await(0, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(skipBackwardCalledLatch.await(0, MILLISECONDS)).isTrue(); } } } @@ -574,7 +569,7 @@ public class SessionCallbackBuilderTest { .build())) { try (MediaController controller = createConnectedController(session)) { assertSessionResultSuccess(controller.skipForward(), CONTROLLER_COMMAND_WAIT_TIME_MS); - assertThat(skipForwardCalledLatch.await(0, TimeUnit.MILLISECONDS)).isTrue(); + assertThat(skipForwardCalledLatch.await(0, MILLISECONDS)).isTrue(); } } } @@ -591,8 +586,7 @@ public class SessionCallbackBuilderTest { .setPostConnectCallback(postConnectCallback) .build())) { try (MediaController controller = createConnectedController(session)) { - assertThat(postConnectLatch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(postConnectLatch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } } } @@ -609,8 +603,7 @@ public class SessionCallbackBuilderTest { .setDisconnectedCallback(disconnectCallback) .build())) { try (MediaController controller = createConnectedController(session)) {} - assertThat(disconnectedLatch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(disconnectedLatch.await(CONTROLLER_COMMAND_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } } @@ -666,13 +659,12 @@ public class SessionCallbackBuilderTest { private static void assertSessionResultSuccess(Future future, long timeoutMs) throws Exception { - SessionResult result = future.get(timeoutMs, TimeUnit.MILLISECONDS); + SessionResult result = future.get(timeoutMs, MILLISECONDS); assertThat(result.getResultCode()).isEqualTo(SessionResult.RESULT_SUCCESS); } private static void assertSessionResultFailure(Future future) throws Exception { - SessionResult result = - future.get(PLAYER_STATE_CHANGE_OVER_SESSION_WAIT_TIME_MS, TimeUnit.MILLISECONDS); + SessionResult result = future.get(PLAYER_STATE_CHANGE_OVER_SESSION_WAIT_TIME_MS, MILLISECONDS); assertThat(result.getResultCode()).isNotEqualTo(SessionResult.RESULT_SUCCESS); } diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java index b0dd696a47..c80c86271b 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java @@ -24,6 +24,7 @@ import static com.google.android.exoplayer2.ext.media2.TestUtils.assertPlayerRes import static com.google.android.exoplayer2.ext.media2.TestUtils.assertPlayerResultSuccess; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import android.content.Context; import android.content.res.Resources; @@ -61,7 +62,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.junit.Before; import org.junit.Rule; @@ -130,8 +130,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.prepare(); sessionPlayerConnector.play(); - assertThat(onPlayingLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onPlayingLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } @Test @@ -169,9 +168,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.prepare(); sessionPlayerConnector.play(); }); - assertThat( - onPlayerStatePlayingLatch.await( - PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPlayerStatePlayingLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } @@ -219,8 +216,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.play(); // waiting to complete - assertThat( - onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); assertThat(sessionPlayerConnector.getPlayerState()) .isEqualTo(SessionPlayer.PLAYER_STATE_PAUSED); @@ -244,8 +240,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.play(); // waiting to complete - assertThat( - onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); assertThat(sessionPlayerConnector.getPlayerState()) .isEqualTo(SessionPlayer.PLAYER_STATE_PAUSED); @@ -380,8 +375,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.setPlaybackSpeed(2.0f); sessionPlayerConnector.play(); - assertThat( - onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); assertThat(sessionPlayerConnector.getCurrentMediaItem()).isEqualTo(mediaItem2); assertThat(sessionPlayerConnector.getPlaybackSpeed()).isWithin(0.001f).of(2.0f); @@ -416,9 +410,7 @@ public class SessionPlayerConnectorTest { @Override public int readAt(long position, byte[] buffer, int offset, int size) throws IOException { try { - assertThat( - readAllowedLatch.await( - PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(readAllowedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } catch (Exception e) { assertWithMessage("Unexpected exception %s", e).fail(); @@ -467,8 +459,7 @@ public class SessionPlayerConnectorTest { assertThat(seekFuture1.get().getResultCode()).isEqualTo(RESULT_INFO_SKIPPED); assertThat(seekFuture2.get().getResultCode()).isEqualTo(RESULT_INFO_SKIPPED); assertThat(seekFuture3.get().getResultCode()).isEqualTo(RESULT_SUCCESS); - assertThat(onSeekCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onSeekCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)).isTrue(); assertThat(seekPosition.get()).isEqualTo(testFinalSeekToPosition); } @@ -519,8 +510,7 @@ public class SessionPlayerConnectorTest { InstrumentationRegistry.getInstrumentation() .runOnMainSync(() -> simpleExoPlayer.seekTo(testSeekPosition)); - assertThat(onSeekCompletedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onSeekCompletedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); assertThat(seekPosition.get()).isEqualTo(testSeekPosition); } @@ -592,8 +582,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.registerPlayerCallback(executor, callback); assertPlayerResultSuccess(sessionPlayerConnector.prepare()); - assertThat(onPlayerStatePaused.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onPlayerStatePaused.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } @Test @@ -624,9 +613,7 @@ public class SessionPlayerConnectorTest { assertWithMessage( "Expected BUFFERING_STATE_COMPLETE only once. Full changes are %s", bufferingStateChanges) - .that( - onBufferingCompletedLatch.await( - PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + .that(onBufferingCompletedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isFalse(); assertThat(bufferingStateChanges).isNotEmpty(); int lastIndex = bufferingStateChanges.size() - 1; @@ -660,8 +647,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.seekTo(mp4DurationMs >> 1); - assertThat(onSeekCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onSeekCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } @Test @@ -688,9 +674,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.setPlaybackSpeed(0.5f); - assertThat( - onPlaybackSpeedChangedLatch.await( - PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPlaybackSpeedChangedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } @@ -753,9 +737,7 @@ public class SessionPlayerConnectorTest { public int readAt(long position, byte[] buffer, int offset, int size) throws IOException { readRequestedLatch.countDown(); try { - assertThat( - readAllowedLatch.await( - PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(readAllowedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } catch (Exception e) { assertWithMessage("Unexpected exception %s", e).fail(); @@ -780,8 +762,7 @@ public class SessionPlayerConnectorTest { ListenableFuture prepareFuture = sessionPlayerConnector.prepare(); ListenableFuture seekFuture = sessionPlayerConnector.seekTo(1000); - assertThat(readRequestedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(readRequestedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); // Cancel the pending commands while preparation is on hold. seekFuture.cancel(false); @@ -834,9 +815,7 @@ public class SessionPlayerConnectorTest { executor, new PlayerCallbackForPlaylist(playlist, onCurrentMediaItemChangedLatch)); assertPlayerResultSuccess(sessionPlayerConnector.setPlaylist(playlist, null)); - assertThat( - onCurrentMediaItemChangedLatch.await( - PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onCurrentMediaItemChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); assertThat(sessionPlayerConnector.getPlaylist()).isEqualTo(playlist); @@ -864,8 +843,7 @@ public class SessionPlayerConnectorTest { sessionPlayerConnector.setPlaylist(playlist, /* metadata= */ null); sessionPlayerConnector.prepare(); - assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isFalse(); + assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isFalse(); assertThat(onPlaylistChangedLatch.getCount()).isEqualTo(1); } @@ -894,8 +872,7 @@ public class SessionPlayerConnectorTest { } }); sessionPlayerConnector.addPlaylistItem(addIndex, newMediaItem); - assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isFalse(); + assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isFalse(); assertThat(onPlaylistChangedLatch.getCount()).isEqualTo(1); } @@ -923,8 +900,7 @@ public class SessionPlayerConnectorTest { } }); sessionPlayerConnector.removePlaylistItem(removeIndex); - assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isFalse(); + assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isFalse(); assertThat(onPlaylistChangedLatch.getCount()).isEqualTo(1); } @@ -953,8 +929,7 @@ public class SessionPlayerConnectorTest { } }); sessionPlayerConnector.replacePlaylistItem(replaceIndex, newMediaItem); - assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isFalse(); + assertThat(onPlaylistChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isFalse(); assertThat(onPlaylistChangedLatch.getCount()).isEqualTo(1); } @@ -971,9 +946,7 @@ public class SessionPlayerConnectorTest { assertPlayerResultSuccess(sessionPlayerConnector.setPlaylist(playlist, null)); assertThat(sessionPlayerConnector.getCurrentMediaItemIndex()).isEqualTo(0); - assertThat( - onCurrentMediaItemChangedLatch.await( - PLAYLIST_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onCurrentMediaItemChangedLatch.await(PLAYLIST_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } @@ -1024,8 +997,7 @@ public class SessionPlayerConnectorTest { assertThat(sessionPlayerConnector.prepare()).isNotNull(); assertThat(sessionPlayerConnector.play()).isNotNull(); - assertThat( - onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPlaybackCompletedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); } @@ -1052,8 +1024,7 @@ public class SessionPlayerConnectorTest { InstrumentationRegistry.getInstrumentation() .runOnMainSync(() -> simpleExoPlayer.setPlayWhenReady(true)); - assertThat(onPlayingLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onPlayingLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } @Test @@ -1091,8 +1062,7 @@ public class SessionPlayerConnectorTest { InstrumentationRegistry.getInstrumentation() .runOnMainSync(() -> simpleExoPlayer.setPlayWhenReady(false)); - assertThat(onPausedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onPausedLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); } @Test @@ -1129,8 +1099,7 @@ public class SessionPlayerConnectorTest { })); assertPlayerResultSuccess(sessionPlayerConnector.play()); - assertThat( - playerStateChangesLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(playerStateChangesLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); assertThat(playerStateChanges) .containsExactly( @@ -1172,8 +1141,7 @@ public class SessionPlayerConnectorTest { }; sessionPlayerConnector.registerPlayerCallback(executor, skipToNextTestCallback); assertPlayerResultSuccess(sessionPlayerConnector.skipToNextPlaylistItem()); - assertThat(onNextMediaItemLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) - .isTrue(); + assertThat(onNextMediaItemLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)).isTrue(); sessionPlayerConnector.unregisterPlayerCallback(skipToNextTestCallback); // STEP 3: skipToPreviousPlaylistItem() @@ -1193,8 +1161,7 @@ public class SessionPlayerConnectorTest { }; sessionPlayerConnector.registerPlayerCallback(executor, skipToPreviousTestCallback); assertPlayerResultSuccess(sessionPlayerConnector.skipToPreviousPlaylistItem()); - assertThat( - onPreviousMediaItemLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + assertThat(onPreviousMediaItemLatch.await(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); sessionPlayerConnector.unregisterPlayerCallback(skipToPreviousTestCallback); } @@ -1243,9 +1210,7 @@ public class SessionPlayerConnectorTest { assertWithMessage( "Current media item didn't change as expected. Actual changes were %s", currentMediaItemChanges) - .that( - onCurrentMediaItemChangedLatch.await( - PLAYBACK_COMPLETED_WAIT_TIME_MS, TimeUnit.MILLISECONDS)) + .that(onCurrentMediaItemChangedLatch.await(PLAYBACK_COMPLETED_WAIT_TIME_MS, MILLISECONDS)) .isTrue(); int expectedMediaItemIndex = 0; diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/TestUtils.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/TestUtils.java index 8d564631b7..ebe9438c82 100644 --- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/TestUtils.java +++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/TestUtils.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.media2; import static androidx.media2.common.SessionPlayer.PlayerResult.RESULT_SUCCESS; import static com.google.common.truth.Truth.assertThat; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import android.content.ContentResolver; import android.content.Context; @@ -31,7 +32,6 @@ import androidx.media2.common.UriMediaItem; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; /** Utilities for tests. */ public final class TestUtils { @@ -84,7 +84,7 @@ public final class TestUtils { Future future, /* @PlayerResult.ResultCode */ int playerResult) throws Exception { assertThat(future).isNotNull(); - PlayerResult result = future.get(PLAYER_STATE_CHANGE_WAIT_TIME_MS, TimeUnit.MILLISECONDS); + PlayerResult result = future.get(PLAYER_STATE_CHANGE_WAIT_TIME_MS, MILLISECONDS); assertThat(result).isNotNull(); assertThat(result.getResultCode()).isEqualTo(playerResult); } diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerCommandQueue.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerCommandQueue.java index 582510f3a1..7d804282ce 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerCommandQueue.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerCommandQueue.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.ext.media2; +import static java.util.concurrent.TimeUnit.MILLISECONDS; + import androidx.annotation.GuardedBy; import androidx.annotation.IntDef; import androidx.annotation.Nullable; @@ -33,7 +35,6 @@ import java.util.ArrayList; import java.util.Deque; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; /** Manages the queue of player actions and handles running them one by one. */ /* package */ class PlayerCommandQueue implements AutoCloseable { @@ -399,7 +400,7 @@ import java.util.concurrent.TimeUnit; .append(result.hashCode()); if (result.isDone()) { try { - int resultCode = result.get(/* timeout= */ 0, TimeUnit.MILLISECONDS).getResultCode(); + int resultCode = result.get(/* timeout= */ 0, MILLISECONDS).getResultCode(); stringBuilder.append(", resultCode=").append(resultCode); } catch (Exception e) { // pass-through. @@ -437,7 +438,7 @@ import java.util.concurrent.TimeUnit; .append(result.hashCode()); if (result.isDone()) { try { - int resultCode = result.get(/* timeout= */ 0, TimeUnit.MILLISECONDS).getResultCode(); + int resultCode = result.get(/* timeout= */ 0, MILLISECONDS).getResultCode(); stringBuilder.append(", resultCode=").append(resultCode); } catch (Exception e) { // pass-through. diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java index 98b0e8554e..986478f1a9 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java @@ -16,6 +16,8 @@ package com.google.android.exoplayer2.ext.media2; +import static java.util.concurrent.TimeUnit.MILLISECONDS; + import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -43,7 +45,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; /* package */ class SessionCallback extends MediaSession.SessionCallback { @@ -205,7 +206,7 @@ import java.util.concurrent.TimeoutException; if (seekTimeoutMs <= 0) { return result.get().getResultCode(); } - return result.get(seekTimeoutMs, TimeUnit.MILLISECONDS).getResultCode(); + return result.get(seekTimeoutMs, MILLISECONDS).getResultCode(); } catch (ExecutionException | InterruptedException | TimeoutException e) { Log.w(TAG, "Failed to get the seeking result", e); return SessionResult.RESULT_ERROR_UNKNOWN;