update testutils.ResolverClientConn and other review comments

Author: easwars

xds/internal/resolver/helpers_test.go

@@ -24,9 +24,6 @@ import (
 	"testing"
 	"time"
 
-	v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
-	v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"google.golang.org/grpc/internal"
@@ -39,6 +36,10 @@ import (
 	"google.golang.org/grpc/serviceconfig"
 	xdsresolver "google.golang.org/grpc/xds/internal/resolver"
 	"google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
+
+	v3listenerpb "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
+	v3routepb "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
+	v3discoverypb "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 )
 
 type s struct {
@@ -240,7 +241,6 @@ func waitForResourceNames(ctx context.Context, t *testing.T, namesCh chan []stri
 	t.Helper()
 
 	for ; ctx.Err() == nil; <-time.After(defaultTestShortTimeout) {
-		t.Logf("easwars: executing the for loop waiting for resource names")
 		select {
 		case <-ctx.Done():
 		case gotNames := <-namesCh:

xds/internal/resolver/watch_service_test.go

@@ -39,8 +39,8 @@ import (
 // configuration resource after the xDS resolver has successfully resolved the
 // service name and pushed an update on the channel. The test verifies that the
 // resolver stops requesting the old route configuration resource and requests
-// the new resource, and once successfully resolved, sends an update on the
-// channel.
+// the new resource, and once successfully resolved, verifies that the update
+// from the resolver matches expected service config.
 func (s) TestServiceWatch_ListenerPointsToNewRouteConfiguration(t *testing.T) {
 	// Spin up an xDS management server for the test.
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
@@ -97,7 +97,7 @@ func (s) TestServiceWatch_ListenerPointsToNewRouteConfiguration(t *testing.T) {
 // Tests the case where the listener resource changes to contain an inline route
 // configuration and changes back to having a route configuration resource name.
 // Verifies that the expected xDS resource names are requested by the resolver
-// and the update pushed to the channel contains the expected service config.
+// and that the update from the resolver matches expected service config.
 func (s) TestServiceWatch_ListenerPointsToInlineRouteConfiguration(t *testing.T) {
 	// Spin up an xDS management server for the test.
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)