testdata: update to reflect green -> yellow change

Author: Stephen Gutekanst

cmd/src/testdata/search_formatting/basic-commit.want.txt

@@ -3,7 +3,7 @@
 (https://sourcegraph.com/github.com/golang/oauth2/-/commit/30b72dfc067246f4fa261c8890160b889fdd4b29)
 github.com/golang/oauth2 › Tim Cooper "oauth2: close request body if errors occur before base RoundTripper is invoked" (2 months ago)
 --------------------------------------------------------------------------------
-  oauth2: close request body if errors occur before base RoundTripper is invoked
+  oauth2: close request body if errors occur before base RoundTripper is invoked
 
   Fixes golang/oauth#269
 
@@ -16,8 +16,8 @@
 --------------------------------------------------------------------------------
   internal: remove RegisterContextClientFunc
 
-  This function added a totally unused error path, since the only call
-  site is for App Engine, which cannot produce an error.
+  This function added a totally unused error path, since the only call
+  site is for App Engine, which cannot produce an error.
 
   Change-Id: I86277ab4ff96e7bd140c53c5a114a338716668e3
   Reviewed-on: https://go-review.googlesource.com/85935
@@ -26,13 +26,13 @@
 (https://sourcegraph.com/github.com/golang/oauth2/-/commit/ee2bad97a97122079f2a3d0dce09330f085b36a0)
 github.com/golang/oauth2 › Ross Light "internal: return error if no access_token present in server response" (7 months ago)
 --------------------------------------------------------------------------------
-  internal: return error if no access_token present in server response
+  internal: return error if no access_token present in server response
 
   This behavior and test was introduced in 0ae3d4edc99f765dc1513a9605aa96e82877a20a.
   It is not consistent with the other test introduced in the same commit,
-  where an incorrectly typed access_token does produce an error.  Since a
+  where an incorrectly typed access_token does produce an error.  Since a
   *Token with a blank AccessToken is invalid, it is allowing an invalid
-  token to be returned without error.
+  token to be returned without error.
 
   Cleans up some tests responding with invalid data.
 

cmd/src/testdata/search_formatting/basic-diff.want.txt

@@ -8,49 +8,49 @@
   --- transport_test.go
   +++ transport_test.go
   @@ -3,0 +4,2 @@ import (
-  +	"errors"
+  +	"errors"
   +	"io"
   @@ -29,0 +33,6 @@ func TestTransportNilTokenSource(t *testing.T) {
   +	CloseCount int
-  +	ReadErr    error
+  +	ReadErr    error
   +}
   +
-  +func (r *readCloseCounter) Read(b []byte) (int, error) {
+  +func (r *readCloseCounter) Read(b []byte) (int, error) {
   +	return 0, r.ReadErr
   @@ -29,0 +40,3 @@ func TestTransportNilTokenSource(t *testing.T) {
   +
-  +func (r *readCloseCounter) Close() error {
+  +func (r *readCloseCounter) Close() error {
   +	r.CloseCount++
 
 --------------------------------------------------------------------------------
 (https://sourcegraph.com/github.com/golang/oauth2/-/commit/088f8e1d436e8d636f13cd83a345b3d6ff2f04ae)
-github.com/golang/oauth2 › Guillaume J. Charmes "oauth2: Add support for custom params in Exchange" (2 months ago)
+github.com/golang/oauth2 › Guillaume J. Charmes "oauth2: Add support for custom params in Exchange" (3 months ago)
 --------------------------------------------------------------------------------
   diff --git oauth2.go oauth2.go
   index 10299d2..16775d0 100644
   --- oauth2.go
   +++ oauth2.go
   @@ -189,1 +191,1 @@ func (c *Config) PasswordCredentialsToken(ctx context.Context, username, passwor
-  -func (c *Config) Exchange(ctx context.Context, code string) (*Token, error) {
+  -func (c *Config) Exchange(ctx context.Context, code string) (*Token, error) {
   +//
   @@ -190,0 +193,2 @@ func (c *Config) PasswordCredentialsToken(ctx context.Context, username, passwor
   +// See https://www.oauth.com/oauth2-servers/pkce/ for more info.
-  +func (c *Config) Exchange(ctx context.Context, code string, opts ...AuthCodeOption) (*Token, error) {
+  +func (c *Config) Exchange(ctx context.Context, code string, opts ...AuthCodeOption) (*Token, error) {
   diff --git oauth2_test.go oauth2_test.go
   index 847160f..ef12ebc 100644
   --- oauth2_test.go
   +++ oauth2_test.go
   @@ -137,0 +140,3 @@ func TestExchangeRequest(t *testing.T) {
   +		if r.URL.String() != "/token" {
-  +			t.Errorf("Unexpected exchange request URL, %v is found.", r.URL)
+  +			t.Errorf("Unexpected exchange request URL, %v is found.", r.URL)
   +		}
   @@ -137,0 +144,3 @@ func TestExchangeRequest(t *testing.T) {
   +		if headerAuth != "Basic Q0xJRU5UX0lEOkNMSUVOVF9TRUNSRVQ=" {
-  +			t.Errorf("Unexpected authorization header, %v is found.", headerAuth)
+  +			t.Errorf("Unexpected authorization header, %v is found.", headerAuth)
   +		}
   @@ -137,0 +148,3 @@ func TestExchangeRequest(t *testing.T) {
   +		if headerContentType != "application/x-www-form-urlencoded" {
-  +			t.Errorf("Unexpected Content-Type header, %v is found.", headerContentType)
+  +			t.Errorf("Unexpected Content-Type header, %v is found.", headerContentType)
   +		}
 
 --------------------------------------------------------------------------------
@@ -64,18 +64,18 @@
   +++ jira/jira.go
   @@ -0,0 +79,3 @@
   +
-  +func (js jwtSource) Token() (*oauth2.Token, error) {
+  +func (js jwtSource) Token() (*oauth2.Token, error) {
   +	exp := time.Duration(59) * time.Second
   @@ -0,0 +113,3 @@
   +	if err != nil {
-  +		return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
+  +		return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
   +	}
   @@ -0,0 +118,6 @@
   +	if err != nil {
-  +		return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
+  +		return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
   +	}
   +	if c := resp.StatusCode; c < 200 || c > 299 {
-  +		return nil, fmt.Errorf("oauth2: cannot fetch token: %v\nResponse: %s", resp.Status, body)
+  +		return nil, fmt.Errorf("oauth2: cannot fetch token: %v\nResponse: %s", resp.Status, body)
   +	}
   diff --git jira/jira_test.go jira/jira_test.go
   new file mode 100644
@@ -84,24 +84,24 @@
   +++ jira/jira_test.go
   @@ -0,0 +49,7 @@ ... +2
   +	if !tok.Valid() {
-  +		t.Errorf("got invalid token: %v", tok)
+  +		t.Errorf("got invalid token: %v", tok)
   +	}
   +	if got, want := tok.AccessToken, "90d64460d14870c08c81352a05dedd3465940a7c"; got != want {
-  +		t.Errorf("access token = %q; want %q", got, want)
+  +		t.Errorf("access token = %q; want %q", got, want)
   +	}
   +	if got, want := tok.TokenType, "Bearer"; got != want {
   @@ -0,0 +86,7 @@ ... +1
   +	if tok.Valid() {
-  +		t.Errorf("got invalid token: %v", tok)
+  +		t.Errorf("got invalid token: %v", tok)
   +	}
   +	if got, want := tok.AccessToken, ""; got != want {
-  +		t.Errorf("access token = %q; want %q", got, want)
+  +		t.Errorf("access token = %q; want %q", got, want)
   +	}
   +	if got, want := tok.TokenType, "Bearer"; got != want {
   @@ -0,0 +116,5 @@
   +	if err == nil {
-  +		t.Error("got a token; expected error")
+  +		t.Error("got a token; expected error")
   +		if got, want := tok.AccessToken, ""; got != want {
-  +			t.Errorf("access token = %q; want %q", got, want)
+  +			t.Errorf("access token = %q; want %q", got, want)
   +		}
 

cmd/src/testdata/search_formatting/basic.want.txt

@@ -3,54 +3,54 @@
 (https://sourcegraph.com/github.com/golang/oauth2/-/blob/clientcredentials/clientcredentials.go)
 github.com/golang/oauth2 › clientcredentials.go (5 matches)
 --------------------------------------------------------------------------------
-      50 |  func (c *Config) Token(ctx context.Context) (*oauth2.Token, error) {
+      50 |  func (c *Config) Token(ctx context.Context) (*oauth2.Token, error) {
   ------------------------------------------------------------------------------
-      82 |  func (c *tokenSource) Token() (*oauth2.Token, error) {
+      82 |  func (c *tokenSource) Token() (*oauth2.Token, error) {
   ------------------------------------------------------------------------------
-      91 |  			return nil, fmt.Errorf("oauth2: cannot overwrite parameter %q", k)
+      91 |  			return nil, fmt.Errorf("oauth2: cannot overwrite parameter %q", k)
   ------------------------------------------------------------------------------
-      97 |  		if rErr, ok := err.(*internal.RetrieveError); ok {
-      98 |  			return nil, (*oauth2.RetrieveError)(rErr)
+      97 |  		if rErr, ok := err.(*internal.RetrieveError); ok {
+      98 |  			return nil, (*oauth2.RetrieveError)(rErr)
 --------------------------------------------------------------------------------
 (https://sourcegraph.com/github.com/golang/oauth2/-/blob/clientcredentials/clientcredentials_test.go)
 github.com/golang/oauth2 › clientcredentials_test.go (13 matches)
 --------------------------------------------------------------------------------
-      27 |  	rt func(req *http.Request) (resp *http.Response, err error)
+      27 |  	rt func(req *http.Request) (resp *http.Response, err error)
   ------------------------------------------------------------------------------
-      30 |  func (t *mockTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
+      30 |  func (t *mockTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
   ------------------------------------------------------------------------------
-      37 |  			t.Errorf("authenticate client request URL = %q; want %q", r.URL, "/token")
+      37 |  			t.Errorf("authenticate client request URL = %q; want %q", r.URL, "/token")
   ------------------------------------------------------------------------------
-      41 |  			t.Errorf("Unexpected authorization header, %v is found.", headerAuth)
+      41 |  			t.Errorf("Unexpected authorization header, %v is found.", headerAuth)
   ------------------------------------------------------------------------------
-      44 |  			t.Errorf("Content-Type header = %q; want %q", got, want)
+      44 |  			t.Errorf("Content-Type header = %q; want %q", got, want)
   ------------------------------------------------------------------------------
-      51 |  			t.Errorf("failed reading request body: %s.", err)
+      51 |  			t.Errorf("failed reading request body: %s.", err)
   ------------------------------------------------------------------------------
-      54 |  			t.Errorf("payload = %q; want %q", string(body), "grant_type=client_credentials&scope=scope1+scope2")
+      54 |  			t.Errorf("payload = %q; want %q", string(body), "grant_type=client_credentials&scope=scope1+scope2")
   ------------------------------------------------------------------------------
-      63 |  		t.Error(err)
+      63 |  		t.Error(err)
   ------------------------------------------------------------------------------
-      69 |  		t.Errorf("Access token = %q; want %q", tok.AccessToken, "90d64460d14870c08c81352a05dedd3465940a7c")
+      69 |  		t.Errorf("Access token = %q; want %q", tok.AccessToken, "90d64460d14870c08c81352a05dedd3465940a7c")
   ------------------------------------------------------------------------------
-      72 |  		t.Errorf("token type = %q; want %q", tok.TokenType, "bearer")
+      72 |  		t.Errorf("token type = %q; want %q", tok.TokenType, "bearer")
   ------------------------------------------------------------------------------
-      82 |  			t.Errorf("Unexpected token refresh request URL, %v is found.", r.URL)
+      82 |  			t.Errorf("Unexpected token refresh request URL, %v is found.", r.URL)
   ------------------------------------------------------------------------------
-      86 |  			t.Errorf("Unexpected Content-Type header, %v is found.", headerContentType)
+      86 |  			t.Errorf("Unexpected Content-Type header, %v is found.", headerContentType)
   ------------------------------------------------------------------------------
-      90 |  			t.Errorf("Unexpected refresh token payload, %v is found.", string(body))
+      90 |  			t.Errorf("Unexpected refresh token payload, %v is found.", string(body))
 --------------------------------------------------------------------------------
 (https://sourcegraph.com/github.com/golang/oauth2/-/blob/google/appengine.go)
 github.com/golang/oauth2 › appengine.go (2 matches)
 --------------------------------------------------------------------------------
-      21 |  var appengineTokenFunc func(c context.Context, scopes ...string) (token string, expiry time.Time, err error)
+      21 |  var appengineTokenFunc func(c context.Context, scopes ...string) (token string, expiry time.Time, err error)
   ------------------------------------------------------------------------------
-      62 |  func (ts *appEngineTokenSource) Token() (*oauth2.Token, error) {
+      62 |  func (ts *appEngineTokenSource) Token() (*oauth2.Token, error) {
 --------------------------------------------------------------------------------
 (https://sourcegraph.com/github.com/golang/oauth2/-/blob/google/go19.go)
 github.com/golang/oauth2 › go19.go (2 matches)
 --------------------------------------------------------------------------------
-      47 |  func FindDefaultCredentials(ctx context.Context, scopes ...string) (*Credentials, error) {
+      47 |  func FindDefaultCredentials(ctx context.Context, scopes ...string) (*Credentials, error) {
   ------------------------------------------------------------------------------
-      55 |  func CredentialsFromJSON(ctx context.Context, jsonData []byte, scopes ...string) (*Credentials, error) {
+      55 |  func CredentialsFromJSON(ctx context.Context, jsonData []byte, scopes ...string) (*Credentials, error) {