4

Author: panchenko

xds/src/test/java/io/grpc/xds/WeightedRandomPickerTest.java

@@ -17,6 +17,7 @@
 package io.grpc.xds;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
 import io.grpc.LoadBalancer.PickResult;
@@ -30,7 +31,6 @@
 import java.util.List;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
@@ -42,9 +42,6 @@
  */
 @RunWith(JUnit4.class)
 public class WeightedRandomPickerTest {
-  @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467
-  @Rule
-  public final ExpectedException thrown = ExpectedException.none();
 
   @Rule
   public final MockitoRule mockitoRule = MockitoJUnit.rule();
@@ -128,20 +125,18 @@ public long nextLong(long bound) {
   public void emptyList() {
     List<WeightedChildPicker> emptyList = new ArrayList<>();
 
-    thrown.expect(IllegalArgumentException.class);
-    new WeightedRandomPicker(emptyList);
+    assertThrows(IllegalArgumentException.class, () -> new WeightedRandomPicker(emptyList));
   }
 
   @Test
   public void negativeWeight() {
-    thrown.expect(IllegalArgumentException.class);
-    new WeightedChildPicker(-1, childPicker0);
+    assertThrows(IllegalArgumentException.class, () -> new WeightedChildPicker(-1, childPicker0));
   }
 
   @Test
   public void overWeightSingle() {
-    thrown.expect(IllegalArgumentException.class);
-    new WeightedChildPicker(Integer.MAX_VALUE * 3L, childPicker0);
+    assertThrows(IllegalArgumentException.class,
+        () -> new WeightedChildPicker(Integer.MAX_VALUE * 3L, childPicker0));
   }
 
   @Test
@@ -152,8 +147,8 @@ public void overWeightAggregate() {
         new WeightedChildPicker(Integer.MAX_VALUE, childPicker1),
         new WeightedChildPicker(10, childPicker2));
 
-    thrown.expect(IllegalArgumentException.class);
-    new WeightedRandomPicker(weightedChildPickers, fakeRandom);
+    assertThrows(IllegalArgumentException.class,
+        () -> new WeightedRandomPicker(weightedChildPickers, fakeRandom));
   }
 
   @Test