From 542ae755daf1f51eab2b19a5a4bd42e12bddeb25 Mon Sep 17 00:00:00 2001 From: Ross Light Date: Wed, 27 Dec 2017 16:42:28 -0800 Subject: [PATCH] oauth2: don't use tokenRefresher directly in tests This changes the test to use the exported API instead of implementation internals. Change-Id: I07753b053c1a2a8eb027bed647ab921d95afda4e Reviewed-on: https://go-review.googlesource.com/85658 Reviewed-by: Andrew Bonventre --- oauth2_test.go | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/oauth2_test.go b/oauth2_test.go index 14f041d..4937901 100644 --- a/oauth2_test.go +++ b/oauth2_test.go @@ -453,18 +453,14 @@ func TestRefreshToken_RefreshTokenReplacement(t *testing.T) { })) defer ts.Close() conf := newConf(ts.URL) - tkr := &tokenRefresher{ - conf: conf, - ctx: context.Background(), - refreshToken: "OLD_REFRESH_TOKEN", - } + tkr := conf.TokenSource(context.Background(), &Token{RefreshToken: "OLD_REFRESH_TOKEN"}) tk, err := tkr.Token() if err != nil { t.Errorf("got err = %v; want none", err) return } - if tk.RefreshToken != tkr.refreshToken { - t.Errorf("tokenRefresher.refresh_token = %q; want %q", tkr.refreshToken, tk.RefreshToken) + if want := "NEW_REFRESH_TOKEN"; tk.RefreshToken != want { + t.Errorf("RefreshToken = %q; want %q", tk.RefreshToken, want) } } @@ -477,17 +473,13 @@ func TestRefreshToken_RefreshTokenPreservation(t *testing.T) { defer ts.Close() conf := newConf(ts.URL) const oldRefreshToken = "OLD_REFRESH_TOKEN" - tkr := &tokenRefresher{ - conf: conf, - ctx: context.Background(), - refreshToken: oldRefreshToken, - } - _, err := tkr.Token() + tkr := conf.TokenSource(context.Background(), &Token{RefreshToken: oldRefreshToken}) + tk, err := tkr.Token() if err != nil { t.Fatalf("got err = %v; want none", err) } - if tkr.refreshToken != oldRefreshToken { - t.Errorf("tokenRefresher.refreshToken = %q; want %q", tkr.refreshToken, oldRefreshToken) + if tk.RefreshToken != oldRefreshToken { + t.Errorf("RefreshToken = %q; want %q", tk.RefreshToken, oldRefreshToken) } }