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_preference_store_test.go | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'store/sql_preference_store_test.go') diff --git a/store/sql_preference_store_test.go b/store/sql_preference_store_test.go index c93831b37..ec9d1df6c 100644 --- a/store/sql_preference_store_test.go +++ b/store/sql_preference_store_test.go @@ -5,7 +5,6 @@ package store import ( "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" "testing" ) @@ -28,24 +27,24 @@ func TestPreferenceSave(t *testing.T) { Value: "value1b", }, } - if count := Must(store.Preference().Save(utils.T, &preferences)); count != 2 { + if count := Must(store.Preference().Save(&preferences)); count != 2 { t.Fatal("got incorrect number of rows saved") } for _, preference := range preferences { - if data := Must(store.Preference().Get(utils.T, preference.UserId, preference.Category, preference.Name)).(model.Preference); preference != data { + if data := Must(store.Preference().Get(preference.UserId, preference.Category, preference.Name)).(model.Preference); preference != data { t.Fatal("got incorrect preference after first Save") } } preferences[0].Value = "value2a" preferences[1].Value = "value2b" - if count := Must(store.Preference().Save(utils.T, &preferences)); count != 2 { + if count := Must(store.Preference().Save(&preferences)); count != 2 { t.Fatal("got incorrect number of rows saved") } for _, preference := range preferences { - if data := Must(store.Preference().Get(utils.T, preference.UserId, preference.Category, preference.Name)).(model.Preference); preference != data { + if data := Must(store.Preference().Get(preference.UserId, preference.Category, preference.Name)).(model.Preference); preference != data { t.Fatal("got incorrect preference after second Save") } } @@ -81,16 +80,16 @@ func TestPreferenceGet(t *testing.T) { }, } - Must(store.Preference().Save(utils.T, &preferences)) + Must(store.Preference().Save(&preferences)) - if result := <-store.Preference().Get(utils.T, userId, category, name); result.Err != nil { + if result := <-store.Preference().Get(userId, category, name); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(model.Preference); data != preferences[0] { t.Fatal("got incorrect preference") } // make sure getting a missing preference fails - if result := <-store.Preference().Get(utils.T, model.NewId(), model.NewId(), model.NewId()); result.Err == nil { + if result := <-store.Preference().Get(model.NewId(), model.NewId(), model.NewId()); result.Err == nil { t.Fatal("no error on getting a missing preference") } } @@ -128,9 +127,9 @@ func TestPreferenceGetCategory(t *testing.T) { }, } - Must(store.Preference().Save(utils.T, &preferences)) + Must(store.Preference().Save(&preferences)) - if result := <-store.Preference().GetCategory(utils.T, userId, category); result.Err != nil { + if result := <-store.Preference().GetCategory(userId, category); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(model.Preferences); len(data) != 2 { t.Fatal("got the wrong number of preferences") @@ -139,7 +138,7 @@ func TestPreferenceGetCategory(t *testing.T) { } // make sure getting a missing preference category doesn't fail - if result := <-store.Preference().GetCategory(utils.T, model.NewId(), model.NewId()); result.Err != nil { + if result := <-store.Preference().GetCategory(model.NewId(), model.NewId()); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(model.Preferences); len(data) != 0 { t.Fatal("shouldn't have got any preferences") @@ -179,9 +178,9 @@ func TestPreferenceGetAll(t *testing.T) { }, } - Must(store.Preference().Save(utils.T, &preferences)) + Must(store.Preference().Save(&preferences)) - if result := <-store.Preference().GetAll(utils.T, userId); result.Err != nil { + if result := <-store.Preference().GetAll(userId); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(model.Preferences); len(data) != 3 { t.Fatal("got the wrong number of preferences") @@ -227,9 +226,9 @@ func TestPreferenceDelete(t *testing.T) { }, } - Must(store.Preference().Save(utils.T, &preferences)) + Must(store.Preference().Save(&preferences)) - if result := <-store.Preference().PermanentDeleteByUser(utils.T, userId); result.Err != nil { + if result := <-store.Preference().PermanentDeleteByUser(userId); result.Err != nil { t.Fatal(result.Err) } } @@ -277,29 +276,29 @@ func TestIsFeatureEnabled(t *testing.T) { }, } - Must(store.Preference().Save(utils.T, &features)) + Must(store.Preference().Save(&features)) - if result := <-store.Preference().IsFeatureEnabled(utils.T, feature1, userId); result.Err != nil { + if result := <-store.Preference().IsFeatureEnabled(feature1, userId); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(bool); data != true { t.Fatalf("got incorrect setting for feature1, %v=%v", true, data) } - if result := <-store.Preference().IsFeatureEnabled(utils.T, feature2, userId); result.Err != nil { + if result := <-store.Preference().IsFeatureEnabled(feature2, userId); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(bool); data != false { t.Fatalf("got incorrect setting for feature2, %v=%v", false, data) } // make sure we get false if something different than "true" or "false" has been saved to database - if result := <-store.Preference().IsFeatureEnabled(utils.T, feature3, userId); result.Err != nil { + if result := <-store.Preference().IsFeatureEnabled(feature3, userId); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(bool); data != false { t.Fatalf("got incorrect setting for feature3, %v=%v", false, data) } // make sure false is returned if a non-existent feature is queried - if result := <-store.Preference().IsFeatureEnabled(utils.T, "someOtherFeature", userId); result.Err != nil { + if result := <-store.Preference().IsFeatureEnabled("someOtherFeature", userId); result.Err != nil { t.Fatal(result.Err) } else if data := result.Data.(bool); data != false { t.Fatalf("got incorrect setting for non-existent feature 'someOtherFeature', %v=%v", false, data) @@ -342,9 +341,9 @@ func TestDeleteUnusedFeatures(t *testing.T) { }, } - Must(store.Preference().Save(utils.T, &features)) + Must(store.Preference().Save(&features)) - store.(*SqlStore).preference.(*SqlPreferenceStore).DeleteUnusedFeatures(utils.T) + store.(*SqlStore).preference.(*SqlPreferenceStore).DeleteUnusedFeatures() //make sure features with value "false" have actually been deleted from the database if val, err := store.(*SqlStore).preference.(*SqlPreferenceStore).GetReplica().SelectInt(`SELECT COUNT(*) -- cgit v1.2.3-1-g7c22