From 149ea90541efae5d93ce1a0e5abe90df972e9896 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 31 Oct 2019 08:47:52 +0000
Subject: [PATCH] Fix throws in DashStreamingTest

Some methods marked as throwing DecoderQueryException actually
did not throw it. Switch to marking throws Exception
everywhere.

PiperOrigin-RevId: 277674401
---
 .../playbacktests/gts/DashStreamingTest.java  | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
index 598138126b..5ae4708006 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
@@ -101,7 +101,7 @@ public final class DashStreamingTest {
   // H264 CDD.
 
   @Test
-  public void testH264Fixed() {
+  public void testH264Fixed() throws Exception {
     testRunner
         .setStreamName("test_h264_fixed")
         .setManifestUrl(DashTestData.H264_MANIFEST)
@@ -112,7 +112,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testH264Adaptive() throws DecoderQueryException {
+  public void testH264Adaptive() throws Exception {
     if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -128,7 +128,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testH264AdaptiveWithSeeking() throws DecoderQueryException {
+  public void testH264AdaptiveWithSeeking() throws Exception {
     if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -146,7 +146,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testH264AdaptiveWithRendererDisabling() throws DecoderQueryException {
+  public void testH264AdaptiveWithRendererDisabling() throws Exception {
     if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -166,7 +166,7 @@ public final class DashStreamingTest {
   // H265 CDD.
 
   @Test
-  public void testH265FixedV23() {
+  public void testH265FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -181,7 +181,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testH265AdaptiveV24() throws DecoderQueryException {
+  public void testH265AdaptiveV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -197,7 +197,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testH265AdaptiveWithSeekingV24() throws DecoderQueryException {
+  public void testH265AdaptiveWithSeekingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -214,7 +214,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testH265AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+  public void testH265AdaptiveWithRendererDisablingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -233,7 +233,7 @@ public final class DashStreamingTest {
   // VP9 (CDD).
 
   @Test
-  public void testVp9Fixed360pV23() {
+  public void testVp9Fixed360pV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -249,7 +249,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testVp9AdaptiveV24() throws DecoderQueryException {
+  public void testVp9AdaptiveV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -265,7 +265,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testVp9AdaptiveWithSeekingV24() throws DecoderQueryException {
+  public void testVp9AdaptiveWithSeekingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -282,7 +282,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testVp9AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+  public void testVp9AdaptiveWithRendererDisablingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -302,7 +302,7 @@ public final class DashStreamingTest {
 
   // 23.976 fps.
   @Test
-  public void test23FpsH264FixedV23() {
+  public void test23FpsH264FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -319,7 +319,7 @@ public final class DashStreamingTest {
 
   // 24 fps.
   @Test
-  public void test24FpsH264FixedV23() {
+  public void test24FpsH264FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -336,7 +336,7 @@ public final class DashStreamingTest {
 
   // 29.97 fps.
   @Test
-  public void test29FpsH264FixedV23() {
+  public void test29FpsH264FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -355,7 +355,7 @@ public final class DashStreamingTest {
   // H264 CDD.
 
   @Test
-  public void testWidevineH264FixedV18() throws DecoderQueryException {
+  public void testWidevineH264FixedV18() throws Exception {
     if (Util.SDK_INT < 18) {
       // Pass.
       return;
@@ -372,7 +372,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineH264AdaptiveV18() throws DecoderQueryException {
+  public void testWidevineH264AdaptiveV18() throws Exception {
     if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -389,7 +389,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineH264AdaptiveWithSeekingV18() throws DecoderQueryException {
+  public void testWidevineH264AdaptiveWithSeekingV18() throws Exception {
     if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -407,7 +407,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineH264AdaptiveWithRendererDisablingV18() throws DecoderQueryException {
+  public void testWidevineH264AdaptiveWithRendererDisablingV18() throws Exception {
     if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -427,7 +427,7 @@ public final class DashStreamingTest {
   // H265 CDD.
 
   @Test
-  public void testWidevineH265FixedV23() throws DecoderQueryException {
+  public void testWidevineH265FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -444,7 +444,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineH265AdaptiveV24() throws DecoderQueryException {
+  public void testWidevineH265AdaptiveV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -461,7 +461,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineH265AdaptiveWithSeekingV24() throws DecoderQueryException {
+  public void testWidevineH265AdaptiveWithSeekingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -479,7 +479,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineH265AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+  public void testWidevineH265AdaptiveWithRendererDisablingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -499,7 +499,7 @@ public final class DashStreamingTest {
   // VP9 (CDD).
 
   @Test
-  public void testWidevineVp9Fixed360pV23() throws DecoderQueryException {
+  public void testWidevineVp9Fixed360pV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -516,7 +516,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineVp9AdaptiveV24() throws DecoderQueryException {
+  public void testWidevineVp9AdaptiveV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -533,7 +533,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineVp9AdaptiveWithSeekingV24() throws DecoderQueryException {
+  public void testWidevineVp9AdaptiveWithSeekingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -551,7 +551,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testWidevineVp9AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+  public void testWidevineVp9AdaptiveWithRendererDisablingV24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -572,7 +572,7 @@ public final class DashStreamingTest {
 
   // 23.976 fps.
   @Test
-  public void testWidevine23FpsH264FixedV23() throws DecoderQueryException {
+  public void testWidevine23FpsH264FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -590,7 +590,7 @@ public final class DashStreamingTest {
 
   // 24 fps.
   @Test
-  public void testWidevine24FpsH264FixedV23() throws DecoderQueryException {
+  public void testWidevine24FpsH264FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -608,7 +608,7 @@ public final class DashStreamingTest {
 
   // 29.97 fps.
   @Test
-  public void testWidevine29FpsH264FixedV23() throws DecoderQueryException {
+  public void testWidevine29FpsH264FixedV23() throws Exception {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -627,7 +627,7 @@ public final class DashStreamingTest {
   // Decoder info.
 
   @Test
-  public void testDecoderInfoH264() throws DecoderQueryException {
+  public void testDecoderInfoH264() throws Exception {
     MediaCodecInfo decoderInfo =
         MediaCodecUtil.getDecoderInfo(
             MimeTypes.VIDEO_H264, /* secure= */ false, /* tunneling= */ false);
@@ -636,7 +636,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testDecoderInfoH265V24() throws DecoderQueryException {
+  public void testDecoderInfoH265V24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;
@@ -649,7 +649,7 @@ public final class DashStreamingTest {
   }
 
   @Test
-  public void testDecoderInfoVP9V24() throws DecoderQueryException {
+  public void testDecoderInfoVP9V24() throws Exception {
     if (Util.SDK_INT < 24) {
       // Pass.
       return;