Skip to content

SDK / exoplayer

Go to a project
Commit 6e11d320 by gyumin Committed by kim-vde
Options

Use static import for TimeUnit 

PiperOrigin-RevId: 324941042
parent c0ee267a
Expand all
Inline Side-by-side
Showing with 27 additions and 36 deletions
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();
}
}
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<SessionResult> 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<SessionResult> 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);
}
......
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<PlayerResult> 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);
}
......
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.
......
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment