5

Author: panchenko

util/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java

@@ -21,6 +21,7 @@
 import static io.grpc.ConnectivityState.READY;
 import static io.grpc.ConnectivityState.TRANSIENT_FAILURE;
 import static io.grpc.util.GracefulSwitchLoadBalancer.BUFFER_PICKER;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.inOrder;
@@ -52,9 +53,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-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.ArgumentCaptor;
@@ -67,10 +66,6 @@
 public class GracefulSwitchLoadBalancerTest {
   private static final Object FAKE_CONFIG = new Object();
 
-  @SuppressWarnings("deprecation") // https://github.com/grpc/grpc-java/issues/7467
-  @Rule
-  public final ExpectedException thrown = ExpectedException.none();
-
   private final Map<LoadBalancerProvider, LoadBalancer> balancers = new HashMap<>();
   private final Map<LoadBalancer, Helper> helpers = new HashMap<>();
   private final Helper mockHelper = mock(Helper.class);
@@ -101,8 +96,8 @@ public void handleSubchannelState_shouldThrow() {
         .build()));
     Subchannel subchannel = mock(Subchannel.class);
     ConnectivityStateInfo connectivityStateInfo = ConnectivityStateInfo.forNonError(READY);
-    thrown.expect(UnsupportedOperationException.class);
-    gracefulSwitchLb.handleSubchannelState(subchannel, connectivityStateInfo);
+    assertThrows(UnsupportedOperationException.class,
+        () -> gracefulSwitchLb.handleSubchannelState(subchannel, connectivityStateInfo));
   }
 
   @Test