From 609c8166f2602abd0c043ba09b9452788b7225ba Mon Sep 17 00:00:00 2001 From: Haardik Dharma Date: Sat, 12 Dec 2020 20:15:17 +0530 Subject: [PATCH] [MM-30911]: Change receiver name for (me *TestHelper) in app/slashcommands/helper_test.go to be more idiomatic. (#16387) Automatic Merge --- app/slashcommands/helper_test.go | 128 +++++++++++++++---------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/app/slashcommands/helper_test.go b/app/slashcommands/helper_test.go index 8301b98db6..c62e323305 100644 --- a/app/slashcommands/helper_test.go +++ b/app/slashcommands/helper_test.go @@ -144,38 +144,38 @@ var userCache struct { BasicUser2 *model.User } -func (me *TestHelper) initBasic() *TestHelper { +func (th *TestHelper) initBasic() *TestHelper { // create users once and cache them because password hashing is slow initBasicOnce.Do(func() { - me.SystemAdminUser = me.createUser() - me.App.UpdateUserRoles(me.SystemAdminUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID, false) - me.SystemAdminUser, _ = me.App.GetUser(me.SystemAdminUser.Id) - userCache.SystemAdminUser = me.SystemAdminUser.DeepCopy() + th.SystemAdminUser = th.createUser() + th.App.UpdateUserRoles(th.SystemAdminUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID, false) + th.SystemAdminUser, _ = th.App.GetUser(th.SystemAdminUser.Id) + userCache.SystemAdminUser = th.SystemAdminUser.DeepCopy() - me.BasicUser = me.createUser() - me.BasicUser, _ = me.App.GetUser(me.BasicUser.Id) - userCache.BasicUser = me.BasicUser.DeepCopy() + th.BasicUser = th.createUser() + th.BasicUser, _ = th.App.GetUser(th.BasicUser.Id) + userCache.BasicUser = th.BasicUser.DeepCopy() - me.BasicUser2 = me.createUser() - me.BasicUser2, _ = me.App.GetUser(me.BasicUser2.Id) - userCache.BasicUser2 = me.BasicUser2.DeepCopy() + th.BasicUser2 = th.createUser() + th.BasicUser2, _ = th.App.GetUser(th.BasicUser2.Id) + userCache.BasicUser2 = th.BasicUser2.DeepCopy() }) // restore cached users - me.SystemAdminUser = userCache.SystemAdminUser.DeepCopy() - me.BasicUser = userCache.BasicUser.DeepCopy() - me.BasicUser2 = userCache.BasicUser2.DeepCopy() - mainHelper.GetSQLStore().GetMaster().Insert(me.SystemAdminUser, me.BasicUser, me.BasicUser2) + th.SystemAdminUser = userCache.SystemAdminUser.DeepCopy() + th.BasicUser = userCache.BasicUser.DeepCopy() + th.BasicUser2 = userCache.BasicUser2.DeepCopy() + mainHelper.GetSQLStore().GetMaster().Insert(th.SystemAdminUser, th.BasicUser, th.BasicUser2) - me.BasicTeam = me.createTeam() + th.BasicTeam = th.createTeam() - me.linkUserToTeam(me.BasicUser, me.BasicTeam) - me.linkUserToTeam(me.BasicUser2, me.BasicTeam) - me.BasicChannel = me.CreateChannel(me.BasicTeam) - me.BasicPost = me.createPost(me.BasicChannel) - return me + th.linkUserToTeam(th.BasicUser, th.BasicTeam) + th.linkUserToTeam(th.BasicUser2, th.BasicTeam) + th.BasicChannel = th.CreateChannel(th.BasicTeam) + th.BasicPost = th.createPost(th.BasicChannel) + return th } -func (me *TestHelper) createTeam() *model.Team { +func (th *TestHelper) createTeam() *model.Team { id := model.NewId() team := &model.Team{ DisplayName: "dn_" + id, @@ -186,7 +186,7 @@ func (me *TestHelper) createTeam() *model.Team { utils.DisableDebugLogForTest() var err *model.AppError - if team, err = me.App.CreateTeam(team); err != nil { + if team, err = th.App.CreateTeam(team); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -196,15 +196,15 @@ func (me *TestHelper) createTeam() *model.Team { return team } -func (me *TestHelper) createUser() *model.User { - return me.createUserOrGuest(false) +func (th *TestHelper) createUser() *model.User { + return th.createUserOrGuest(false) } -func (me *TestHelper) createGuest() *model.User { - return me.createUserOrGuest(true) +func (th *TestHelper) createGuest() *model.User { + return th.createUserOrGuest(true) } -func (me *TestHelper) createUserOrGuest(guest bool) *model.User { +func (th *TestHelper) createUserOrGuest(guest bool) *model.User { id := model.NewId() user := &model.User{ @@ -218,14 +218,14 @@ func (me *TestHelper) createUserOrGuest(guest bool) *model.User { utils.DisableDebugLogForTest() var err *model.AppError if guest { - if user, err = me.App.CreateGuest(user); err != nil { + if user, err = th.App.CreateGuest(user); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) panic(err) } } else { - if user, err = me.App.CreateUser(user); err != nil { + if user, err = th.App.CreateUser(user); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -236,15 +236,15 @@ func (me *TestHelper) createUserOrGuest(guest bool) *model.User { return user } -func (me *TestHelper) CreateChannel(team *model.Team) *model.Channel { - return me.createChannel(team, model.CHANNEL_OPEN) +func (th *TestHelper) CreateChannel(team *model.Team) *model.Channel { + return th.createChannel(team, model.CHANNEL_OPEN) } -func (me *TestHelper) createPrivateChannel(team *model.Team) *model.Channel { - return me.createChannel(team, model.CHANNEL_PRIVATE) +func (th *TestHelper) createPrivateChannel(team *model.Team) *model.Channel { + return th.createChannel(team, model.CHANNEL_PRIVATE) } -func (me *TestHelper) createChannel(team *model.Team, channelType string) *model.Channel { +func (th *TestHelper) createChannel(team *model.Team, channelType string) *model.Channel { id := model.NewId() channel := &model.Channel{ @@ -252,12 +252,12 @@ func (me *TestHelper) createChannel(team *model.Team, channelType string) *model Name: "name_" + id, Type: channelType, TeamId: team.Id, - CreatorId: me.BasicUser.Id, + CreatorId: th.BasicUser.Id, } utils.DisableDebugLogForTest() var err *model.AppError - if channel, err = me.App.CreateChannel(channel, true); err != nil { + if channel, err = th.App.CreateChannel(channel, true); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -267,7 +267,7 @@ func (me *TestHelper) createChannel(team *model.Team, channelType string) *model return channel } -func (me *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType, userId string) *model.Channel { +func (th *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType, userId string) *model.Channel { id := model.NewId() channel := &model.Channel{ @@ -280,7 +280,7 @@ func (me *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType utils.DisableDebugLogForTest() var err *model.AppError - if channel, err = me.App.CreateChannel(channel, true); err != nil { + if channel, err = th.App.CreateChannel(channel, true); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -290,11 +290,11 @@ func (me *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType return channel } -func (me *TestHelper) createDmChannel(user *model.User) *model.Channel { +func (th *TestHelper) createDmChannel(user *model.User) *model.Channel { utils.DisableDebugLogForTest() var err *model.AppError var channel *model.Channel - if channel, err = me.App.GetOrCreateDirectChannel(me.BasicUser.Id, user.Id); err != nil { + if channel, err = th.App.GetOrCreateDirectChannel(th.BasicUser.Id, user.Id); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -304,11 +304,11 @@ func (me *TestHelper) createDmChannel(user *model.User) *model.Channel { return channel } -func (me *TestHelper) createGroupChannel(user1 *model.User, user2 *model.User) *model.Channel { +func (th *TestHelper) createGroupChannel(user1 *model.User, user2 *model.User) *model.Channel { utils.DisableDebugLogForTest() var err *model.AppError var channel *model.Channel - if channel, err = me.App.CreateGroupChannel([]string{me.BasicUser.Id, user1.Id, user2.Id}, me.BasicUser.Id); err != nil { + if channel, err = th.App.CreateGroupChannel([]string{th.BasicUser.Id, user1.Id, user2.Id}, th.BasicUser.Id); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -318,11 +318,11 @@ func (me *TestHelper) createGroupChannel(user1 *model.User, user2 *model.User) * return channel } -func (me *TestHelper) createPost(channel *model.Channel) *model.Post { +func (th *TestHelper) createPost(channel *model.Channel) *model.Post { id := model.NewId() post := &model.Post{ - UserId: me.BasicUser.Id, + UserId: th.BasicUser.Id, ChannelId: channel.Id, Message: "message_" + id, CreateAt: model.GetMillis() - 10000, @@ -330,7 +330,7 @@ func (me *TestHelper) createPost(channel *model.Channel) *model.Post { utils.DisableDebugLogForTest() var err *model.AppError - if post, err = me.App.CreatePost(post, channel, false, true); err != nil { + if post, err = th.App.CreatePost(post, channel, false, true); err != nil { mlog.Error(err.Error()) time.Sleep(time.Second) @@ -340,10 +340,10 @@ func (me *TestHelper) createPost(channel *model.Channel) *model.Post { return post } -func (me *TestHelper) linkUserToTeam(user *model.User, team *model.Team) { +func (th *TestHelper) linkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := me.App.JoinUserToTeam(team, user, "") + err := th.App.JoinUserToTeam(team, user, "") if err != nil { mlog.Error(err.Error()) @@ -354,10 +354,10 @@ func (me *TestHelper) linkUserToTeam(user *model.User, team *model.Team) { utils.EnableDebugLogForTest() } -func (me *TestHelper) addUserToChannel(user *model.User, channel *model.Channel) *model.ChannelMember { +func (th *TestHelper) addUserToChannel(user *model.User, channel *model.Channel) *model.ChannelMember { utils.DisableDebugLogForTest() - member, err := me.App.AddUserToChannel(user, channel) + member, err := th.App.AddUserToChannel(user, channel) if err != nil { mlog.Error(err.Error()) @@ -370,10 +370,10 @@ func (me *TestHelper) addUserToChannel(user *model.User, channel *model.Channel) return member } -func (me *TestHelper) shutdownApp() { +func (th *TestHelper) shutdownApp() { done := make(chan bool) go func() { - me.Server.Shutdown() + th.Server.Shutdown() close(done) }() @@ -386,21 +386,21 @@ func (me *TestHelper) shutdownApp() { } } -func (me *TestHelper) tearDown() { - if me.IncludeCacheLayer { +func (th *TestHelper) tearDown() { + if th.IncludeCacheLayer { // Clean all the caches - me.App.Srv().InvalidateAllCaches() + th.App.Srv().InvalidateAllCaches() } - me.shutdownApp() - if me.tempWorkspace != "" { - os.RemoveAll(me.tempWorkspace) + th.shutdownApp() + if th.tempWorkspace != "" { + os.RemoveAll(th.tempWorkspace) } } -func (me *TestHelper) removePermissionFromRole(permission string, roleName string) { +func (th *TestHelper) removePermissionFromRole(permission string, roleName string) { utils.DisableDebugLogForTest() - role, err1 := me.App.GetRoleByName(roleName) + role, err1 := th.App.GetRoleByName(roleName) if err1 != nil { utils.EnableDebugLogForTest() panic(err1) @@ -420,7 +420,7 @@ func (me *TestHelper) removePermissionFromRole(permission string, roleName strin role.Permissions = newPermissions - _, err2 := me.App.UpdateRole(role) + _, err2 := th.App.UpdateRole(role) if err2 != nil { utils.EnableDebugLogForTest() panic(err2) @@ -429,10 +429,10 @@ func (me *TestHelper) removePermissionFromRole(permission string, roleName strin utils.EnableDebugLogForTest() } -func (me *TestHelper) addPermissionToRole(permission string, roleName string) { +func (th *TestHelper) addPermissionToRole(permission string, roleName string) { utils.DisableDebugLogForTest() - role, err1 := me.App.GetRoleByName(roleName) + role, err1 := th.App.GetRoleByName(roleName) if err1 != nil { utils.EnableDebugLogForTest() panic(err1) @@ -447,7 +447,7 @@ func (me *TestHelper) addPermissionToRole(permission string, roleName string) { role.Permissions = append(role.Permissions, permission) - _, err2 := me.App.UpdateRole(role) + _, err2 := th.App.UpdateRole(role) if err2 != nil { utils.EnableDebugLogForTest() panic(err2)