address suggestions

Author: shivaspeaks

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

@@ -392,21 +392,24 @@ public void testLruCacheEvictionOnResize() throws IOException, ResourceInvalidEx
         .withOption(XDS_CONFIG_CALL_OPTION_KEY, defaultXdsConfig);
     GcpAuthenticationFilter filter = new GcpAuthenticationFilter("FILTER_INSTANCE_NAME", 2);
     MethodDescriptor<Void, Void> methodDescriptor = TestMethodDescriptors.voidMethod();
+
     ClientInterceptor interceptor1 =
         filter.buildClientInterceptor(new GcpAuthenticationConfig(2), null, null);
     Channel mockChannel1 = Mockito.mock(Channel.class);
     ArgumentCaptor<CallOptions> captor = ArgumentCaptor.forClass(CallOptions.class);
     interceptor1.interceptCall(methodDescriptor, callOptionsWithXds, mockChannel1);
     verify(mockChannel1).newCall(eq(methodDescriptor), captor.capture());
     CallOptions options1 = captor.getValue();
-    assertNotNull(options1.getCredentials());
+    // This will recreate the cache with max size of 1 and copy the credential for audience1.
     ClientInterceptor interceptor2 =
         filter.buildClientInterceptor(new GcpAuthenticationConfig(1), null, null);
     Channel mockChannel2 = Mockito.mock(Channel.class);
     interceptor2.interceptCall(methodDescriptor, callOptionsWithXds, mockChannel2);
     verify(mockChannel2).newCall(eq(methodDescriptor), captor.capture());
     CallOptions options2 = captor.getValue();
-    assertNotNull(options2.getCredentials());
+
+    assertSame(options1.getCredentials(), options2.getCredentials());
+
     clusterConfig = new XdsConfig.XdsClusterConfig(
         CLUSTER_NAME, getCdsUpdate2(), new EndpointConfig(StatusOr.fromValue(edsUpdate)));
     defaultXdsConfig = new XdsConfig.XdsConfigBuilder()
@@ -417,13 +420,17 @@ public void testLruCacheEvictionOnResize() throws IOException, ResourceInvalidEx
     callOptionsWithXds = CallOptions.DEFAULT
         .withOption(CLUSTER_SELECTION_KEY, "cluster:cluster0")
         .withOption(XDS_CONFIG_CALL_OPTION_KEY, defaultXdsConfig);
+
+    // This will evict the credential for audience1 and add new credential for audience2
     ClientInterceptor interceptor3 =
         filter.buildClientInterceptor(new GcpAuthenticationConfig(1), null, null);
     Channel mockChannel3 = Mockito.mock(Channel.class);
     interceptor3.interceptCall(methodDescriptor, callOptionsWithXds, mockChannel3);
     verify(mockChannel3).newCall(eq(methodDescriptor), captor.capture());
     CallOptions options3 = captor.getValue();
-    assertNotNull(options3.getCredentials());
+
+    assertNotSame(options1.getCredentials(), options3.getCredentials());
+
     clusterConfig = new XdsConfig.XdsClusterConfig(
         CLUSTER_NAME, cdsUpdate, new EndpointConfig(StatusOr.fromValue(edsUpdate)));
     defaultXdsConfig = new XdsConfig.XdsConfigBuilder()
@@ -435,16 +442,14 @@ public void testLruCacheEvictionOnResize() throws IOException, ResourceInvalidEx
         .withOption(CLUSTER_SELECTION_KEY, "cluster:cluster0")
         .withOption(XDS_CONFIG_CALL_OPTION_KEY, defaultXdsConfig);
 
+    // This will create new credential for audience1 because it has been evicted
     ClientInterceptor interceptor4 =
         filter.buildClientInterceptor(new GcpAuthenticationConfig(1), null, null);
     Channel mockChannel4 = Mockito.mock(Channel.class);
     interceptor4.interceptCall(methodDescriptor, callOptionsWithXds, mockChannel4);
     verify(mockChannel4).newCall(eq(methodDescriptor), captor.capture());
     CallOptions options4 = captor.getValue();
-    assertNotNull(options4.getCredentials());
 
-    assertSame(options1.getCredentials(), options2.getCredentials());
-    assertNotSame(options1.getCredentials(), options3.getCredentials());
     assertNotSame(options1.getCredentials(), options4.getCredentials());
   }