From a21eb772b171e66cb2a10dae83482c3f90664246 Mon Sep 17 00:00:00 2001 From: christosts Date: Wed, 21 Oct 2020 14:12:35 +0100 Subject: [PATCH] HlsMediaSourceTest: rename dashMediaItem to hlsMediaItem Issue: #4904 PiperOrigin-RevId: 338249499 --- .../source/hls/HlsMediaSourceTest.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java index 7001417186..fd8d90c8b4 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java @@ -40,11 +40,11 @@ public class HlsMediaSourceTest { HlsMediaSource.Factory factory = new HlsMediaSource.Factory(mock(DataSource.Factory.class)).setTag(tag); - MediaItem dashMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); + MediaItem hlsMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - assertThat(dashMediaItem.playbackProperties).isNotNull(); - assertThat(dashMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); - assertThat(dashMediaItem.playbackProperties.tag).isEqualTo(tag); + assertThat(hlsMediaItem.playbackProperties).isNotNull(); + assertThat(hlsMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); + assertThat(hlsMediaItem.playbackProperties.tag).isEqualTo(tag); } // Tests backwards compatibility @@ -58,11 +58,11 @@ public class HlsMediaSourceTest { HlsMediaSource.Factory factory = new HlsMediaSource.Factory(mock(DataSource.Factory.class)).setTag(factoryTag); - MediaItem dashMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); + MediaItem hlsMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - assertThat(dashMediaItem.playbackProperties).isNotNull(); - assertThat(dashMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); - assertThat(dashMediaItem.playbackProperties.tag).isEqualTo(mediaItemTag); + assertThat(hlsMediaItem.playbackProperties).isNotNull(); + assertThat(hlsMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); + assertThat(hlsMediaItem.playbackProperties.tag).isEqualTo(mediaItemTag); } // Tests backwards compatibility @@ -104,11 +104,11 @@ public class HlsMediaSourceTest { new HlsMediaSource.Factory(mock(DataSource.Factory.class)) .setStreamKeys(Collections.singletonList(streamKey)); - MediaItem dashMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); + MediaItem hlsMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - assertThat(dashMediaItem.playbackProperties).isNotNull(); - assertThat(dashMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); - assertThat(dashMediaItem.playbackProperties.streamKeys).containsExactly(streamKey); + assertThat(hlsMediaItem.playbackProperties).isNotNull(); + assertThat(hlsMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); + assertThat(hlsMediaItem.playbackProperties.streamKeys).containsExactly(streamKey); } // Tests backwards compatibility @@ -126,10 +126,10 @@ public class HlsMediaSourceTest { .setStreamKeys( Collections.singletonList(new StreamKey(/* groupIndex= */ 1, /* trackIndex= */ 0))); - MediaItem dashMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); + MediaItem hlsMediaItem = factory.createMediaSource(mediaItem).getMediaItem(); - assertThat(dashMediaItem.playbackProperties).isNotNull(); - assertThat(dashMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); - assertThat(dashMediaItem.playbackProperties.streamKeys).containsExactly(mediaItemStreamKey); + assertThat(hlsMediaItem.playbackProperties).isNotNull(); + assertThat(hlsMediaItem.playbackProperties.uri).isEqualTo(mediaItem.playbackProperties.uri); + assertThat(hlsMediaItem.playbackProperties.streamKeys).containsExactly(mediaItemStreamKey); } }