From c4ed6360a98355b1ca6e772a73bd27ece15de3e9 Mon Sep 17 00:00:00 2001
From: Easwar Swaminathan <easwars@google.com>
Date: Mon, 24 May 2021 17:30:29 -0700
Subject: [PATCH] transport: remove RequestURI field from requests in transport
 test (#4465)

---
 internal/transport/handler_server_test.go | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/internal/transport/handler_server_test.go b/internal/transport/handler_server_test.go
index f9efdfb0716..b08dcaaf3c4 100644
--- a/internal/transport/handler_server_test.go
+++ b/internal/transport/handler_server_test.go
@@ -62,7 +62,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				ProtoMajor: 2,
 				Method:     "GET",
 				Header:     http.Header{},
-				RequestURI: "/",
 			},
 			wantErr: "invalid gRPC request method",
 		},
@@ -74,7 +73,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				Header: http.Header{
 					"Content-Type": {"application/foo"},
 				},
-				RequestURI: "/service/foo.bar",
 			},
 			wantErr: "invalid gRPC request content-type",
 		},
@@ -86,7 +84,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				Header: http.Header{
 					"Content-Type": {"application/grpc"},
 				},
-				RequestURI: "/service/foo.bar",
 			},
 			modrw: func(w http.ResponseWriter) http.ResponseWriter {
 				// Return w without its Flush method
@@ -109,7 +106,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				URL: &url.URL{
 					Path: "/service/foo.bar",
 				},
-				RequestURI: "/service/foo.bar",
 			},
 			check: func(t *serverHandlerTransport, tt *testCase) error {
 				if t.req != tt.req {
@@ -133,7 +129,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				URL: &url.URL{
 					Path: "/service/foo.bar",
 				},
-				RequestURI: "/service/foo.bar",
 			},
 			check: func(t *serverHandlerTransport, tt *testCase) error {
 				if !t.timeoutSet {
@@ -157,7 +152,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				URL: &url.URL{
 					Path: "/service/foo.bar",
 				},
-				RequestURI: "/service/foo.bar",
 			},
 			wantErr: `rpc error: code = Internal desc = malformed time-out: transport: timeout unit is not recognized: "tomorrow"`,
 		},
@@ -175,7 +169,6 @@ func (s) TestHandlerTransport_NewServerHandlerTransport(t *testing.T) {
 				URL: &url.URL{
 					Path: "/service/foo.bar",
 				},
-				RequestURI: "/service/foo.bar",
 			},
 			check: func(ht *serverHandlerTransport, tt *testCase) error {
 				want := metadata.MD{
@@ -247,8 +240,7 @@ func newHandleStreamTest(t *testing.T) *handleStreamTest {
 		URL: &url.URL{
 			Path: "/service/foo.bar",
 		},
-		RequestURI: "/service/foo.bar",
-		Body:       bodyr,
+		Body: bodyr,
 	}
 	rw := newTestHandlerResponseWriter().(testHandlerResponseWriter)
 	ht, err := NewServerHandlerTransport(rw, req, nil)
@@ -359,8 +351,7 @@ func (s) TestHandlerTransport_HandleStreams_Timeout(t *testing.T) {
 		URL: &url.URL{
 			Path: "/service/foo.bar",
 		},
-		RequestURI: "/service/foo.bar",
-		Body:       bodyr,
+		Body: bodyr,
 	}
 	rw := newTestHandlerResponseWriter().(testHandlerResponseWriter)
 	ht, err := NewServerHandlerTransport(rw, req, nil)