Skip to content

Commit 33e8e82

Browse files
TheFox0x7TheFox0x7
authored
Enable tenv and testifylint rules (#32852)
Enables tenv and testifylint linters closes: #32842
1 parent df9a78c commit 33e8e82

File tree

113 files changed

+272
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+272
-282
lines changed

‎.golangci.yml

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ linters:
1919
- revive
2020
- staticcheck
2121
- stylecheck
22+
- tenv
23+
- testifylint
2224
- typecheck
2325
- unconvert
2426
- unused
@@ -34,6 +36,10 @@ output:
3436
show-stats: true
3537

3638
linters-settings:
39+
testifylint:
40+
disable:
41+
- go-require
42+
- require-error
3743
stylecheck:
3844
checks: ["all", "-ST1005", "-ST1003"]
3945
nakedret:

‎models/actions/runner_token_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestGetLatestRunnerToken(t *testing.T) {
1717
token := unittest.AssertExistsAndLoadBean(t, &ActionRunnerToken{ID: 3})
1818
expectedToken, err := GetLatestRunnerToken(db.DefaultContext, 1, 0)
1919
assert.NoError(t, err)
20-
assert.EqualValues(t, token, expectedToken)
20+
assert.EqualValues(t, expectedToken, token)
2121
}
2222

2323
func TestNewRunnerToken(t *testing.T) {
@@ -26,7 +26,7 @@ func TestNewRunnerToken(t *testing.T) {
2626
assert.NoError(t, err)
2727
expectedToken, err := GetLatestRunnerToken(db.DefaultContext, 1, 0)
2828
assert.NoError(t, err)
29-
assert.EqualValues(t, token, expectedToken)
29+
assert.EqualValues(t, expectedToken, token)
3030
}
3131

3232
func TestUpdateRunnerToken(t *testing.T) {
@@ -36,5 +36,5 @@ func TestUpdateRunnerToken(t *testing.T) {
3636
assert.NoError(t, UpdateRunnerToken(db.DefaultContext, token))
3737
expectedToken, err := GetLatestRunnerToken(db.DefaultContext, 1, 0)
3838
assert.NoError(t, err)
39-
assert.EqualValues(t, token, expectedToken)
39+
assert.EqualValues(t, expectedToken, token)
4040
}

‎models/activities/user_heatmap_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package activities_test
55

66
import (
7-
"fmt"
87
"testing"
98
"time"
109

@@ -91,11 +90,11 @@ func TestGetUserHeatmapDataByUser(t *testing.T) {
9190
assert.NoError(t, err)
9291
assert.Len(t, actions, contributions, "invalid action count: did the test data became too old?")
9392
assert.Equal(t, count, int64(contributions))
94-
assert.Equal(t, tc.CountResult, contributions, fmt.Sprintf("testcase '%s'", tc.desc))
93+
assert.Equal(t, tc.CountResult, contributions, "testcase '%s'", tc.desc)
9594

9695
// Test JSON rendering
9796
jsonData, err := json.Marshal(heatmap)
9897
assert.NoError(t, err)
99-
assert.Equal(t, tc.JSONResult, string(jsonData))
98+
assert.JSONEq(t, tc.JSONResult, string(jsonData))
10099
}
101100
}

‎models/auth/oauth2_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestOAuth2Application_GenerateClientSecret(t *testing.T) {
1818
app := unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: 1})
1919
secret, err := app.GenerateClientSecret(db.DefaultContext)
2020
assert.NoError(t, err)
21-
assert.True(t, len(secret) > 0)
21+
assert.NotEmpty(t, secret)
2222
unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: 1, ClientSecret: app.ClientSecret})
2323
}
2424

@@ -165,7 +165,7 @@ func TestOAuth2Grant_GenerateNewAuthorizationCode(t *testing.T) {
165165
code, err := grant.GenerateNewAuthorizationCode(db.DefaultContext, "https://example2.com/callback", "CjvyTLSdR47G5zYenDA-eDWW4lRrO8yvjcWwbD_deOg", "S256")
166166
assert.NoError(t, err)
167167
assert.NotNil(t, code)
168-
assert.True(t, len(code.Code) > 32) // secret length > 32
168+
assert.Greater(t, len(code.Code), 32) // secret length > 32
169169
}
170170

171171
func TestOAuth2Grant_TableName(t *testing.T) {

‎models/db/iterate_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ func TestIterate(t *testing.T) {
3838
if !has {
3939
return db.ErrNotExist{Resource: "repo_unit", ID: repoUnit.ID}
4040
}
41-
assert.EqualValues(t, repoUnit.RepoID, repoUnit.RepoID)
42-
assert.EqualValues(t, repoUnit.CreatedUnix, repoUnit.CreatedUnix)
4341
return nil
4442
})
4543
assert.NoError(t, err)

‎models/git/commit_status_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestGetCommitStatuses(t *testing.T) {
3434
SHA: sha1,
3535
})
3636
assert.NoError(t, err)
37-
assert.Equal(t, int(maxResults), 5)
37+
assert.Equal(t, 5, int(maxResults))
3838
assert.Len(t, statuses, 5)
3939

4040
assert.Equal(t, "ci/awesomeness", statuses[0].Context)
@@ -63,7 +63,7 @@ func TestGetCommitStatuses(t *testing.T) {
6363
SHA: sha1,
6464
})
6565
assert.NoError(t, err)
66-
assert.Equal(t, int(maxResults), 5)
66+
assert.Equal(t, 5, int(maxResults))
6767
assert.Empty(t, statuses)
6868
}
6969

‎models/git/protected_branch_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package git
55

66
import (
7-
"fmt"
87
"testing"
98

109
"code.gitea.io/gitea/models/db"
@@ -76,7 +75,7 @@ func TestBranchRuleMatch(t *testing.T) {
7675
infact = " not"
7776
}
7877
assert.EqualValues(t, kase.ExpectedMatch, pb.Match(kase.BranchName),
79-
fmt.Sprintf("%s should%s match %s but it is%s", kase.BranchName, should, kase.Rule, infact),
78+
"%s should%s match %s but it is%s", kase.BranchName, should, kase.Rule, infact,
8079
)
8180
}
8281
}

‎models/issues/comment_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestFetchCodeComments(t *testing.T) {
6464
}
6565

6666
func TestAsCommentType(t *testing.T) {
67-
assert.Equal(t, issues_model.CommentType(0), issues_model.CommentTypeComment)
67+
assert.Equal(t, issues_model.CommentTypeComment, issues_model.CommentType(0))
6868
assert.Equal(t, issues_model.CommentTypeUndefined, issues_model.AsCommentType(""))
6969
assert.Equal(t, issues_model.CommentTypeUndefined, issues_model.AsCommentType("nonsense"))
7070
assert.Equal(t, issues_model.CommentTypeComment, issues_model.AsCommentType("comment"))

‎models/issues/issue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ func assertCreateIssues(t *testing.T, isPull bool) {
434434
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
435435
label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
436436
milestone := unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1})
437-
assert.EqualValues(t, milestone.ID, 1)
437+
assert.EqualValues(t, 1, milestone.ID)
438438
reaction := &issues_model.Reaction{
439439
Type: "heart",
440440
UserID: owner.ID,

‎models/issues/issue_watch_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ func TestGetIssueWatchers(t *testing.T) {
4848
iws, err := issues_model.GetIssueWatchers(db.DefaultContext, 1, db.ListOptions{})
4949
assert.NoError(t, err)
5050
// Watcher is inactive, thus 0
51-
assert.Len(t, iws, 0)
51+
assert.Empty(t, iws)
5252

5353
iws, err = issues_model.GetIssueWatchers(db.DefaultContext, 2, db.ListOptions{})
5454
assert.NoError(t, err)
5555
// Watcher is explicit not watching
56-
assert.Len(t, iws, 0)
56+
assert.Empty(t, iws)
5757

5858
iws, err = issues_model.GetIssueWatchers(db.DefaultContext, 5, db.ListOptions{})
5959
assert.NoError(t, err)
6060
// Issue has no Watchers
61-
assert.Len(t, iws, 0)
61+
assert.Empty(t, iws)
6262

6363
iws, err = issues_model.GetIssueWatchers(db.DefaultContext, 7, db.ListOptions{})
6464
assert.NoError(t, err)

‎models/issues/label_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ func TestLabel_LoadSelectedLabelsAfterClick(t *testing.T) {
3131
// First test : with negative and scope
3232
label.LoadSelectedLabelsAfterClick([]int64{1, -8}, []string{"", "scope"})
3333
assert.Equal(t, "1", label.QueryString)
34-
assert.Equal(t, true, label.IsSelected)
34+
assert.True(t, label.IsSelected)
3535

3636
// Second test : with duplicates
3737
label.LoadSelectedLabelsAfterClick([]int64{1, 7, 1, 7, 7}, []string{"", "scope", "", "scope", "scope"})
3838
assert.Equal(t, "1,8", label.QueryString)
39-
assert.Equal(t, false, label.IsSelected)
39+
assert.False(t, label.IsSelected)
4040

4141
// Third test : empty set
4242
label.LoadSelectedLabelsAfterClick([]int64{}, []string{})
@@ -248,7 +248,7 @@ func TestGetLabelsByIssueID(t *testing.T) {
248248

249249
labels, err = issues_model.GetLabelsByIssueID(db.DefaultContext, unittest.NonexistentID)
250250
assert.NoError(t, err)
251-
assert.Len(t, labels, 0)
251+
assert.Empty(t, labels)
252252
}
253253

254254
func TestUpdateLabel(t *testing.T) {
@@ -271,7 +271,7 @@ func TestUpdateLabel(t *testing.T) {
271271
assert.EqualValues(t, label.Color, newLabel.Color)
272272
assert.EqualValues(t, label.Name, newLabel.Name)
273273
assert.EqualValues(t, label.Description, newLabel.Description)
274-
assert.EqualValues(t, newLabel.ArchivedUnix, 0)
274+
assert.EqualValues(t, 0, newLabel.ArchivedUnix)
275275
unittest.CheckConsistencyFor(t, &issues_model.Label{}, &repo_model.Repository{})
276276
}
277277

‎models/issues/milestone_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestGetMilestonesByRepoID(t *testing.T) {
8787
IsClosed: optional.Some(false),
8888
})
8989
assert.NoError(t, err)
90-
assert.Len(t, milestones, 0)
90+
assert.Empty(t, milestones)
9191
}
9292

9393
func TestGetMilestones(t *testing.T) {

‎models/issues/pull_list_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestPullRequestList_LoadReviewCommentsCounts(t *testing.T) {
4040
assert.NoError(t, err)
4141
assert.Len(t, reviewComments, 2)
4242
for _, pr := range prs {
43-
assert.EqualValues(t, reviewComments[pr.IssueID], 1)
43+
assert.EqualValues(t, 1, reviewComments[pr.IssueID])
4444
}
4545
}
4646

‎models/issues/pull_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestLoadRequestedReviewers(t *testing.T) {
8383
assert.NoError(t, pull.LoadIssue(db.DefaultContext))
8484
issue := pull.Issue
8585
assert.NoError(t, issue.LoadRepo(db.DefaultContext))
86-
assert.Len(t, pull.RequestedReviewers, 0)
86+
assert.Empty(t, pull.RequestedReviewers)
8787

8888
user1, err := user_model.GetUserByID(db.DefaultContext, 1)
8989
assert.NoError(t, err)

‎models/issues/stopwatch_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestCancelStopwatch(t *testing.T) {
3232

3333
_ = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{Type: issues_model.CommentTypeCancelTracking, PosterID: user1.ID, IssueID: issue1.ID})
3434

35-
assert.Nil(t, issues_model.CancelStopwatch(db.DefaultContext, user1, issue2))
35+
assert.NoError(t, issues_model.CancelStopwatch(db.DefaultContext, user1, issue2))
3636
}
3737

3838
func TestStopwatchExists(t *testing.T) {

‎models/issues/tracked_time_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestGetTrackedTimes(t *testing.T) {
5050

5151
times, err = issues_model.GetTrackedTimes(db.DefaultContext, &issues_model.FindTrackedTimesOptions{IssueID: -1})
5252
assert.NoError(t, err)
53-
assert.Len(t, times, 0)
53+
assert.Empty(t, times)
5454

5555
// by User
5656
times, err = issues_model.GetTrackedTimes(db.DefaultContext, &issues_model.FindTrackedTimesOptions{UserID: 1})
@@ -60,7 +60,7 @@ func TestGetTrackedTimes(t *testing.T) {
6060

6161
times, err = issues_model.GetTrackedTimes(db.DefaultContext, &issues_model.FindTrackedTimesOptions{UserID: 3})
6262
assert.NoError(t, err)
63-
assert.Len(t, times, 0)
63+
assert.Empty(t, times)
6464

6565
// by Repo
6666
times, err = issues_model.GetTrackedTimes(db.DefaultContext, &issues_model.FindTrackedTimesOptions{RepositoryID: 2})
@@ -69,15 +69,15 @@ func TestGetTrackedTimes(t *testing.T) {
6969
assert.Equal(t, int64(1), times[0].Time)
7070
issue, err := issues_model.GetIssueByID(db.DefaultContext, times[0].IssueID)
7171
assert.NoError(t, err)
72-
assert.Equal(t, issue.RepoID, int64(2))
72+
assert.Equal(t, int64(2), issue.RepoID)
7373

7474
times, err = issues_model.GetTrackedTimes(db.DefaultContext, &issues_model.FindTrackedTimesOptions{RepositoryID: 1})
7575
assert.NoError(t, err)
7676
assert.Len(t, times, 5)
7777

7878
times, err = issues_model.GetTrackedTimes(db.DefaultContext, &issues_model.FindTrackedTimesOptions{RepositoryID: 10})
7979
assert.NoError(t, err)
80-
assert.Len(t, times, 0)
80+
assert.Empty(t, times)
8181
}
8282

8383
func TestTotalTimesForEachUser(t *testing.T) {

‎models/migrations/v1_16/v193_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func Test_AddRepoIDForAttachment(t *testing.T) {
5656
err := x.Table("attachment").Where("issue_id > 0").Find(&issueAttachments)
5757
assert.NoError(t, err)
5858
for _, attach := range issueAttachments {
59-
assert.Greater(t, attach.RepoID, int64(0))
60-
assert.Greater(t, attach.IssueID, int64(0))
59+
assert.Positive(t, attach.RepoID)
60+
assert.Positive(t, attach.IssueID)
6161
var issue Issue
6262
has, err := x.ID(attach.IssueID).Get(&issue)
6363
assert.NoError(t, err)
@@ -69,8 +69,8 @@ func Test_AddRepoIDForAttachment(t *testing.T) {
6969
err = x.Table("attachment").Where("release_id > 0").Find(&releaseAttachments)
7070
assert.NoError(t, err)
7171
for _, attach := range releaseAttachments {
72-
assert.Greater(t, attach.RepoID, int64(0))
73-
assert.Greater(t, attach.ReleaseID, int64(0))
72+
assert.Positive(t, attach.RepoID)
73+
assert.Positive(t, attach.ReleaseID)
7474
var release Release
7575
has, err := x.ID(attach.ReleaseID).Get(&release)
7676
assert.NoError(t, err)

‎models/migrations/v1_22/v286_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ func Test_RepositoryFormat(t *testing.T) {
107107
repo = new(Repository)
108108
ok, err := x.ID(2).Get(repo)
109109
assert.NoError(t, err)
110-
assert.EqualValues(t, true, ok)
110+
assert.True(t, ok)
111111
assert.EqualValues(t, "sha1", repo.ObjectFormatName)
112112

113113
repo = new(Repository)
114114
ok, err = x.ID(id).Get(repo)
115115
assert.NoError(t, err)
116-
assert.EqualValues(t, true, ok)
116+
assert.True(t, ok)
117117
assert.EqualValues(t, "sha256", repo.ObjectFormatName)
118118
}

‎models/migrations/v1_22/v294_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func Test_AddUniqueIndexForProjectIssue(t *testing.T) {
3939

4040
tables, err := x.DBMetas()
4141
assert.NoError(t, err)
42-
assert.EqualValues(t, 1, len(tables))
42+
assert.Len(t, tables, 1)
4343
found := false
4444
for _, index := range tables[0].Indexes {
4545
if index.Type == schemas.UniqueType {

‎models/organization/org_list_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestFindOrgs(t *testing.T) {
4040
IncludePrivate: false,
4141
})
4242
assert.NoError(t, err)
43-
assert.Len(t, orgs, 0)
43+
assert.Empty(t, orgs)
4444

4545
total, err := db.Count[organization.Organization](db.DefaultContext, organization.FindOrgOptions{
4646
UserID: 4,

‎models/organization/org_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func TestGetOrgUsersByOrgID(t *testing.T) {
283283
OrgID: unittest.NonexistentID,
284284
})
285285
assert.NoError(t, err)
286-
assert.Len(t, orgUsers, 0)
286+
assert.Empty(t, orgUsers)
287287
}
288288

289289
func TestChangeOrgUserStatus(t *testing.T) {

‎models/perm/access_mode_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestAccessMode(t *testing.T) {
1515
m := ParseAccessMode(name)
1616
assert.Equal(t, AccessMode(i), m)
1717
}
18-
assert.Equal(t, AccessMode(4), AccessModeOwner)
18+
assert.Equal(t, AccessModeOwner, AccessMode(4))
1919
assert.Equal(t, "owner", AccessModeOwner.ToString())
2020
assert.Equal(t, AccessModeNone, ParseAccessMode("owner"))
2121
assert.Equal(t, AccessModeNone, ParseAccessMode("invalid"))

‎models/project/column_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package project
55

66
import (
77
"fmt"
8-
"strings"
98
"testing"
109

1110
"code.gitea.io/gitea/models/db"
@@ -66,7 +65,7 @@ func Test_moveIssuesToAnotherColumn(t *testing.T) {
6665

6766
issues, err = column1.GetIssues(db.DefaultContext)
6867
assert.NoError(t, err)
69-
assert.Len(t, issues, 0)
68+
assert.Empty(t, issues)
7069

7170
issues, err = column2.GetIssues(db.DefaultContext)
7271
assert.NoError(t, err)
@@ -123,5 +122,5 @@ func Test_NewColumn(t *testing.T) {
123122
ProjectID: project1.ID,
124123
})
125124
assert.Error(t, err)
126-
assert.True(t, strings.Contains(err.Error(), "maximum number of columns reached"))
125+
assert.Contains(t, err.Error(), "maximum number of columns reached")
127126
}

0 commit comments

Comments
 (0)