Media2 tests: Clean up assets

Even after this change, it's unclear to me why we need so many
assets for these tests. Just doing a minimal pass for now though!

PiperOrigin-RevId: 326613941

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaSessionUtilTest.java

@@ -58,7 +58,7 @@ public class MediaSessionUtilTest {
     SessionPlayerConnector sessionPlayerConnector = playerTestRule.getSessionPlayerConnector();
     SessionPlayerConnector sessionPlayerConnector = playerTestRule.getSessionPlayerConnector();
     MediaSession.SessionCallback sessionCallback =
     MediaSession.SessionCallback sessionCallback =
         new SessionCallbackBuilder(context, sessionPlayerConnector).build();
         new SessionCallbackBuilder(context, sessionPlayerConnector).build();
-    TestUtils.loadResource(context, R.raw.testmp3_2, sessionPlayerConnector);
+    TestUtils.loadResource(context, R.raw.audio, sessionPlayerConnector);
     ListenableFuture<PlayerResult> prepareResult = sessionPlayerConnector.prepare();
     ListenableFuture<PlayerResult> prepareResult = sessionPlayerConnector.prepare();
     CountDownLatch latch = new CountDownLatch(1);
     CountDownLatch latch = new CountDownLatch(1);
     sessionPlayerConnector.registerPlayerCallback(
     sessionPlayerConnector.registerPlayerCallback(

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java

@@ -168,8 +168,8 @@ public class SessionCallbackBuilderTest {
   @Test
   @Test
   public void allowedCommand_whenPlaylistSet_allowsSkipTo() throws Exception {
   public void allowedCommand_whenPlaylistSet_allowsSkipTo() throws Exception {
     List<MediaItem> testPlaylist = new ArrayList<>();
     List<MediaItem> testPlaylist = new ArrayList<>();
-    testPlaylist.add(TestUtils.createMediaItem(context, R.raw.testvideo));
-    testPlaylist.add(TestUtils.createMediaItem(context, R.raw.sample_not_seekable));
+    testPlaylist.add(TestUtils.createMediaItem(context, R.raw.video_desks));
+    testPlaylist.add(TestUtils.createMediaItem(context, R.raw.video_not_seekable));
     int testRewindIncrementMs = 100;
     int testRewindIncrementMs = 100;
     int testFastForwardIncrementMs = 100;
     int testFastForwardIncrementMs = 100;
 
 
@@ -238,9 +238,9 @@ public class SessionCallbackBuilderTest {
   public void allowedCommand_afterCurrentMediaItemPrepared_notifiesSeekToAvailable()
   public void allowedCommand_afterCurrentMediaItemPrepared_notifiesSeekToAvailable()
       throws Exception {
       throws Exception {
     List<MediaItem> testPlaylist = new ArrayList<>();
     List<MediaItem> testPlaylist = new ArrayList<>();
-    testPlaylist.add(TestUtils.createMediaItem(context, R.raw.testvideo));
+    testPlaylist.add(TestUtils.createMediaItem(context));
 
 
-    int resid = R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
+    int resid = R.raw.video_big_buck_bunny;
     TestDataSourceCallback source =
     TestDataSourceCallback source =
         TestDataSourceCallback.fromAssetFd(context.getResources().openRawResourceFd(resid));
         TestDataSourceCallback.fromAssetFd(context.getResources().openRawResourceFd(resid));
     CountDownLatch readAllowedLatch = new CountDownLatch(1);
     CountDownLatch readAllowedLatch = new CountDownLatch(1);
@@ -382,7 +382,7 @@ public class SessionCallbackBuilderTest {
   @LargeTest
   @LargeTest
   @Test
   @Test
   public void setRewindIncrementMs_withPositiveRewindIncrement_rewinds() throws Exception {
   public void setRewindIncrementMs_withPositiveRewindIncrement_rewinds() throws Exception {
-    int testResId = R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
+    int testResId = R.raw.video_big_buck_bunny;
     int testDuration = 10_000;
     int testDuration = 10_000;
     int tolerance = 100;
     int tolerance = 100;
     int testSeekPosition = 2_000;
     int testSeekPosition = 2_000;
@@ -426,7 +426,7 @@ public class SessionCallbackBuilderTest {
   @Test
   @Test
   public void setFastForwardIncrementMs_withPositiveFastForwardIncrement_fastsForward()
   public void setFastForwardIncrementMs_withPositiveFastForwardIncrement_fastsForward()
       throws Exception {
       throws Exception {
-    int testResId = R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
+    int testResId = R.raw.video_big_buck_bunny;
     int testDuration = 10_000;
     int testDuration = 10_000;
     int tolerance = 100;
     int tolerance = 100;
     int testSeekPosition = 2_000;
     int testSeekPosition = 2_000;
@@ -469,7 +469,7 @@ public class SessionCallbackBuilderTest {
   @Test
   @Test
   public void setMediaItemProvider_withMediaItemProvider_receivesOnCreateMediaItem()
   public void setMediaItemProvider_withMediaItemProvider_receivesOnCreateMediaItem()
       throws Exception {
       throws Exception {
-    int testResId = R.raw.testmp3_2;
+    int testResId = R.raw.audio;
     Uri testMediaIdUri = TestUtils.createResourceUri(context, testResId);
     Uri testMediaIdUri = TestUtils.createResourceUri(context, testResId);
 
 
     CountDownLatch providerLatch = new CountDownLatch(1);
     CountDownLatch providerLatch = new CountDownLatch(1);

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/TestUtils.java

@@ -29,12 +29,14 @@ import androidx.media2.common.MediaMetadata;
 import androidx.media2.common.SessionPlayer;
 import androidx.media2.common.SessionPlayer;
 import androidx.media2.common.SessionPlayer.PlayerResult;
 import androidx.media2.common.SessionPlayer.PlayerResult;
 import androidx.media2.common.UriMediaItem;
 import androidx.media2.common.UriMediaItem;
+import com.google.android.exoplayer2.ext.media2.test.R;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.Future;
 
 
 /** Utilities for tests. */
 /** Utilities for tests. */
-public final class TestUtils {
+/* package */ final class TestUtils {
+
   private static final long PLAYER_STATE_CHANGE_WAIT_TIME_MS = 5_000;
   private static final long PLAYER_STATE_CHANGE_WAIT_TIME_MS = 5_000;
 
 
   public static Uri createResourceUri(Context context, int resId) {
   public static Uri createResourceUri(Context context, int resId) {
@@ -48,17 +50,17 @@ public final class TestUtils {
   }
   }
 
 
   public static MediaItem createMediaItem(Context context) {
   public static MediaItem createMediaItem(Context context) {
-    return createMediaItem(context, com.google.android.exoplayer2.ext.media2.test.R.raw.testvideo);
+    return createMediaItem(context, R.raw.video_desks);
   }
   }
 
 
   public static MediaItem createMediaItem(Context context, int resId) {
   public static MediaItem createMediaItem(Context context, int resId) {
-    Uri testVideoUri = createResourceUri(context, resId);
+    Uri resourceUri = createResourceUri(context, resId);
     String resourceName = context.getResources().getResourceName(resId);
     String resourceName = context.getResources().getResourceName(resId);
     MediaMetadata metadata =
     MediaMetadata metadata =
         new MediaMetadata.Builder()
         new MediaMetadata.Builder()
             .putString(MediaMetadata.METADATA_KEY_MEDIA_ID, resourceName)
             .putString(MediaMetadata.METADATA_KEY_MEDIA_ID, resourceName)
             .build();
             .build();
-    return new UriMediaItem.Builder(testVideoUri).setMetadata(metadata).build();
+    return new UriMediaItem.Builder(resourceUri).setMetadata(metadata).build();
   }
   }
 
 
   public static List<MediaItem> createPlaylist(Context context, int size) {
   public static List<MediaItem> createPlaylist(Context context, int size) {
@@ -71,7 +73,6 @@ public final class TestUtils {
 
 
   public static void loadResource(Context context, int resId, SessionPlayer sessionPlayer)
   public static void loadResource(Context context, int resId, SessionPlayer sessionPlayer)
       throws Exception {
       throws Exception {
-    Uri testUri = TestUtils.createResourceUri(context, resId);
     MediaItem mediaItem = createMediaItem(context, resId);
     MediaItem mediaItem = createMediaItem(context, resId);
     assertPlayerResultSuccess(sessionPlayer.setMediaItem(mediaItem));
     assertPlayerResultSuccess(sessionPlayer.setMediaItem(mediaItem));
   }
   }