chore: address feedback comments

googleapis · Feb 27, 2020 · 9489a08 · 9489a08
1 parent 99b857e
commit 9489a08
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java
@@ -51,6 +51,7 @@
 import com.google.api.gax.rpc.UnknownException;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import java.util.Set;
 import org.junit.After;
 import org.junit.Assert;
@@ -278,7 +279,7 @@ public void retryKeepFailing() {
     try {
       Futures.getUnchecked(future);
       Assert.fail("Callable should have thrown an exception");
-    } catch (Exception expected) {
+    } catch (UncheckedExecutionException expected) {
       assertThat(expected).hasCauseThat().isInstanceOf(ApiException.class);
       assertThat(expected).hasCauseThat().hasMessageThat().contains("Unavailable");
     }

diff --git a/gax/src/test/java/com/google/api/gax/rpc/ApiExceptionsTest.java b/gax/src/test/java/com/google/api/gax/rpc/ApiExceptionsTest.java
@@ -37,6 +37,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import java.io.IOException;
 import java.util.concurrent.Executors;
 import org.junit.Assert;
@@ -71,7 +72,7 @@ public void throwsIOException() {
       ApiExceptions.callAndTranslateApiException(
           ApiFutures.immediateFailedFuture(new IOException()));
       Assert.fail("ApiExceptions should have thrown an exception");
-    } catch (Exception expected) {
+    } catch (UncheckedExecutionException expected) {
       assertThat(expected).hasCauseThat().isInstanceOf(IOException.class);
     }
   }
@@ -82,7 +83,7 @@ public void throwsRuntimeException() {
       ApiExceptions.callAndTranslateApiException(
           ApiFutures.immediateFailedFuture(new IllegalArgumentException()));
       Assert.fail("ApiExceptions should have thrown an exception");
-    } catch (Exception expected) {
+    } catch (IllegalArgumentException expected) {
       assertThat(expected).isInstanceOf(IllegalArgumentException.class);
     }
   }

diff --git a/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java b/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java
@@ -44,6 +44,7 @@
 import com.google.api.gax.rpc.testing.FakeTransportChannel;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -236,7 +237,7 @@ public void retryKeepFailing() {
     try {
       Futures.getUnchecked(future);
       Assert.fail("Callable should have thrown an exception");
-    } catch (Exception expected) {
+    } catch (UncheckedExecutionException expected) {
       assertThat(expected).hasCauseThat().isSameInstanceAs(throwable);
     }
   }
@@ -277,7 +278,7 @@ public void testUnknownStatusCode() {
     try {
       callable.call(1);
       Assert.fail("Callable should have thrown an exception");
-    } catch (Exception expected) {
+    } catch (RuntimeException expected) {
       assertThat(expected).isInstanceOf(RuntimeException.class);
     }
   }