From 77c5bc8e312c615616e5f39aae36571df78f8a6a Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 8 Nov 2021 12:41:43 +0000
Subject: [PATCH] Split MediaItemTest#setSubtitles into two tests

Each test exercises one of the setters. Together they assert that both
setters set both fields.

PiperOrigin-RevId: 408309207
---
 .../androidx/media3/common/MediaItemTest.java | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/libraries/common/src/test/java/androidx/media3/common/MediaItemTest.java b/libraries/common/src/test/java/androidx/media3/common/MediaItemTest.java
index 05c671233f..7c6e7f9105 100644
--- a/libraries/common/src/test/java/androidx/media3/common/MediaItemTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/MediaItemTest.java
@@ -266,8 +266,8 @@ public class MediaItemTest {
   }
 
   @Test
-  @SuppressWarnings("deprecation") // Using deprecated Subtitle type
-  public void builderSetSubtitles_setsSubtitles() {
+  @SuppressWarnings("deprecation") // Reading deprecated subtitles field
+  public void builderSetSubtitleConfigurations() {
     List<MediaItem.SubtitleConfiguration> subtitleConfigurations =
         ImmutableList.of(
             new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_STRING + "/es"))
@@ -276,7 +276,24 @@ public class MediaItemTest {
                 .setSelectionFlags(C.SELECTION_FLAG_FORCED)
                 .setRoleFlags(C.ROLE_FLAG_ALTERNATE)
                 .setLabel("label")
-                .build(),
+                .build());
+
+    MediaItem mediaItem =
+        new MediaItem.Builder()
+            .setUri(URI_STRING)
+            .setSubtitleConfigurations(subtitleConfigurations)
+            .build();
+
+    assertThat(mediaItem.localConfiguration.subtitleConfigurations)
+        .isEqualTo(subtitleConfigurations);
+    assertThat(mediaItem.localConfiguration.subtitles).isEqualTo(subtitleConfigurations);
+  }
+
+  @Test
+  @SuppressWarnings("deprecation") // Using deprecated Subtitle type
+  public void builderSetSubtitles() {
+    List<MediaItem.Subtitle> subtitles =
+        ImmutableList.of(
             new MediaItem.Subtitle(
                 Uri.parse(URI_STRING + "/en"), MimeTypes.APPLICATION_TTML, /* language= */ "en"),
             new MediaItem.Subtitle(
@@ -293,14 +310,10 @@ public class MediaItemTest {
                 "label"));
 
     MediaItem mediaItem =
-        new MediaItem.Builder()
-            .setUri(URI_STRING)
-            .setSubtitleConfigurations(subtitleConfigurations)
-            .build();
+        new MediaItem.Builder().setUri(URI_STRING).setSubtitles(subtitles).build();
 
-    assertThat(mediaItem.localConfiguration.subtitleConfigurations)
-        .isEqualTo(subtitleConfigurations);
-    assertThat(mediaItem.localConfiguration.subtitles).isEqualTo(subtitleConfigurations);
+    assertThat(mediaItem.localConfiguration.subtitleConfigurations).isEqualTo(subtitles);
+    assertThat(mediaItem.localConfiguration.subtitles).isEqualTo(subtitles);
   }
 
   @Test