Skip to content

Commit 3607f79

Browse files
KN4CK3RKN4CK3R
authored
Fixed assert statements. (#16089)
1 parent 51775f6 commit 3607f79

Some content is hidden

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

56 files changed

+227
-228
lines changed

‎integrations/api_admin_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func TestAPIEditUser(t *testing.T) {
195195
assert.EqualValues(t, "email is not allowed to be empty string", errMap["message"].(string))
196196

197197
user2 := models.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
198-
assert.Equal(t, false, user2.IsRestricted)
198+
assert.False(t, user2.IsRestricted)
199199
bTrue := true
200200
req = NewRequestWithJSON(t, "PATCH", urlStr, api.EditUserOption{
201201
// required
@@ -206,5 +206,5 @@ func TestAPIEditUser(t *testing.T) {
206206
})
207207
session.MakeRequest(t, req, http.StatusOK)
208208
user2 = models.AssertExistsAndLoadBean(t, &models.User{LoginName: "user2"}).(*models.User)
209-
assert.Equal(t, true, user2.IsRestricted)
209+
assert.True(t, user2.IsRestricted)
210210
}

‎integrations/api_gpg_keys_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,42 +78,42 @@ func TestGPGKeys(t *testing.T) {
7878

7979
primaryKey1 := keys[0] //Primary key 1
8080
assert.EqualValues(t, "38EA3BCED732982C", primaryKey1.KeyID)
81-
assert.EqualValues(t, 1, len(primaryKey1.Emails))
81+
assert.Len(t, primaryKey1.Emails, 1)
8282
assert.EqualValues(t, "[email protected]", primaryKey1.Emails[0].Email)
83-
assert.EqualValues(t, true, primaryKey1.Emails[0].Verified)
83+
assert.True(t, primaryKey1.Emails[0].Verified)
8484

8585
subKey := primaryKey1.SubsKey[0] //Subkey of 38EA3BCED732982C
8686
assert.EqualValues(t, "70D7C694D17D03AD", subKey.KeyID)
87-
assert.EqualValues(t, 0, len(subKey.Emails))
87+
assert.Empty(t, subKey.Emails)
8888

8989
primaryKey2 := keys[1] //Primary key 2
9090
assert.EqualValues(t, "FABF39739FE1E927", primaryKey2.KeyID)
91-
assert.EqualValues(t, 1, len(primaryKey2.Emails))
91+
assert.Len(t, primaryKey2.Emails, 1)
9292
assert.EqualValues(t, "[email protected]", primaryKey2.Emails[0].Email)
93-
assert.EqualValues(t, false, primaryKey2.Emails[0].Verified)
93+
assert.False(t, primaryKey2.Emails[0].Verified)
9494

9595
var key api.GPGKey
9696
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey1.ID, 10)+"?token="+token) //Primary key 1
9797
resp = session.MakeRequest(t, req, http.StatusOK)
9898
DecodeJSON(t, resp, &key)
9999
assert.EqualValues(t, "38EA3BCED732982C", key.KeyID)
100-
assert.EqualValues(t, 1, len(key.Emails))
100+
assert.Len(t, key.Emails, 1)
101101
assert.EqualValues(t, "[email protected]", key.Emails[0].Email)
102-
assert.EqualValues(t, true, key.Emails[0].Verified)
102+
assert.True(t, key.Emails[0].Verified)
103103

104104
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(subKey.ID, 10)+"?token="+token) //Subkey of 38EA3BCED732982C
105105
resp = session.MakeRequest(t, req, http.StatusOK)
106106
DecodeJSON(t, resp, &key)
107107
assert.EqualValues(t, "70D7C694D17D03AD", key.KeyID)
108-
assert.EqualValues(t, 0, len(key.Emails))
108+
assert.Empty(t, key.Emails)
109109

110110
req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(primaryKey2.ID, 10)+"?token="+token) //Primary key 2
111111
resp = session.MakeRequest(t, req, http.StatusOK)
112112
DecodeJSON(t, resp, &key)
113113
assert.EqualValues(t, "FABF39739FE1E927", key.KeyID)
114-
assert.EqualValues(t, 1, len(key.Emails))
114+
assert.Len(t, key.Emails, 1)
115115
assert.EqualValues(t, "[email protected]", key.Emails[0].Email)
116-
assert.EqualValues(t, false, key.Emails[0].Verified)
116+
assert.False(t, key.Emails[0].Verified)
117117

118118
})
119119

@@ -124,23 +124,23 @@ func TestGPGKeys(t *testing.T) {
124124
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/not-signed?token="+token)
125125
resp := session.MakeRequest(t, req, http.StatusOK)
126126
DecodeJSON(t, resp, &branch)
127-
assert.EqualValues(t, false, branch.Commit.Verification.Verified)
127+
assert.False(t, branch.Commit.Verification.Verified)
128128
})
129129

130130
t.Run("SignedWithNotValidatedEmail", func(t *testing.T) {
131131
var branch api.Branch
132132
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign-not-yet-validated?token="+token)
133133
resp := session.MakeRequest(t, req, http.StatusOK)
134134
DecodeJSON(t, resp, &branch)
135-
assert.EqualValues(t, false, branch.Commit.Verification.Verified)
135+
assert.False(t, branch.Commit.Verification.Verified)
136136
})
137137

138138
t.Run("SignedWithValidEmail", func(t *testing.T) {
139139
var branch api.Branch
140140
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/branches/good-sign?token="+token)
141141
resp := session.MakeRequest(t, req, http.StatusOK)
142142
DecodeJSON(t, resp, &branch)
143-
assert.EqualValues(t, true, branch.Commit.Verification.Verified)
143+
assert.True(t, branch.Commit.Verification.Verified)
144144
})
145145
})
146146
}

‎integrations/api_issue_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ func TestAPICreateIssue(t *testing.T) {
6565
resp := session.MakeRequest(t, req, http.StatusCreated)
6666
var apiIssue api.Issue
6767
DecodeJSON(t, resp, &apiIssue)
68-
assert.Equal(t, apiIssue.Body, body)
69-
assert.Equal(t, apiIssue.Title, title)
68+
assert.Equal(t, body, apiIssue.Body)
69+
assert.Equal(t, title, apiIssue.Title)
7070

7171
models.AssertExistsAndLoadBean(t, &models.Issue{
7272
RepoID: repoBefore.ID,

‎integrations/api_notification_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ func TestAPINotification(t *testing.T) {
4545

4646
assert.Len(t, apiNL, 3)
4747
assert.EqualValues(t, 4, apiNL[0].ID)
48-
assert.EqualValues(t, true, apiNL[0].Unread)
49-
assert.EqualValues(t, false, apiNL[0].Pinned)
48+
assert.True(t, apiNL[0].Unread)
49+
assert.False(t, apiNL[0].Pinned)
5050
assert.EqualValues(t, 3, apiNL[1].ID)
51-
assert.EqualValues(t, false, apiNL[1].Unread)
52-
assert.EqualValues(t, true, apiNL[1].Pinned)
51+
assert.False(t, apiNL[1].Unread)
52+
assert.True(t, apiNL[1].Pinned)
5353
assert.EqualValues(t, 2, apiNL[2].ID)
54-
assert.EqualValues(t, false, apiNL[2].Unread)
55-
assert.EqualValues(t, false, apiNL[2].Pinned)
54+
assert.False(t, apiNL[2].Unread)
55+
assert.False(t, apiNL[2].Pinned)
5656

5757
// -- GET /repos/{owner}/{repo}/notifications --
5858
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?status-types=unread&token=%s", user2.Name, repo1.Name, token))
@@ -74,8 +74,8 @@ func TestAPINotification(t *testing.T) {
7474
DecodeJSON(t, resp, &apiN)
7575

7676
assert.EqualValues(t, 5, apiN.ID)
77-
assert.EqualValues(t, false, apiN.Pinned)
78-
assert.EqualValues(t, true, apiN.Unread)
77+
assert.False(t, apiN.Pinned)
78+
assert.True(t, apiN.Unread)
7979
assert.EqualValues(t, "issue4", apiN.Subject.Title)
8080
assert.EqualValues(t, "Issue", apiN.Subject.Type)
8181
assert.EqualValues(t, thread5.Issue.APIURL(), apiN.Subject.URL)

‎integrations/api_oauth2_apps_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func testAPIGetOAuth2Application(t *testing.T) {
123123
assert.EqualValues(t, existApp.ClientID, expectedApp.ClientID)
124124
assert.Len(t, expectedApp.ClientID, 36)
125125
assert.Empty(t, expectedApp.ClientSecret)
126-
assert.EqualValues(t, len(expectedApp.RedirectURIs), 1)
126+
assert.Len(t, expectedApp.RedirectURIs, 1)
127127
assert.EqualValues(t, existApp.RedirectURIs[0], expectedApp.RedirectURIs[0])
128128
models.AssertExistsAndLoadBean(t, &models.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
129129
}
@@ -156,7 +156,7 @@ func testAPIUpdateOAuth2Application(t *testing.T) {
156156
DecodeJSON(t, resp, &app)
157157
expectedApp := app
158158

159-
assert.EqualValues(t, len(expectedApp.RedirectURIs), 2)
159+
assert.Len(t, expectedApp.RedirectURIs, 2)
160160
assert.EqualValues(t, expectedApp.RedirectURIs[0], appBody.RedirectURIs[0])
161161
assert.EqualValues(t, expectedApp.RedirectURIs[1], appBody.RedirectURIs[1])
162162
models.AssertExistsAndLoadBean(t, &models.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})

‎integrations/api_org_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestAPIOrgCreate(t *testing.T) {
6969
// user1 on this org is public
7070
var users []*api.User
7171
DecodeJSON(t, resp, &users)
72-
assert.EqualValues(t, 1, len(users))
72+
assert.Len(t, users, 1)
7373
assert.EqualValues(t, "user1", users[0].UserName)
7474
})
7575
}

‎integrations/api_pull_review_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ func TestAPIPullReview(t *testing.T) {
3737
assert.EqualValues(t, 8, reviews[3].ID)
3838
assert.EqualValues(t, "APPROVED", reviews[3].State)
3939
assert.EqualValues(t, 0, reviews[3].CodeCommentsCount)
40-
assert.EqualValues(t, true, reviews[3].Stale)
41-
assert.EqualValues(t, false, reviews[3].Official)
40+
assert.True(t, reviews[3].Stale)
41+
assert.False(t, reviews[3].Official)
4242

4343
assert.EqualValues(t, 10, reviews[5].ID)
4444
assert.EqualValues(t, "REQUEST_CHANGES", reviews[5].State)
4545
assert.EqualValues(t, 1, reviews[5].CodeCommentsCount)
4646
assert.EqualValues(t, -1, reviews[5].Reviewer.ID) // ghost user
47-
assert.EqualValues(t, false, reviews[5].Stale)
48-
assert.EqualValues(t, true, reviews[5].Official)
47+
assert.False(t, reviews[5].Stale)
48+
assert.True(t, reviews[5].Official)
4949

5050
// test GetPullReview
5151
req = NewRequestf(t, http.MethodGet, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, reviews[3].ID, token)
@@ -118,14 +118,14 @@ func TestAPIPullReview(t *testing.T) {
118118
resp = session.MakeRequest(t, req, http.StatusOK)
119119
DecodeJSON(t, resp, &review)
120120
assert.EqualValues(t, 6, review.ID)
121-
assert.EqualValues(t, true, review.Dismissed)
121+
assert.True(t, review.Dismissed)
122122

123123
// test dismiss review
124124
req = NewRequest(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d/undismissals?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token))
125125
resp = session.MakeRequest(t, req, http.StatusOK)
126126
DecodeJSON(t, resp, &review)
127127
assert.EqualValues(t, 6, review.ID)
128-
assert.EqualValues(t, false, review.Dismissed)
128+
assert.False(t, review.Dismissed)
129129

130130
// test DeletePullReview
131131
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{
@@ -151,15 +151,15 @@ func TestAPIPullReview(t *testing.T) {
151151
assert.EqualValues(t, 11, reviews[0].ID)
152152
assert.EqualValues(t, "REQUEST_REVIEW", reviews[0].State)
153153
assert.EqualValues(t, 0, reviews[0].CodeCommentsCount)
154-
assert.EqualValues(t, false, reviews[0].Stale)
155-
assert.EqualValues(t, true, reviews[0].Official)
154+
assert.False(t, reviews[0].Stale)
155+
assert.True(t, reviews[0].Official)
156156
assert.EqualValues(t, "test_team", reviews[0].ReviewerTeam.Name)
157157

158158
assert.EqualValues(t, 12, reviews[1].ID)
159159
assert.EqualValues(t, "REQUEST_REVIEW", reviews[1].State)
160160
assert.EqualValues(t, 0, reviews[0].CodeCommentsCount)
161-
assert.EqualValues(t, false, reviews[1].Stale)
162-
assert.EqualValues(t, true, reviews[1].Official)
161+
assert.False(t, reviews[1].Stale)
162+
assert.True(t, reviews[1].Official)
163163
assert.EqualValues(t, 1, reviews[1].Reviewer.ID)
164164
}
165165

‎integrations/api_repo_tags_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAPIReposGetTags(t *testing.T) {
2828
var tags []*api.Tag
2929
DecodeJSON(t, resp, &tags)
3030

31-
assert.EqualValues(t, 1, len(tags))
31+
assert.Len(t, tags, 1)
3232
assert.Equal(t, "v1.1", tags[0].Name)
3333
assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", tags[0].Commit.SHA)
3434
assert.Equal(t, setting.AppURL+"api/v1/repos/user2/repo1/git/commits/65f1bf27bc3bf70f64657658635e66094edbcb4d", tags[0].Commit.URL)

‎integrations/api_repo_teams_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ func TestAPIRepoTeams(t *testing.T) {
3333
DecodeJSON(t, res, &teams)
3434
if assert.Len(t, teams, 2) {
3535
assert.EqualValues(t, "Owners", teams[0].Name)
36-
assert.EqualValues(t, false, teams[0].CanCreateOrgRepo)
36+
assert.False(t, teams[0].CanCreateOrgRepo)
3737
assert.EqualValues(t, []string{"repo.code", "repo.issues", "repo.pulls", "repo.releases", "repo.wiki", "repo.ext_wiki", "repo.ext_issues"}, teams[0].Units)
3838
assert.EqualValues(t, "owner", teams[0].Permission)
3939

4040
assert.EqualValues(t, "test_team", teams[1].Name)
41-
assert.EqualValues(t, false, teams[1].CanCreateOrgRepo)
41+
assert.False(t, teams[1].CanCreateOrgRepo)
4242
assert.EqualValues(t, []string{"repo.issues"}, teams[1].Units)
4343
assert.EqualValues(t, "write", teams[1].Permission)
4444
}

‎integrations/api_repo_topic_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func TestAPIRepoTopic(t *testing.T) {
8888
req = NewRequest(t, "GET", url)
8989
res = session.MakeRequest(t, req, http.StatusOK)
9090
DecodeJSON(t, res, &topics)
91-
assert.Equal(t, 25, len(topics.TopicNames))
91+
assert.Len(t, topics.TopicNames, 25)
9292

9393
// Test writing more topics than allowed
9494
newTopics = append(newTopics, "t26")
@@ -115,7 +115,7 @@ func TestAPIRepoTopic(t *testing.T) {
115115
req = NewRequest(t, "GET", url)
116116
res = session.MakeRequest(t, req, http.StatusOK)
117117
DecodeJSON(t, res, &topics)
118-
assert.Equal(t, 0, len(topics.TopicNames))
118+
assert.Empty(t, topics.TopicNames)
119119

120120
// Test add a topic to repo with write access (requires repo admin access)
121121
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user3.Name, repo3.Name, "topicName", token4)

0 commit comments

Comments
 (0)