From 089910546f30b760f2a7753cb52409fa1cf0b570 Mon Sep 17 00:00:00 2001
From: jbibik <jbibik@google.com>
Date: Tue, 7 Nov 2023 03:59:37 -0800
Subject: [PATCH] Fix the asset and dump file names for the standalone
 Webvtt-HLS test

PiperOrigin-RevId: 580125493
---
 .../exoplayer/hls/e2etest/HlsPlaybackTest.java      |   7 ++++---
 .../{webvtt => standalone-webvtt}/english_subs.vtt  |   0
 .../media_playlist.m3u8                             |   0
 .../multivariant_playlist.m3u8                      |   0
 .../{webvtt => standalone-webvtt}/playlist_vtt.m3u8 |   0
 .../hls/{webvtt => standalone-webvtt}/sample.mp4    | Bin
 ...ne_sec_with_subs.dump => standalone-webvtt.dump} |   0
 7 files changed, 4 insertions(+), 3 deletions(-)
 rename libraries/test_data/src/test/assets/media/hls/{webvtt => standalone-webvtt}/english_subs.vtt (100%)
 rename libraries/test_data/src/test/assets/media/hls/{webvtt => standalone-webvtt}/media_playlist.m3u8 (100%)
 rename libraries/test_data/src/test/assets/media/hls/{webvtt => standalone-webvtt}/multivariant_playlist.m3u8 (100%)
 rename libraries/test_data/src/test/assets/media/hls/{webvtt => standalone-webvtt}/playlist_vtt.m3u8 (100%)
 rename libraries/test_data/src/test/assets/media/hls/{webvtt => standalone-webvtt}/sample.mp4 (100%)
 rename libraries/test_data/src/test/assets/playbackdumps/hls/{one_sec_with_subs.dump => standalone-webvtt.dump} (100%)

diff --git a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java
index 0cd6728217..58b4f03efe 100644
--- a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java
+++ b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java
@@ -45,7 +45,7 @@ public final class HlsPlaybackTest {
       ShadowMediaCodecConfig.forAllSupportedMimeTypes();
 
   @Test
-  public void webvttSubtitles() throws Exception {
+  public void webvttStandaloneSubtitlesFile() throws Exception {
     Context applicationContext = ApplicationProvider.getApplicationContext();
     CapturingRenderersFactory capturingRenderersFactory =
         new CapturingRenderersFactory(applicationContext);
@@ -59,13 +59,14 @@ public final class HlsPlaybackTest {
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
-    player.setMediaItem(MediaItem.fromUri("asset:///media/hls/webvtt/multivariant_playlist.m3u8"));
+    player.setMediaItem(
+        MediaItem.fromUri("asset:///media/hls/standalone-webvtt/multivariant_playlist.m3u8"));
     player.prepare();
     player.play();
     TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);
     player.release();
 
     DumpFileAsserts.assertOutput(
-        applicationContext, playbackOutput, "playbackdumps/hls/one_sec_with_subs.dump");
+        applicationContext, playbackOutput, "playbackdumps/hls/standalone-webvtt.dump");
   }
 }
diff --git a/libraries/test_data/src/test/assets/media/hls/webvtt/english_subs.vtt b/libraries/test_data/src/test/assets/media/hls/standalone-webvtt/english_subs.vtt
similarity index 100%
rename from libraries/test_data/src/test/assets/media/hls/webvtt/english_subs.vtt
rename to libraries/test_data/src/test/assets/media/hls/standalone-webvtt/english_subs.vtt
diff --git a/libraries/test_data/src/test/assets/media/hls/webvtt/media_playlist.m3u8 b/libraries/test_data/src/test/assets/media/hls/standalone-webvtt/media_playlist.m3u8
similarity index 100%
rename from libraries/test_data/src/test/assets/media/hls/webvtt/media_playlist.m3u8
rename to libraries/test_data/src/test/assets/media/hls/standalone-webvtt/media_playlist.m3u8
diff --git a/libraries/test_data/src/test/assets/media/hls/webvtt/multivariant_playlist.m3u8 b/libraries/test_data/src/test/assets/media/hls/standalone-webvtt/multivariant_playlist.m3u8
similarity index 100%
rename from libraries/test_data/src/test/assets/media/hls/webvtt/multivariant_playlist.m3u8
rename to libraries/test_data/src/test/assets/media/hls/standalone-webvtt/multivariant_playlist.m3u8
diff --git a/libraries/test_data/src/test/assets/media/hls/webvtt/playlist_vtt.m3u8 b/libraries/test_data/src/test/assets/media/hls/standalone-webvtt/playlist_vtt.m3u8
similarity index 100%
rename from libraries/test_data/src/test/assets/media/hls/webvtt/playlist_vtt.m3u8
rename to libraries/test_data/src/test/assets/media/hls/standalone-webvtt/playlist_vtt.m3u8
diff --git a/libraries/test_data/src/test/assets/media/hls/webvtt/sample.mp4 b/libraries/test_data/src/test/assets/media/hls/standalone-webvtt/sample.mp4
similarity index 100%
rename from libraries/test_data/src/test/assets/media/hls/webvtt/sample.mp4
rename to libraries/test_data/src/test/assets/media/hls/standalone-webvtt/sample.mp4
diff --git a/libraries/test_data/src/test/assets/playbackdumps/hls/one_sec_with_subs.dump b/libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt.dump
similarity index 100%
rename from libraries/test_data/src/test/assets/playbackdumps/hls/one_sec_with_subs.dump
rename to libraries/test_data/src/test/assets/playbackdumps/hls/standalone-webvtt.dump