commit 59a91b8947bbf7f49c37edf12876e1f0ea8f5f7f
author Kurt Alfred Kluever <kak@google.com> Mon Mar 21 10:36:07 2022 -0400
committer Pete Bentley <prb@google.com> Tue Oct 18 17:27:25 2022 +0000
tree 355dea0d1c27d5a75fa0518fb50979f590a8bd47
parent d5dc4de28a0828b43b42f70b9f6381f8eb11dbf4

Use assertThrows() in OptionalMethodTest.

Cherry-picked from upstream PR #1058.

Test: m
Change-Id: Idd7b3c4ad4f6e30a1d81da534d6233b8fb4d14dc

common/src/test/java/org/conscrypt/metrics/OptionalMethodTest.java

diff --git a/common/src/test/java/org/conscrypt/metrics/OptionalMethodTest.java b/common/src/test/java/org/conscrypt/metrics/OptionalMethodTest.java
index 5e85539..eba0537 100644
--- a/common/src/test/java/org/conscrypt/metrics/OptionalMethodTest.java
+++ b/common/src/test/java/org/conscrypt/metrics/OptionalMethodTest.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,9 +30,11 @@
         assertNull(substring.invoke("input", 2, 5));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void nullMethodName() {
-        new OptionalMethod(String.class, null, int.class, int.class);
+        assertThrows(
+            NullPointerException.class,
+            () -> new OptionalMethod(String.class, null, int.class, int.class));
     }
 
     @Test

repackaged/common/src/test/java/com/android/org/conscrypt/metrics/OptionalMethodTest.java

diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/metrics/OptionalMethodTest.java b/repackaged/common/src/test/java/com/android/org/conscrypt/metrics/OptionalMethodTest.java
index 4675042..143a8f1 100644
--- a/repackaged/common/src/test/java/com/android/org/conscrypt/metrics/OptionalMethodTest.java
+++ b/repackaged/common/src/test/java/com/android/org/conscrypt/metrics/OptionalMethodTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,9 +34,10 @@
         assertNull(substring.invoke("input", 2, 5));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void nullMethodName() {
-        new OptionalMethod(String.class, null, int.class, int.class);
+        assertThrows(NullPointerException.class,
+                () -> new OptionalMethod(String.class, null, int.class, int.class));
     }
 
     @Test