From aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Wed, 20 Jan 2016 13:36:16 -0600 Subject: Revert " PLT-7 adding loc for db calls" --- store/sql_oauth_store_test.go | 45 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'store/sql_oauth_store_test.go') diff --git a/store/sql_oauth_store_test.go b/store/sql_oauth_store_test.go index f8d035a0c..c3f6ea7ac 100644 --- a/store/sql_oauth_store_test.go +++ b/store/sql_oauth_store_test.go @@ -5,7 +5,6 @@ package store import ( "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" "testing" ) @@ -18,7 +17,7 @@ func TestOAuthStoreSaveApp(t *testing.T) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" - if err := (<-store.OAuth().SaveApp(utils.T, &a1)).Err; err != nil { + if err := (<-store.OAuth().SaveApp(&a1)).Err; err != nil { t.Fatal(err) } } @@ -31,13 +30,13 @@ func TestOAuthStoreGetApp(t *testing.T) { a1.Name = "TestApp" + model.NewId() a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" - Must(store.OAuth().SaveApp(utils.T, &a1)) + Must(store.OAuth().SaveApp(&a1)) - if err := (<-store.OAuth().GetApp(utils.T, a1.Id)).Err; err != nil { + if err := (<-store.OAuth().GetApp(a1.Id)).Err; err != nil { t.Fatal(err) } - if err := (<-store.OAuth().GetAppByUser(utils.T, a1.CreatorId)).Err; err != nil { + if err := (<-store.OAuth().GetAppByUser(a1.CreatorId)).Err; err != nil { t.Fatal(err) } } @@ -50,13 +49,13 @@ func TestOAuthStoreUpdateApp(t *testing.T) { a1.Name = "TestApp" + model.NewId() a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" - Must(store.OAuth().SaveApp(utils.T, &a1)) + Must(store.OAuth().SaveApp(&a1)) a1.CreateAt = 1 a1.ClientSecret = "pwd" a1.CreatorId = "12345678901234567890123456" a1.Name = "NewName" - if result := <-store.OAuth().UpdateApp(utils.T, &a1); result.Err != nil { + if result := <-store.OAuth().UpdateApp(&a1); result.Err != nil { t.Fatal(result.Err) } else { ua1 := (result.Data.([2]*model.OAuthApp)[0]) @@ -83,7 +82,7 @@ func TestOAuthStoreSaveAccessData(t *testing.T) { a1.Token = model.NewId() a1.RefreshToken = model.NewId() - if err := (<-store.OAuth().SaveAccessData(utils.T, &a1)).Err; err != nil { + if err := (<-store.OAuth().SaveAccessData(&a1)).Err; err != nil { t.Fatal(err) } } @@ -95,9 +94,9 @@ func TestOAuthStoreGetAccessData(t *testing.T) { a1.AuthCode = model.NewId() a1.Token = model.NewId() a1.RefreshToken = model.NewId() - Must(store.OAuth().SaveAccessData(utils.T, &a1)) + Must(store.OAuth().SaveAccessData(&a1)) - if result := <-store.OAuth().GetAccessData(utils.T, a1.Token); result.Err != nil { + if result := <-store.OAuth().GetAccessData(a1.Token); result.Err != nil { t.Fatal(result.Err) } else { ra1 := result.Data.(*model.AccessData) @@ -106,11 +105,11 @@ func TestOAuthStoreGetAccessData(t *testing.T) { } } - if err := (<-store.OAuth().GetAccessDataByAuthCode(utils.T, a1.AuthCode)).Err; err != nil { + if err := (<-store.OAuth().GetAccessDataByAuthCode(a1.AuthCode)).Err; err != nil { t.Fatal(err) } - if err := (<-store.OAuth().GetAccessDataByAuthCode(utils.T, "junk")).Err; err != nil { + if err := (<-store.OAuth().GetAccessDataByAuthCode("junk")).Err; err != nil { t.Fatal(err) } } @@ -122,13 +121,13 @@ func TestOAuthStoreRemoveAccessData(t *testing.T) { a1.AuthCode = model.NewId() a1.Token = model.NewId() a1.RefreshToken = model.NewId() - Must(store.OAuth().SaveAccessData(utils.T, &a1)) + Must(store.OAuth().SaveAccessData(&a1)) - if err := (<-store.OAuth().RemoveAccessData(utils.T, a1.Token)).Err; err != nil { + if err := (<-store.OAuth().RemoveAccessData(a1.Token)).Err; err != nil { t.Fatal(err) } - if result := <-store.OAuth().GetAccessDataByAuthCode(utils.T, a1.AuthCode); result.Err != nil { + if result := <-store.OAuth().GetAccessDataByAuthCode(a1.AuthCode); result.Err != nil { t.Fatal(result.Err) } else { if result.Data != nil { @@ -145,7 +144,7 @@ func TestOAuthStoreSaveAuthData(t *testing.T) { a1.UserId = model.NewId() a1.Code = model.NewId() - if err := (<-store.OAuth().SaveAuthData(utils.T, &a1)).Err; err != nil { + if err := (<-store.OAuth().SaveAuthData(&a1)).Err; err != nil { t.Fatal(err) } } @@ -157,9 +156,9 @@ func TestOAuthStoreGetAuthData(t *testing.T) { a1.ClientId = model.NewId() a1.UserId = model.NewId() a1.Code = model.NewId() - Must(store.OAuth().SaveAuthData(utils.T, &a1)) + Must(store.OAuth().SaveAuthData(&a1)) - if err := (<-store.OAuth().GetAuthData(utils.T, a1.Code)).Err; err != nil { + if err := (<-store.OAuth().GetAuthData(a1.Code)).Err; err != nil { t.Fatal(err) } } @@ -171,13 +170,13 @@ func TestOAuthStoreRemoveAuthData(t *testing.T) { a1.ClientId = model.NewId() a1.UserId = model.NewId() a1.Code = model.NewId() - Must(store.OAuth().SaveAuthData(utils.T, &a1)) + Must(store.OAuth().SaveAuthData(&a1)) - if err := (<-store.OAuth().RemoveAuthData(utils.T, a1.Code)).Err; err != nil { + if err := (<-store.OAuth().RemoveAuthData(a1.Code)).Err; err != nil { t.Fatal(err) } - if err := (<-store.OAuth().GetAuthData(utils.T, a1.Code)).Err; err == nil { + if err := (<-store.OAuth().GetAuthData(a1.Code)).Err; err == nil { t.Fatal("should have errored - auth code removed") } } @@ -189,9 +188,9 @@ func TestOAuthStoreRemoveAuthDataByUser(t *testing.T) { a1.ClientId = model.NewId() a1.UserId = model.NewId() a1.Code = model.NewId() - Must(store.OAuth().SaveAuthData(utils.T, &a1)) + Must(store.OAuth().SaveAuthData(&a1)) - if err := (<-store.OAuth().PermanentDeleteAuthDataByUser(utils.T, a1.UserId)).Err; err != nil { + if err := (<-store.OAuth().PermanentDeleteAuthDataByUser(a1.UserId)).Err; err != nil { t.Fatal(err) } } -- cgit v1.2.3-1-g7c22