From 7b69b47a5e4c1901d0382715516e26259f612972 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 14 Jul 2020 15:45:35 +0100 Subject: [PATCH] Migrate usages of deprecated MediaSource#getTag() method PiperOrigin-RevId: 321156463 --- .../source/DefaultMediaSourceFactoryTest.java | 17 +++++++++++++++-- .../dash/DefaultMediaSourceFactoryTest.java | 2 +- .../hls/DefaultMediaSourceFactoryTest.java | 2 +- .../DefaultMediaSourceFactoryTest.java | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java index 3b4b38c3af..8dfe73f4ad 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java @@ -42,6 +42,17 @@ public final class DefaultMediaSourceFactoryTest { private static final String URI_MEDIA = "http://exoplayer.dev/video"; private static final String URI_TEXT = "http://exoplayer.dev/text"; + @Test + public void createMediaSource_fromMediaItem_returnsSameMediaItemInstance() { + DefaultMediaSourceFactory defaultMediaSourceFactory = + DefaultMediaSourceFactory.newInstance(ApplicationProvider.getApplicationContext()); + MediaItem mediaItem = new MediaItem.Builder().setUri(URI_MEDIA).build(); + + MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem); + + assertThat(mediaSource.getMediaItem()).isSameInstanceAs(mediaItem); + } + @Test public void createMediaSource_withoutMimeType_progressiveSource() { DefaultMediaSourceFactory defaultMediaSourceFactory = @@ -54,7 +65,8 @@ public final class DefaultMediaSourceFactoryTest { } @Test - public void createMediaSource_withTag_tagInSource() { + @SuppressWarnings("deprecation") // Testing deprecated MediaSource.getTag() still works. + public void createMediaSource_withTag_tagInSource_deprecated() { Object tag = new Object(); DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory.newInstance(ApplicationProvider.getApplicationContext()); @@ -109,7 +121,8 @@ public final class DefaultMediaSourceFactoryTest { } @Test - public void createMediaSource_withSubtitle_hasTag() { + @SuppressWarnings("deprecation") // Testing deprecated MediaSource.getTag() still works. + public void createMediaSource_withSubtitle_hasTag_deprecated() { DefaultMediaSourceFactory defaultMediaSourceFactory = DefaultMediaSourceFactory.newInstance(ApplicationProvider.getApplicationContext()); Object tag = new Object(); diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java index 7c3fdfc5ac..4ed34b0164 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java @@ -59,7 +59,7 @@ public class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem); - assertThat(mediaSource.getTag()).isEqualTo(tag); + assertThat(mediaSource.getMediaItem().playbackProperties.tag).isEqualTo(tag); } @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java index 0c9f54881d..d46da26ff2 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java @@ -59,7 +59,7 @@ public class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem); - assertThat(mediaSource.getTag()).isEqualTo(tag); + assertThat(mediaSource.getMediaItem().playbackProperties.tag).isEqualTo(tag); } @Test diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java index 37b686183f..016acdbf3d 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java @@ -59,7 +59,7 @@ public class DefaultMediaSourceFactoryTest { MediaSource mediaSource = defaultMediaSourceFactory.createMediaSource(mediaItem); - assertThat(mediaSource.getTag()).isEqualTo(tag); + assertThat(mediaSource.getMediaItem().playbackProperties.tag).isEqualTo(tag); } @Test