commit 39229807f74f11b0d764d305cad9f5d2b621d584
author Martin Storsjo <martin@martin.st> Wed Feb 12 12:47:21 2014 +0200
committer Marco Nelissen <marcone@google.com> Wed Mar 19 11:01:08 2014 -0700
tree 3e2d8d129e15db360675370121e067afed077f84
parent 41d9da6b874bf8ac4cf1ce101886f8d2451e7025

StreamingMediaPlayerTest: Add a test for redirects in HLS playlists

Cherrypicked from https://android-review.googlesource.com/#/c/81857
b/13174301

Change-Id: Id4eea05b34bc11649336c7765bce7de94e583aa0

tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java

diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index 1cd285e..07c7410 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -249,18 +249,27 @@
     }
 
     public void testPlayHlsStream() throws Throwable {
-        localHlsTest("hls.m3u8", false);
+        localHlsTest("hls.m3u8", false, false);
     }
 
     public void testPlayHlsStreamWithQueryString() throws Throwable {
-        localHlsTest("hls.m3u8", true);
+        localHlsTest("hls.m3u8", true, false);
     }
 
-    private void localHlsTest(final String name, boolean appendQueryString)
+    public void testPlayHlsStreamWithRedirect() throws Throwable {
+        localHlsTest("hls.m3u8", false, true);
+    }
+
+    private void localHlsTest(final String name, boolean appendQueryString, boolean redirect)
             throws Throwable {
         mServer = new CtsTestServer(mContext);
         try {
-            String stream_url = mServer.getAssetUrl(name);
+            String stream_url = null;
+            if (redirect) {
+                stream_url = mServer.getQueryRedirectingAssetUrl(name);
+            } else {
+                stream_url = mServer.getAssetUrl(name);
+            }
             if (appendQueryString) {
                 stream_url += "?foo=bar/baz";
             }