From 1ef06b8d92961979bd6c86ef7349b49ccfd68a93 Mon Sep 17 00:00:00 2001 From: tonihei Date: Thu, 7 Jan 2021 15:04:10 +0000 Subject: [PATCH] Rename sample_mpd to sample_mpd_live This helps to better disambiguate the file from other mpd files in the directory. PiperOrigin-RevId: 350552168 --- .../exoplayer2/source/dash/DefaultDashChunkSourceTest.java | 1 - .../source/dash/manifest/DashManifestParserTest.java | 6 +++--- .../test/assets/media/mpd/{sample_mpd => sample_mpd_live} | 0 3 files changed, 3 insertions(+), 4 deletions(-) rename testdata/src/test/assets/media/mpd/{sample_mpd => sample_mpd_live} (100%) diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java index 3bba58f880..93700d5ec3 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java @@ -42,7 +42,6 @@ public class DefaultDashChunkSourceTest { private static final String SAMPLE_MPD_LIVE_WITH_OFFSET_INSIDE_WINDOW = "media/mpd/sample_mpd_live_with_offset_inside_window"; - private static final String SAMPLE_MPD_VOD = "media/mpd/sample_mpd_vod"; @Test diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java index 1265e3d40a..c82f201267 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java @@ -42,7 +42,7 @@ import org.xmlpull.v1.XmlPullParserFactory; @RunWith(AndroidJUnit4.class) public class DashManifestParserTest { - private static final String SAMPLE_MPD = "media/mpd/sample_mpd"; + private static final String SAMPLE_MPD_LIVE = "media/mpd/sample_mpd_live"; private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = "media/mpd/sample_mpd_unknown_mime_type"; private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "media/mpd/sample_mpd_segment_template"; @@ -73,7 +73,7 @@ public class DashManifestParserTest { DashManifestParser parser = new DashManifestParser(); parser.parse( Uri.parse("https://example.com/test.mpd"), - TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD)); + TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_LIVE)); parser.parse( Uri.parse("https://example.com/test.mpd"), TestUtil.getInputStream( @@ -184,7 +184,7 @@ public class DashManifestParserTest { DashManifest manifest = parser.parse( Uri.parse("https://example.com/test.mpd"), - TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD)); + TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_LIVE)); ProgramInformation expectedProgramInformation = new ProgramInformation( "MediaTitle", "MediaSource", "MediaCopyright", "www.example.com", "enUs"); diff --git a/testdata/src/test/assets/media/mpd/sample_mpd b/testdata/src/test/assets/media/mpd/sample_mpd_live similarity index 100% rename from testdata/src/test/assets/media/mpd/sample_mpd rename to testdata/src/test/assets/media/mpd/sample_mpd_live