From 1359f7f3918befd2463103379d17bd2eb846654d Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Thu, 9 Feb 2017 13:39:15 -0800 Subject: Adding go vet from hack-a-thon (#5328) * Adding go vet to the api package * Adding go vet to app package * Adding go vet to manualtesting package * Adding go vet to the model package * Adding go vet to the store dir * Adding go vet to utils package * Adding missing dirs with go files * Fixing up makefile * Fixing up makefile * Removing root dir --- api/auto_constants.go | 20 ++++++++++---------- api/auto_environment.go | 2 +- api/auto_posts.go | 8 ++++---- api/auto_users.go | 2 +- api/command_loadtest.go | 32 ++++++++++++++++---------------- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'api') diff --git a/api/auto_constants.go b/api/auto_constants.go index f5d5dab0c..a10ae99f2 100644 --- a/api/auto_constants.go +++ b/api/auto_constants.go @@ -22,15 +22,15 @@ const ( ) var ( - TEAM_NAME_LEN = utils.Range{10, 20} - TEAM_DOMAIN_NAME_LEN = utils.Range{10, 20} - TEAM_EMAIL_LEN = utils.Range{15, 30} - USER_NAME_LEN = utils.Range{5, 20} - USER_EMAIL_LEN = utils.Range{15, 30} - CHANNEL_DISPLAY_NAME_LEN = utils.Range{10, 20} - CHANNEL_NAME_LEN = utils.Range{5, 20} - POST_MESSAGE_LEN = utils.Range{100, 400} - POST_HASHTAGS_NUM = utils.Range{5, 10} - POST_MENTIONS_NUM = utils.Range{0, 3} + TEAM_NAME_LEN = utils.Range{Begin: 10, End: 20} + TEAM_DOMAIN_NAME_LEN = utils.Range{Begin: 10, End: 20} + TEAM_EMAIL_LEN = utils.Range{Begin: 15, End: 30} + USER_NAME_LEN = utils.Range{Begin: 5, End: 20} + USER_EMAIL_LEN = utils.Range{Begin: 15, End: 30} + CHANNEL_DISPLAY_NAME_LEN = utils.Range{Begin: 10, End: 20} + CHANNEL_NAME_LEN = utils.Range{Begin: 5, End: 20} + POST_MESSAGE_LEN = utils.Range{Begin: 100, End: 400} + POST_HASHTAGS_NUM = utils.Range{Begin: 5, End: 10} + POST_MENTIONS_NUM = utils.Range{Begin: 0, End: 3} TEST_IMAGE_FILENAMES = []string{"test.png", "testjpg.jpg", "testgif.gif"} ) diff --git a/api/auto_environment.go b/api/auto_environment.go index 270b43936..6c7bc2d0a 100644 --- a/api/auto_environment.go +++ b/api/auto_environment.go @@ -84,7 +84,7 @@ func CreateTestEnvironmentInTeam(client *model.Client, team *model.Team, rangeCh numPosts := utils.RandIntFromRange(rangePosts) numImages := utils.RandIntFromRange(rangePosts) / 4 for j := 0; j < numPosts; j++ { - user := users[utils.RandIntFromRange(utils.Range{0, len(users) - 1})] + user := users[utils.RandIntFromRange(utils.Range{Begin: 0, End: len(users) - 1})] client.LoginById(user.Id, USER_PASSWORD) for i, channel := range channels { postCreator := NewAutoPostCreator(client, channel.Id) diff --git a/api/auto_posts.go b/api/auto_posts.go index 6b1207c10..bb20aadae 100644 --- a/api/auto_posts.go +++ b/api/auto_posts.go @@ -29,17 +29,17 @@ func NewAutoPostCreator(client *model.Client, channelid string) *AutoPostCreator client: client, channelid: channelid, Fuzzy: false, - TextLength: utils.Range{100, 200}, + TextLength: utils.Range{Begin: 100, End: 200}, HasImage: false, ImageFilenames: TEST_IMAGE_FILENAMES, Users: []string{}, - Mentions: utils.Range{0, 5}, - Tags: utils.Range{0, 7}, + Mentions: utils.Range{Begin: 0, End: 5}, + Tags: utils.Range{Begin: 0, End: 7}, } } func (cfg *AutoPostCreator) UploadTestFile() ([]string, bool) { - filename := cfg.ImageFilenames[utils.RandIntFromRange(utils.Range{0, len(cfg.ImageFilenames) - 1})] + filename := cfg.ImageFilenames[utils.RandIntFromRange(utils.Range{Begin: 0, End: len(cfg.ImageFilenames) - 1})] path := utils.FindDir("web/static/images") file, err := os.Open(path + "/" + filename) diff --git a/api/auto_users.go b/api/auto_users.go index f1f7b483c..d8cd8d3a3 100644 --- a/api/auto_users.go +++ b/api/auto_users.go @@ -81,7 +81,7 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) { ruser := result.Data.(*model.User) - status := &model.Status{ruser.Id, model.STATUS_ONLINE, false, model.GetMillis(), ""} + status := &model.Status{UserId: ruser.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""} if result := <-app.Srv.Store.Status().SaveOrUpdate(status); result.Err != nil { result.Err.Translate(utils.T) l4g.Error(result.Err.Error()) diff --git a/api/command_loadtest.go b/api/command_loadtest.go index 3b9ebfe47..dfbbadc3b 100644 --- a/api/command_loadtest.go +++ b/api/command_loadtest.go @@ -169,10 +169,10 @@ func (me *LoadTestProvider) SetupCommand(c *Context, channelId string, message s client.Login(BTEST_USER_EMAIL, BTEST_USER_PASSWORD) environment, err := CreateTestEnvironmentWithTeams( client, - utils.Range{numTeams, numTeams}, - utils.Range{numChannels, numChannels}, - utils.Range{numUsers, numUsers}, - utils.Range{numPosts, numPosts}, + utils.Range{Begin: numTeams, End: numTeams}, + utils.Range{Begin: numChannels, End: numChannels}, + utils.Range{Begin: numUsers, End: numUsers}, + utils.Range{Begin: numPosts, End: numPosts}, doFuzz) if err != true { return &model.CommandResponse{Text: "Failed to create testing environment", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} @@ -197,9 +197,9 @@ func (me *LoadTestProvider) SetupCommand(c *Context, channelId string, message s CreateTestEnvironmentInTeam( client, team, - utils.Range{numChannels, numChannels}, - utils.Range{numUsers, numUsers}, - utils.Range{numPosts, numPosts}, + utils.Range{Begin: numChannels, End: numChannels}, + utils.Range{Begin: numUsers, End: numUsers}, + utils.Range{Begin: numPosts, End: numPosts}, doFuzz) } @@ -217,7 +217,7 @@ func (me *LoadTestProvider) UsersCommand(c *Context, channelId string, message s usersr, err := parseRange(cmd, "") if err == false { - usersr = utils.Range{2, 5} + usersr = utils.Range{Begin: 2, End: 5} } var team *model.Team @@ -247,7 +247,7 @@ func (me *LoadTestProvider) ChannelsCommand(c *Context, channelId string, messag channelsr, err := parseRange(cmd, "") if err == false { - channelsr = utils.Range{2, 5} + channelsr = utils.Range{Begin: 2, End: 5} } var team *model.Team @@ -278,14 +278,14 @@ func (me *LoadTestProvider) PostsCommand(c *Context, channelId string, message s postsr, err := parseRange(cmd, "") if err == false { - postsr = utils.Range{20, 30} + postsr = utils.Range{Begin: 20, End: 30} } tokens := strings.Fields(cmd) - rimages := utils.Range{0, 0} + rimages := utils.Range{Begin: 0, End: 0} if len(tokens) >= 3 { if numImages, err := strconv.Atoi(tokens[2]); err == nil { - rimages = utils.Range{numImages, numImages} + rimages = utils.Range{Begin: numImages, End: numImages} } } @@ -415,18 +415,18 @@ func parseRange(command string, cmd string) (utils.Range, bool) { begin, err1 = strconv.Atoi(tokens[0]) end = begin if err1 != nil { - return utils.Range{0, 0}, false + return utils.Range{Begin: 0, End: 0}, false } case len(tokens) >= 2: begin, err1 = strconv.Atoi(tokens[0]) end, err2 = strconv.Atoi(tokens[1]) if err1 != nil || err2 != nil { - return utils.Range{0, 0}, false + return utils.Range{Begin: 0, End: 0}, false } default: - return utils.Range{0, 0}, false + return utils.Range{Begin: 0, End: 0}, false } - return utils.Range{begin, end}, true + return utils.Range{Begin: begin, End: end}, true } func contains(items []string, token string) bool { -- cgit v1.2.3-1-g7c22