From 845b55d230cc35ae90b6af855f4e5c56483dc040 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 16 Mar 2022 14:46:13 +0000
Subject: [PATCH] Migrate from strongly discouraged `@Test(expected = ...)` to
 `assertThrows(...)`.

More info: go/lsc-assertthrows and go/assertthrows

NOTE: if the source of truth for this code is _NOT_ `//third_party/`, please ask for this CL to be reverted.

Tested:
    TAP --sample ran all affected tests and none failed
    http://test/OCL:434925976:BASE:434869111:1647399186064:de338189
PiperOrigin-RevId: 435047509
---
 .../media3/common/util/ColorParserTest.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libraries/common/src/test/java/androidx/media3/common/util/ColorParserTest.java b/libraries/common/src/test/java/androidx/media3/common/util/ColorParserTest.java
index ba4d2b7a75..4791df0905 100644
--- a/libraries/common/src/test/java/androidx/media3/common/util/ColorParserTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/util/ColorParserTest.java
@@ -22,6 +22,7 @@ import static android.graphics.Color.argb;
 import static android.graphics.Color.parseColor;
 import static androidx.media3.common.util.ColorParser.parseTtmlColor;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import android.graphics.Color;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -34,24 +35,26 @@ public final class ColorParserTest {
 
   // Negative tests.
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void parseUnknownColor() {
-    ColorParser.parseTtmlColor("colorOfAnElectron");
+    assertThrows(
+        IllegalArgumentException.class, () -> ColorParser.parseTtmlColor("colorOfAnElectron"));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void parseNull() {
-    ColorParser.parseTtmlColor(null);
+    assertThrows(IllegalArgumentException.class, () -> ColorParser.parseTtmlColor(null));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void parseEmpty() {
-    ColorParser.parseTtmlColor("");
+    assertThrows(IllegalArgumentException.class, () -> ColorParser.parseTtmlColor(""));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void rgbColorParsingRgbValuesNegative() {
-    ColorParser.parseTtmlColor("rgb(-4, 55, 209)");
+    assertThrows(
+        IllegalArgumentException.class, () -> ColorParser.parseTtmlColor("rgb(-4, 55, 209)"));
   }
 
   // Positive tests.