fix: Extract the rpc exception from IllegalStateExceptins in publish/subscribe (#430)

palmere-google · web-flow · commit ff05b1a7e1aa · 2020-12-16T13:38:34.000-05:00
diff --git a/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/it/ITVPCNegativeTest.java b/google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/it/ITVPCNegativeTest.java
@@ -67,7 +67,6 @@
 
 /* Integration tests for VPC-SC */
 public class ITVPCNegativeTest {
-
   private static final boolean IS_VPCSC_TEST =
       System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") != null
           && System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC").equalsIgnoreCase("true");
@@ -330,7 +329,7 @@ public void deniedPublish() {
     } catch (TimeoutException t) {
       fail("Expected PERMISSION_DENIED CheckedApiException but got: " + t.toString());
     } catch (IllegalStateException e) {
-      checkExceptionForVPCError(toCanonical(e));
+      checkExceptionForVPCError(toCanonical(e.getCause()));
     }
   }
 
@@ -367,7 +366,7 @@ public void deniedSubscriber() {
     } catch (TimeoutException t) {
       fail("Expected PERMISSION_DENIED CheckedApiException but got: " + t.toString());
     } catch (IllegalStateException e) {
-      checkExceptionForVPCError(toCanonical(e));
+      checkExceptionForVPCError(toCanonical(e.getCause()));
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@`
`67`	`67`
`68`	`68`	`/* Integration tests for VPC-SC */`
`69`	`69`	`public class ITVPCNegativeTest {`
`70`		`-`
`71`	`70`	`private static final boolean IS_VPCSC_TEST =`
`72`	`71`	`System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC") != null`
`73`	`72`	`&& System.getenv("GOOGLE_CLOUD_TESTS_IN_VPCSC").equalsIgnoreCase("true");`
`@@ -330,7 +329,7 @@ public void deniedPublish() {`
`330`	`329`	`} catch (TimeoutException t) {`
`331`	`330`	`fail("Expected PERMISSION_DENIED CheckedApiException but got: " + t.toString());`
`332`	`331`	`} catch (IllegalStateException e) {`
`333`		`- checkExceptionForVPCError(toCanonical(e));`
	`332`	`+ checkExceptionForVPCError(toCanonical(e.getCause()));`
`334`	`333`	`}`
`335`	`334`	`}`
`336`	`335`
`@@ -367,7 +366,7 @@ public void deniedSubscriber() {`
`367`	`366`	`} catch (TimeoutException t) {`
`368`	`367`	`fail("Expected PERMISSION_DENIED CheckedApiException but got: " + t.toString());`
`369`	`368`	`} catch (IllegalStateException e) {`
`370`		`- checkExceptionForVPCError(toCanonical(e));`
	`369`	`+ checkExceptionForVPCError(toCanonical(e.getCause()));`
`371`	`370`	`}`
`372`	`371`	`}`
`373`	`372`	`}`