wip

Author: panchenko

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

@@ -2350,13 +2350,12 @@ public void parseCluster_validateEdsSourceConfig() throws ResourceInvalidExcepti
         .setLbPolicy(LbPolicy.ROUND_ROBIN)
         .build();
 
-    assertThrows(ResourceInvalidException.class);
-    assertThat(e).hasMessageThat()
-        .isEqualTo(
+    ResourceInvalidException e = assertThrows(ResourceInvalidException.class,
+        () -> XdsClusterResource.processCluster(cluster3, null, LRS_SERVER_INFO,
+            LoadBalancerRegistry.getDefaultRegistry()));
+    assertThat(e).hasMessageThat().isEqualTo(
         "Cluster cluster-foo.googleapis.com: field eds_cluster_config must be set to indicate to"
             + " use EDS over ADS or self ConfigSource");
-    XdsClusterResource.processCluster(cluster3, null, LRS_SERVER_INFO,
-        LoadBalancerRegistry.getDefaultRegistry());
   }
 
   @Test
@@ -2645,11 +2644,11 @@ public void parseServerSideListener_listenerFiltersPresent() throws ResourceInva
             .setTrafficDirection(TrafficDirection.INBOUND)
             .addListenerFilters(ListenerFilter.newBuilder().build())
             .build();
-    assertThrows(ResourceInvalidException.class);
+    ResourceInvalidException e = assertThrows(ResourceInvalidException.class,
+        () -> XdsListenerResource.parseServerSideListener(listener, null, filterRegistry, null,
+            getXdsResourceTypeArgs(true)));
     assertThat(e).hasMessageThat()
         .isEqualTo("Listener listener1 cannot have listener_filters");
-    XdsListenerResource.parseServerSideListener(
-        listener, null, filterRegistry, null, getXdsResourceTypeArgs(true));
   }
 
   @Test
@@ -2660,11 +2659,11 @@ public void parseServerSideListener_useOriginalDst() throws ResourceInvalidExcep
             .setTrafficDirection(TrafficDirection.INBOUND)
             .setUseOriginalDst(BoolValue.of(true))
             .build();
-    assertThrows(ResourceInvalidException.class);
+    ResourceInvalidException e = assertThrows(ResourceInvalidException.class,
+        () -> XdsListenerResource.parseServerSideListener(listener, null, filterRegistry, null,
+            getXdsResourceTypeArgs(true)));
     assertThat(e).hasMessageThat()
         .isEqualTo("Listener listener1 cannot have use_original_dst set to true");
-    XdsListenerResource.parseServerSideListener(
-        listener,null, filterRegistry, null, getXdsResourceTypeArgs(true));
   }
 
   @Test
@@ -3448,9 +3447,9 @@ public void validateDownstreamTlsContext_hasOcspStaplePolicy() throws ResourceIn
   @Test
   public void validateUpstreamTlsContext_noCommonTlsContext() throws ResourceInvalidException {
     UpstreamTlsContext upstreamTlsContext = UpstreamTlsContext.getDefaultInstance();
-    assertThrows(ResourceInvalidException.class);
+    ResourceInvalidException e = assertThrows(ResourceInvalidException.class,
+        () -> XdsClusterResource.validateUpstreamTlsContext(upstreamTlsContext, null));
     assertThat(e).hasMessageThat().isEqualTo("common-tls-context is required in upstream-tls-context");
-    XdsClusterResource.validateUpstreamTlsContext(upstreamTlsContext, null);
   }
 
   @Test