+1
-1
cmd/migrate_storage_test.go
+1
-1
cmd/migrate_storage_test.go
+1
-1
models/db/list_test.go
+1
-1
models/db/list_test.go
···
40
40
var repoUnits []repo_model.RepoUnit
41
41
err = db.Find(db.DefaultContext, &opts, &repoUnits)
42
42
assert.NoError(t, err)
43
-
assert.EqualValues(t, repoUnitCount, len(repoUnits))
43
+
assert.Len(t, repoUnits, repoUnitCount)
44
44
45
45
cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit))
46
46
assert.NoError(t, err)
+3
-3
models/git/branches_test.go
+3
-3
models/git/branches_test.go
···
88
88
assert.NoError(t, unittest.PrepareTestDatabase())
89
89
branch, exist, err := git_model.FindRenamedBranch(db.DefaultContext, 1, "dev")
90
90
assert.NoError(t, err)
91
-
assert.Equal(t, true, exist)
91
+
assert.True(t, exist)
92
92
assert.Equal(t, "master", branch.To)
93
93
94
94
_, exist, err = git_model.FindRenamedBranch(db.DefaultContext, 1, "unknow")
95
95
assert.NoError(t, err)
96
-
assert.Equal(t, false, exist)
96
+
assert.False(t, exist)
97
97
}
98
98
99
99
func TestRenameBranch(t *testing.T) {
···
115
115
return nil
116
116
}))
117
117
118
-
assert.Equal(t, true, _isDefault)
118
+
assert.True(t, _isDefault)
119
119
repo1 = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
120
120
assert.Equal(t, "main", repo1.DefaultBranch)
121
121
+2
-2
models/issues/pull_test.go
+2
-2
models/issues/pull_test.go
···
109
109
110
110
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(db.DefaultContext, 1, "branch2")
111
111
assert.NoError(t, err)
112
-
assert.Equal(t, true, exist)
112
+
assert.True(t, exist)
113
113
114
114
exist, err = issues_model.HasUnmergedPullRequestsByHeadInfo(db.DefaultContext, 1, "not_exist_branch")
115
115
assert.NoError(t, err)
116
-
assert.Equal(t, false, exist)
116
+
assert.False(t, exist)
117
117
}
118
118
119
119
func TestGetUnmergedPullRequestsByHeadInfo(t *testing.T) {
+1
-1
models/issues/tracked_time_test.go
+1
-1
models/issues/tracked_time_test.go
···
35
35
assert.Equal(t, int64(3661), tt.Time)
36
36
37
37
comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{Type: issues_model.CommentTypeAddTimeManual, PosterID: 3, IssueID: 1})
38
-
assert.Equal(t, comment.Content, "1 hour 1 minute")
38
+
assert.Equal(t, "1 hour 1 minute", comment.Content)
39
39
}
40
40
41
41
func TestGetTrackedTimes(t *testing.T) {
+1
-1
models/unittest/consistency.go
+1
-1
models/unittest/consistency.go
···
152
152
Query()
153
153
assert.NoError(t, err)
154
154
155
-
assert.EqualValues(t, label.int("NumIssues"), len(issueLabels), "Unexpected number of issue for label id: %d", label.int("ID"))
155
+
assert.Len(t, issueLabels, label.int("NumIssues"), "Unexpected number of issue for label id: %d", label.int("ID"))
156
156
157
157
issueIDs := make([]int, len(issueLabels))
158
158
for i, issueLabel := range issueLabels {
+3
-3
models/user/user_test.go
+3
-3
models/user/user_test.go
···
36
36
assert.NoError(t, unittest.PrepareTestDatabase())
37
37
38
38
// ignore none active user email
39
-
assert.Equal(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
40
-
assert.Equal(t, []string{"user8@example.com", "user5@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
39
+
assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user9"}))
40
+
assert.ElementsMatch(t, []string{"user8@example.com", "user5@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user5"}))
41
41
42
-
assert.Equal(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user7"}))
42
+
assert.ElementsMatch(t, []string{"user8@example.com"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "user7"}))
43
43
}
44
44
45
45
func TestCanCreateOrganization(t *testing.T) {
+2
-2
modules/git/repo_attribute_test.go
+2
-2
modules/git/repo_attribute_test.go
···
19
19
20
20
n, err := wr.Write([]byte(testStr))
21
21
22
-
assert.Equal(t, n, len(testStr))
22
+
assert.Len(t, testStr, n)
23
23
assert.NoError(t, err)
24
24
select {
25
25
case attr := <-wr.ReadAttribute():
···
32
32
// Write a second attribute again
33
33
n, err = wr.Write([]byte(testStr))
34
34
35
-
assert.Equal(t, n, len(testStr))
35
+
assert.Len(t, testStr, n)
36
36
assert.NoError(t, err)
37
37
38
38
select {
+1
-1
modules/git/repo_commit_test.go
+1
-1
modules/git/repo_commit_test.go
+1
-1
modules/git/repo_tag_test.go
+1
-1
modules/git/repo_tag_test.go
···
26
26
return
27
27
}
28
28
assert.Len(t, tags, 2)
29
-
assert.Equal(t, len(tags), total)
29
+
assert.Len(t, tags, total)
30
30
assert.EqualValues(t, "signed-tag", tags[0].Name)
31
31
assert.EqualValues(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", tags[0].ID.String())
32
32
assert.EqualValues(t, "tag", tags[0].Type)
+1
-1
modules/indexer/code/indexer_test.go
+1
-1
modules/indexer/code/indexer_test.go
···
69
69
t.Run(kw.Keyword, func(t *testing.T) {
70
70
total, res, langs, err := indexer.Search(context.TODO(), kw.RepoIDs, "", kw.Keyword, 1, 10, false)
71
71
assert.NoError(t, err)
72
-
assert.EqualValues(t, len(kw.IDs), total)
72
+
assert.Len(t, kw.IDs, int(total))
73
73
assert.Len(t, langs, kw.Langs)
74
74
75
75
ids := make([]int64, 0, len(res))
+2
-2
modules/lfs/http_client_test.go
+2
-2
modules/lfs/http_client_test.go
···
162
162
assert.NoError(t, err)
163
163
164
164
assert.Equal(t, "download", batchRequest.Operation)
165
-
assert.Equal(t, 1, len(batchRequest.Objects))
165
+
assert.Len(t, batchRequest.Objects, 1)
166
166
assert.Equal(t, p.Oid, batchRequest.Objects[0].Oid)
167
167
assert.Equal(t, p.Size, batchRequest.Objects[0].Size)
168
168
···
269
269
assert.NoError(t, err)
270
270
271
271
assert.Equal(t, "upload", batchRequest.Operation)
272
-
assert.Equal(t, 1, len(batchRequest.Objects))
272
+
assert.Len(t, batchRequest.Objects, 1)
273
273
assert.Equal(t, p.Oid, batchRequest.Objects[0].Oid)
274
274
assert.Equal(t, p.Size, batchRequest.Objects[0].Size)
275
275
+1
-1
modules/log/file_test.go
+1
-1
modules/log/file_test.go
+1
-1
modules/markup/html_test.go
+1
-1
modules/markup/html_test.go
···
593
593
}, strings.NewReader(data), &res)
594
594
595
595
assert.NoError(t, err)
596
-
assert.Equal(t, res.String(), "<a href=\"http://domain/org/repo/compare/783b039...da951ce\" class=\"compare\"><code class=\"nohighlight\">783b039...da951ce</code></a>")
596
+
assert.Equal(t, "<a href=\"http://domain/org/repo/compare/783b039...da951ce\" class=\"compare\"><code class=\"nohighlight\">783b039...da951ce</code></a>", res.String())
597
597
}
+1
-1
modules/packages/container/metadata_test.go
+1
-1
modules/packages/container/metadata_test.go
···
33
33
assert.Equal(t, projectURL, metadata.ProjectURL)
34
34
assert.Equal(t, repositoryURL, metadata.RepositoryURL)
35
35
assert.Equal(t, documentationURL, metadata.DocumentationURL)
36
-
assert.Equal(t, []string{"do it 1", "do it 2"}, metadata.ImageLayers)
36
+
assert.ElementsMatch(t, []string{"do it 1", "do it 2"}, metadata.ImageLayers)
37
37
assert.Equal(
38
38
t,
39
39
map[string]string{
+20
-20
modules/paginator/paginator_test.go
+20
-20
modules/paginator/paginator_test.go
···
70
70
t.Run("Generate pages", func(t *testing.T) {
71
71
p := New(0, 10, 1, 0)
72
72
pages := p.Pages()
73
-
assert.Equal(t, 0, len(pages))
73
+
assert.Empty(t, pages)
74
74
})
75
75
76
76
t.Run("Only current page", func(t *testing.T) {
77
77
p := New(0, 10, 1, 1)
78
78
pages := p.Pages()
79
-
assert.Equal(t, 1, len(pages))
79
+
assert.Len(t, pages, 1)
80
80
assert.Equal(t, 1, pages[0].Num())
81
81
assert.True(t, pages[0].IsCurrent())
82
82
83
83
p = New(1, 10, 1, 1)
84
84
pages = p.Pages()
85
-
assert.Equal(t, 1, len(pages))
85
+
assert.Len(t, pages, 1)
86
86
assert.Equal(t, 1, pages[0].Num())
87
87
assert.True(t, pages[0].IsCurrent())
88
88
})
···
90
90
t.Run("Total page number is less or equal", func(t *testing.T) {
91
91
p := New(1, 10, 1, 2)
92
92
pages := p.Pages()
93
-
assert.Equal(t, 1, len(pages))
93
+
assert.Len(t, pages, 1)
94
94
assert.Equal(t, 1, pages[0].Num())
95
95
assert.True(t, pages[0].IsCurrent())
96
96
97
97
p = New(11, 10, 1, 2)
98
98
pages = p.Pages()
99
-
assert.Equal(t, 2, len(pages))
99
+
assert.Len(t, pages, 2)
100
100
assert.Equal(t, 1, pages[0].Num())
101
101
assert.True(t, pages[0].IsCurrent())
102
102
assert.Equal(t, 2, pages[1].Num())
···
104
104
105
105
p = New(11, 10, 2, 2)
106
106
pages = p.Pages()
107
-
assert.Equal(t, 2, len(pages))
107
+
assert.Len(t, pages, 2)
108
108
assert.Equal(t, 1, pages[0].Num())
109
109
assert.False(t, pages[0].IsCurrent())
110
110
assert.Equal(t, 2, pages[1].Num())
···
112
112
113
113
p = New(25, 10, 2, 3)
114
114
pages = p.Pages()
115
-
assert.Equal(t, 3, len(pages))
115
+
assert.Len(t, pages, 3)
116
116
assert.Equal(t, 1, pages[0].Num())
117
117
assert.False(t, pages[0].IsCurrent())
118
118
assert.Equal(t, 2, pages[1].Num())
···
125
125
// ... 2
126
126
p := New(11, 10, 2, 1)
127
127
pages := p.Pages()
128
-
assert.Equal(t, 2, len(pages))
128
+
assert.Len(t, pages, 2)
129
129
assert.Equal(t, -1, pages[0].Num())
130
130
assert.False(t, pages[0].IsCurrent())
131
131
assert.Equal(t, 2, pages[1].Num())
···
134
134
// ... 2 3
135
135
p = New(21, 10, 2, 2)
136
136
pages = p.Pages()
137
-
assert.Equal(t, 3, len(pages))
137
+
assert.Len(t, pages, 3)
138
138
assert.Equal(t, -1, pages[0].Num())
139
139
assert.False(t, pages[0].IsCurrent())
140
140
assert.Equal(t, 2, pages[1].Num())
···
145
145
// ... 2 3 4
146
146
p = New(31, 10, 3, 3)
147
147
pages = p.Pages()
148
-
assert.Equal(t, 4, len(pages))
148
+
assert.Len(t, pages, 4)
149
149
assert.Equal(t, -1, pages[0].Num())
150
150
assert.False(t, pages[0].IsCurrent())
151
151
assert.Equal(t, 2, pages[1].Num())
···
158
158
// ... 3 4 5
159
159
p = New(41, 10, 4, 3)
160
160
pages = p.Pages()
161
-
assert.Equal(t, 4, len(pages))
161
+
assert.Len(t, pages, 4)
162
162
assert.Equal(t, -1, pages[0].Num())
163
163
assert.False(t, pages[0].IsCurrent())
164
164
assert.Equal(t, 3, pages[1].Num())
···
171
171
// ... 4 5 6 7 8 9 10
172
172
p = New(100, 10, 9, 7)
173
173
pages = p.Pages()
174
-
assert.Equal(t, 8, len(pages))
174
+
assert.Len(t, pages, 8)
175
175
assert.Equal(t, -1, pages[0].Num())
176
176
assert.False(t, pages[0].IsCurrent())
177
177
assert.Equal(t, 4, pages[1].Num())
···
194
194
// 1 ...
195
195
p := New(21, 10, 1, 1)
196
196
pages := p.Pages()
197
-
assert.Equal(t, 2, len(pages))
197
+
assert.Len(t, pages, 2)
198
198
assert.Equal(t, 1, pages[0].Num())
199
199
assert.True(t, pages[0].IsCurrent())
200
200
assert.Equal(t, -1, pages[1].Num())
···
203
203
// 1 2 ...
204
204
p = New(21, 10, 1, 2)
205
205
pages = p.Pages()
206
-
assert.Equal(t, 3, len(pages))
206
+
assert.Len(t, pages, 3)
207
207
assert.Equal(t, 1, pages[0].Num())
208
208
assert.True(t, pages[0].IsCurrent())
209
209
assert.Equal(t, 2, pages[1].Num())
···
214
214
// 1 2 3 ...
215
215
p = New(31, 10, 2, 3)
216
216
pages = p.Pages()
217
-
assert.Equal(t, 4, len(pages))
217
+
assert.Len(t, pages, 4)
218
218
assert.Equal(t, 1, pages[0].Num())
219
219
assert.False(t, pages[0].IsCurrent())
220
220
assert.Equal(t, 2, pages[1].Num())
···
227
227
// 1 2 3 ...
228
228
p = New(41, 10, 2, 3)
229
229
pages = p.Pages()
230
-
assert.Equal(t, 4, len(pages))
230
+
assert.Len(t, pages, 4)
231
231
assert.Equal(t, 1, pages[0].Num())
232
232
assert.False(t, pages[0].IsCurrent())
233
233
assert.Equal(t, 2, pages[1].Num())
···
240
240
// 1 2 3 4 5 6 7 ...
241
241
p = New(100, 10, 1, 7)
242
242
pages = p.Pages()
243
-
assert.Equal(t, 8, len(pages))
243
+
assert.Len(t, pages, 8)
244
244
assert.Equal(t, 1, pages[0].Num())
245
245
assert.True(t, pages[0].IsCurrent())
246
246
assert.Equal(t, 2, pages[1].Num())
···
261
261
// 1 2 3 4 5 6 7 ...
262
262
p = New(100, 10, 2, 7)
263
263
pages = p.Pages()
264
-
assert.Equal(t, 8, len(pages))
264
+
assert.Len(t, pages, 8)
265
265
assert.Equal(t, 1, pages[0].Num())
266
266
assert.False(t, pages[0].IsCurrent())
267
267
assert.Equal(t, 2, pages[1].Num())
···
284
284
// ... 2 3 ...
285
285
p := New(35, 10, 2, 2)
286
286
pages := p.Pages()
287
-
assert.Equal(t, 4, len(pages))
287
+
assert.Len(t, pages, 4)
288
288
assert.Equal(t, -1, pages[0].Num())
289
289
assert.False(t, pages[0].IsCurrent())
290
290
assert.Equal(t, 2, pages[1].Num())
···
297
297
// ... 2 3 4 ...
298
298
p = New(49, 10, 3, 3)
299
299
pages = p.Pages()
300
-
assert.Equal(t, 5, len(pages))
300
+
assert.Len(t, pages, 5)
301
301
assert.Equal(t, -1, pages[0].Num())
302
302
assert.False(t, pages[0].IsCurrent())
303
303
assert.Equal(t, 2, pages[1].Num())
+1
-1
modules/queue/unique_queue_disk_channel_test.go
+1
-1
modules/queue/unique_queue_disk_channel_test.go
+2
-2
modules/secret/secret_test.go
+2
-2
modules/secret/secret_test.go
···
15
15
16
16
hex, _ = EncryptSecret("foo", "baz")
17
17
str, _ = DecryptSecret("foo", hex)
18
-
assert.Equal(t, str, "baz")
18
+
assert.Equal(t, "baz", str)
19
19
20
20
hex, _ = EncryptSecret("bar", "baz")
21
21
str, _ = DecryptSecret("foo", hex)
22
-
assert.NotEqual(t, str, "baz")
22
+
assert.NotEqual(t, "baz", str)
23
23
}
+1
-1
modules/storage/local_test.go
+1
-1
modules/storage/local_test.go
+10
-10
modules/test/logchecker_test.go
+10
-10
modules/test/logchecker_test.go
···
22
22
log.Info("test")
23
23
24
24
filtered, stopped := lc.Check(100 * time.Millisecond)
25
-
assert.EqualValues(t, []bool{false, false}, filtered)
26
-
assert.EqualValues(t, false, stopped)
25
+
assert.ElementsMatch(t, []bool{false, false}, filtered)
26
+
assert.False(t, stopped)
27
27
28
28
log.Info("First")
29
29
filtered, stopped = lc.Check(100 * time.Millisecond)
30
-
assert.EqualValues(t, []bool{true, false}, filtered)
31
-
assert.EqualValues(t, false, stopped)
30
+
assert.ElementsMatch(t, []bool{true, false}, filtered)
31
+
assert.False(t, stopped)
32
32
33
33
log.Info("Second")
34
34
filtered, stopped = lc.Check(100 * time.Millisecond)
35
-
assert.EqualValues(t, []bool{true, false}, filtered)
36
-
assert.EqualValues(t, false, stopped)
35
+
assert.ElementsMatch(t, []bool{true, false}, filtered)
36
+
assert.False(t, stopped)
37
37
38
38
log.Info("Third")
39
39
filtered, stopped = lc.Check(100 * time.Millisecond)
40
-
assert.EqualValues(t, []bool{true, true}, filtered)
41
-
assert.EqualValues(t, false, stopped)
40
+
assert.ElementsMatch(t, []bool{true, true}, filtered)
41
+
assert.False(t, stopped)
42
42
43
43
log.Info("End")
44
44
filtered, stopped = lc.Check(100 * time.Millisecond)
45
-
assert.EqualValues(t, []bool{true, true}, filtered)
46
-
assert.EqualValues(t, true, stopped)
45
+
assert.ElementsMatch(t, []bool{true, true}, filtered)
46
+
assert.True(t, stopped)
47
47
}
+2
-2
modules/translation/i18n/i18n_test.go
+2
-2
modules/translation/i18n/i18n_test.go
···
51
51
assert.Equal(t, `test value; <span style="color: red; background: none;">more text</span>`, result)
52
52
53
53
langs, descs := ls.ListLangNameDesc()
54
-
assert.Equal(t, []string{"lang1", "lang2"}, langs)
55
-
assert.Equal(t, []string{"Lang1", "Lang2"}, descs)
54
+
assert.ElementsMatch(t, []string{"lang1", "lang2"}, langs)
55
+
assert.ElementsMatch(t, []string{"Lang1", "Lang2"}, descs)
56
56
57
57
found := ls.Has("lang1", "no-such")
58
58
assert.False(t, found)
+10
-10
modules/util/slice_test.go
+10
-10
modules/util/slice_test.go
···
74
74
}
75
75
76
76
func TestSliceRemoveAll(t *testing.T) {
77
-
assert.Equal(t, SliceRemoveAll([]int{2, 0, 2, 3}, 0), []int{2, 2, 3})
78
-
assert.Equal(t, SliceRemoveAll([]int{2, 0, 2, 3}, 2), []int{0, 3})
79
-
assert.Equal(t, SliceRemoveAll([]int{0, 0, 0, 0}, 0), []int{})
80
-
assert.Equal(t, SliceRemoveAll([]int{2, 0, 2, 3}, 4), []int{2, 0, 2, 3})
81
-
assert.Equal(t, SliceRemoveAll([]int{}, 0), []int{})
82
-
assert.Equal(t, SliceRemoveAll([]int(nil), 0), []int(nil))
83
-
assert.Equal(t, SliceRemoveAll([]int{}, 0), []int{})
77
+
assert.ElementsMatch(t, []int{2, 2, 3}, SliceRemoveAll([]int{2, 0, 2, 3}, 0))
78
+
assert.ElementsMatch(t, []int{0, 3}, SliceRemoveAll([]int{2, 0, 2, 3}, 2))
79
+
assert.Empty(t, SliceRemoveAll([]int{0, 0, 0, 0}, 0))
80
+
assert.ElementsMatch(t, []int{2, 0, 2, 3}, SliceRemoveAll([]int{2, 0, 2, 3}, 4))
81
+
assert.Empty(t, SliceRemoveAll([]int{}, 0))
82
+
assert.ElementsMatch(t, []int(nil), SliceRemoveAll([]int(nil), 0))
83
+
assert.Empty(t, SliceRemoveAll([]int{}, 0))
84
84
85
-
assert.Equal(t, SliceRemoveAll([]string{"2", "0", "2", "3"}, "0"), []string{"2", "2", "3"})
86
-
assert.Equal(t, SliceRemoveAll([]float64{2, 0, 2, 3}, 0), []float64{2, 2, 3})
87
-
assert.Equal(t, SliceRemoveAll([]bool{false, true, false}, true), []bool{false, false})
85
+
assert.ElementsMatch(t, []string{"2", "2", "3"}, SliceRemoveAll([]string{"2", "0", "2", "3"}, "0"))
86
+
assert.ElementsMatch(t, []float64{2, 2, 3}, SliceRemoveAll([]float64{2, 0, 2, 3}, 0))
87
+
assert.ElementsMatch(t, []bool{false, false}, SliceRemoveAll([]bool{false, true, false}, true))
88
88
}
+1
-1
modules/util/truncate_test.go
+1
-1
modules/util/truncate_test.go
···
25
25
assert.Equal(t, c.ellipsis+c.input[len(c.leftSub):], r, "test split %s at %d, expected rightSub: %q", c.input, c.n, c.input[len(c.leftSub):])
26
26
} else {
27
27
assert.Equal(t, c.leftSub, l, "test split %q at %d, expected leftSub: %q", c.input, c.n, c.leftSub)
28
-
assert.Equal(t, "", r, "test split %q at %d, expected rightSub: %q", c.input, c.n, "")
28
+
assert.Empty(t, r, "test split %q at %d, expected rightSub: %q", c.input, c.n, "")
29
29
}
30
30
}
31
31
}
+3
-3
services/issue/assignee_test.go
+3
-3
services/issue/assignee_test.go
···
20
20
// Fake issue with assignees
21
21
issue, err := issues_model.GetIssueWithAttrsByID(1)
22
22
assert.NoError(t, err)
23
-
assert.EqualValues(t, 1, len(issue.Assignees))
23
+
assert.Len(t, issue.Assignees, 1)
24
24
25
25
user1, err := user_model.GetUserByID(db.DefaultContext, 1) // This user is already assigned (see the definition in fixtures), so running UpdateAssignee should unassign him
26
26
assert.NoError(t, err)
···
33
33
// Clean everyone
34
34
err = DeleteNotPassedAssignee(db.DefaultContext, issue, user1, []*user_model.User{})
35
35
assert.NoError(t, err)
36
-
assert.EqualValues(t, 0, len(issue.Assignees))
36
+
assert.Empty(t, issue.Assignees)
37
37
38
38
// Check they're gone
39
39
assert.NoError(t, issue.LoadAssignees(db.DefaultContext))
40
-
assert.EqualValues(t, 0, len(issue.Assignees))
40
+
assert.Empty(t, issue.Assignees)
41
41
assert.Empty(t, issue.Assignee)
42
42
}
+3
-3
services/issue/issue_test.go
+3
-3
services/issue/issue_test.go
···
37
37
38
38
issueIDs, err := issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
39
39
assert.NoError(t, err)
40
-
assert.EqualValues(t, 5, len(issueIDs))
40
+
assert.Len(t, issueIDs, 5)
41
41
42
42
issue := &issues_model.Issue{
43
43
RepoID: 1,
···
48
48
assert.NoError(t, err)
49
49
issueIDs, err = issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
50
50
assert.NoError(t, err)
51
-
assert.EqualValues(t, 4, len(issueIDs))
51
+
assert.Len(t, issueIDs, 4)
52
52
53
53
// check attachment removal
54
54
attachments, err := repo_model.GetAttachmentsByIssueID(db.DefaultContext, 4)
···
57
57
assert.NoError(t, err)
58
58
err = deleteIssue(db.DefaultContext, issue)
59
59
assert.NoError(t, err)
60
-
assert.EqualValues(t, 2, len(attachments))
60
+
assert.Len(t, attachments, 2)
61
61
for i := range attachments {
62
62
attachment, err := repo_model.GetAttachmentByUUID(db.DefaultContext, attachments[i].UUID)
63
63
assert.Error(t, err)
+3
-3
services/repository/adopt_test.go
+3
-3
services/repository/adopt_test.go
···
30
30
}
31
31
32
32
assert.Equal(t, total, unadopted.index)
33
-
assert.Equal(t, end-start, len(unadopted.repositories))
33
+
assert.Len(t, unadopted.repositories, end-start)
34
34
}
35
35
36
36
func TestCheckUnadoptedRepositories(t *testing.T) {
···
41
41
unadopted := &unadoptedRepositories{start: 0, end: 100}
42
42
err := checkUnadoptedRepositories(db.DefaultContext, "notauser", []string{"repo"}, unadopted)
43
43
assert.NoError(t, err)
44
-
assert.Equal(t, 0, len(unadopted.repositories))
44
+
assert.Empty(t, unadopted.repositories)
45
45
//
46
46
// Unadopted repository is returned
47
47
// Existing (adopted) repository is not returned
···
59
59
unadopted = &unadoptedRepositories{start: 0, end: 100}
60
60
err = checkUnadoptedRepositories(db.DefaultContext, userName, []string{repoName}, unadopted)
61
61
assert.NoError(t, err)
62
-
assert.Equal(t, 0, len(unadopted.repositories))
62
+
assert.Empty(t, unadopted.repositories)
63
63
assert.Equal(t, 0, unadopted.index)
64
64
}
65
65
+1
-1
tests/integration/api_admin_test.go
+1
-1
tests/integration/api_admin_test.go
+1
-1
tests/integration/api_comment_attachment_test.go
+1
-1
tests/integration/api_comment_attachment_test.go
···
68
68
var apiAttachments []*api.Attachment
69
69
DecodeJSON(t, resp, &apiAttachments)
70
70
expectedCount := unittest.GetCount(t, &repo_model.Attachment{CommentID: comment.ID})
71
-
assert.EqualValues(t, expectedCount, len(apiAttachments))
71
+
assert.Len(t, apiAttachments, expectedCount)
72
72
73
73
unittest.AssertExistsAndLoadBean(t, &repo_model.Attachment{ID: apiAttachments[0].ID, CommentID: comment.ID})
74
74
}
+2
-2
tests/integration/api_comment_test.go
+2
-2
tests/integration/api_comment_test.go
···
85
85
DecodeJSON(t, resp, &comments)
86
86
expectedCount := unittest.GetCount(t, &issues_model.Comment{IssueID: issue.ID},
87
87
unittest.Cond("type = ?", issues_model.CommentTypeComment))
88
-
assert.EqualValues(t, expectedCount, len(comments))
88
+
assert.Len(t, comments, expectedCount)
89
89
}
90
90
91
91
func TestAPICreateComment(t *testing.T) {
···
196
196
var comments []*api.TimelineComment
197
197
DecodeJSON(t, resp, &comments)
198
198
expectedCount := unittest.GetCount(t, &issues_model.Comment{IssueID: issue.ID})
199
-
assert.EqualValues(t, expectedCount, len(comments))
199
+
assert.Len(t, comments, expectedCount)
200
200
}
+1
-1
tests/integration/api_issue_config_test.go
+1
-1
tests/integration/api_issue_config_test.go
+3
-3
tests/integration/api_pull_review_test.go
+3
-3
tests/integration/api_pull_review_test.go
···
170
170
DecodeJSON(t, resp, &commentReview)
171
171
assert.EqualValues(t, "COMMENT", commentReview.State)
172
172
assert.EqualValues(t, 2, commentReview.CodeCommentsCount)
173
-
assert.EqualValues(t, "", commentReview.Body)
174
-
assert.EqualValues(t, false, commentReview.Dismissed)
173
+
assert.Empty(t, commentReview.Body)
174
+
assert.False(t, commentReview.Dismissed)
175
175
176
176
// test CreatePullReview Comment with body but without comments
177
177
commentBody := "This is a body of the comment."
···
186
186
assert.EqualValues(t, "COMMENT", commentReview.State)
187
187
assert.EqualValues(t, 0, commentReview.CodeCommentsCount)
188
188
assert.EqualValues(t, commentBody, commentReview.Body)
189
-
assert.EqualValues(t, false, commentReview.Dismissed)
189
+
assert.False(t, commentReview.Dismissed)
190
190
191
191
// test CreatePullReview Comment without body and no comments
192
192
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{
+3
-3
tests/integration/api_pull_test.go
+3
-3
tests/integration/api_pull_test.go
···
49
49
t.Run(fmt.Sprintf("APIGetPullFiles_%d", pull.ID),
50
50
doAPIGetPullFiles(ctx, pull, func(t *testing.T, files []*api.ChangedFile) {
51
51
if assert.Len(t, files, 1) {
52
-
assert.EqualValues(t, "File-WoW", files[0].Filename)
53
-
assert.EqualValues(t, "", files[0].PreviousFilename)
52
+
assert.Equal(t, "File-WoW", files[0].Filename)
53
+
assert.Empty(t, files[0].PreviousFilename)
54
54
assert.EqualValues(t, 1, files[0].Additions)
55
55
assert.EqualValues(t, 1, files[0].Changes)
56
56
assert.EqualValues(t, 0, files[0].Deletions)
57
-
assert.EqualValues(t, "added", files[0].Status)
57
+
assert.Equal(t, "added", files[0].Status)
58
58
}
59
59
}))
60
60
}
+3
-3
tests/integration/api_repo_archive_test.go
+3
-3
tests/integration/api_repo_archive_test.go
···
32
32
resp := MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
33
33
bs, err := io.ReadAll(resp.Body)
34
34
assert.NoError(t, err)
35
-
assert.EqualValues(t, 320, len(bs))
35
+
assert.Len(t, bs, 320)
36
36
37
37
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.tar.gz", user2.Name, repo.Name))
38
38
link.RawQuery = url.Values{"token": {token}}.Encode()
39
39
resp = MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
40
40
bs, err = io.ReadAll(resp.Body)
41
41
assert.NoError(t, err)
42
-
assert.EqualValues(t, 266, len(bs))
42
+
assert.Len(t, bs, 266)
43
43
44
44
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.bundle", user2.Name, repo.Name))
45
45
link.RawQuery = url.Values{"token": {token}}.Encode()
46
46
resp = MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
47
47
bs, err = io.ReadAll(resp.Body)
48
48
assert.NoError(t, err)
49
-
assert.EqualValues(t, 382, len(bs))
49
+
assert.Len(t, bs, 382)
50
50
51
51
link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master", user2.Name, repo.Name))
52
52
link.RawQuery = url.Values{"token": {token}}.Encode()
+7
-7
tests/integration/api_repo_edit_test.go
+7
-7
tests/integration/api_repo_edit_test.go
···
194
194
// check repo1 was written to database
195
195
repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
196
196
repo1editedOption = getRepoEditOptionFromRepo(repo1edited)
197
-
assert.Equal(t, *repo1editedOption.HasIssues, true)
197
+
assert.True(t, *repo1editedOption.HasIssues)
198
198
assert.Nil(t, repo1editedOption.ExternalTracker)
199
199
assert.Equal(t, *repo1editedOption.InternalTracker, *repoEditOption.InternalTracker)
200
-
assert.Equal(t, *repo1editedOption.HasWiki, true)
200
+
assert.True(t, *repo1editedOption.HasWiki)
201
201
assert.Nil(t, repo1editedOption.ExternalWiki)
202
202
203
203
// Test editing repo1 to use external issue and wiki
···
216
216
// check repo1 was written to database
217
217
repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
218
218
repo1editedOption = getRepoEditOptionFromRepo(repo1edited)
219
-
assert.Equal(t, *repo1editedOption.HasIssues, true)
219
+
assert.True(t, *repo1editedOption.HasIssues)
220
220
assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker)
221
-
assert.Equal(t, *repo1editedOption.HasWiki, true)
221
+
assert.True(t, *repo1editedOption.HasWiki)
222
222
assert.Equal(t, *repo1editedOption.ExternalWiki, *repoEditOption.ExternalWiki)
223
223
224
224
repoEditOption.ExternalTracker.ExternalTrackerStyle = "regexp"
···
229
229
assert.NotNil(t, repo)
230
230
repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
231
231
repo1editedOption = getRepoEditOptionFromRepo(repo1edited)
232
-
assert.Equal(t, *repo1editedOption.HasIssues, true)
232
+
assert.True(t, *repo1editedOption.HasIssues)
233
233
assert.Equal(t, *repo1editedOption.ExternalTracker, *repoEditOption.ExternalTracker)
234
234
235
235
// Do some tests with invalid URL for external tracker and wiki
···
259
259
repo1edited = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
260
260
repo1editedOption = getRepoEditOptionFromRepo(repo1edited)
261
261
assert.Equal(t, *repo1editedOption.Description, *repoEditOption.Description)
262
-
assert.Equal(t, *repo1editedOption.HasIssues, true)
262
+
assert.True(t, *repo1editedOption.HasIssues)
263
263
assert.NotNil(t, *repo1editedOption.ExternalTracker)
264
-
assert.Equal(t, *repo1editedOption.HasWiki, true)
264
+
assert.True(t, *repo1editedOption.HasWiki)
265
265
assert.NotNil(t, *repo1editedOption.ExternalWiki)
266
266
267
267
// reset repo in db
+2
-2
tests/integration/api_repo_test.go
+2
-2
tests/integration/api_repo_test.go
···
412
412
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1")
413
413
resp := MakeRequest(t, req, http.StatusOK)
414
414
DecodeJSON(t, resp, &repo)
415
-
assert.EqualValues(t, false, repo.Mirror)
415
+
assert.False(t, repo.Mirror)
416
416
417
417
req = NewRequestf(t, "POST", "/api/v1/repos/user2/repo1/mirror-sync?token=%s", token)
418
418
resp = MakeRequest(t, req, http.StatusBadRequest)
···
469
469
resp := httpContext.Session.MakeRequest(t, req, http.StatusConflict)
470
470
respJSON := map[string]string{}
471
471
DecodeJSON(t, resp, &respJSON)
472
-
assert.Equal(t, respJSON["message"], "The repository with the same name already exists.")
472
+
assert.Equal(t, "The repository with the same name already exists.", respJSON["message"])
473
473
})
474
474
}
475
475
+4
-4
tests/integration/auth_ldap_test.go
+4
-4
tests/integration/auth_ldap_test.go
···
203
203
host, _ := doc.Find(`input[name="host"]`).Attr("value")
204
204
assert.Equal(t, host, getLDAPServerHost())
205
205
binddn, _ := doc.Find(`input[name="bind_dn"]`).Attr("value")
206
-
assert.Equal(t, binddn, "uid=gitea,ou=service,dc=planetexpress,dc=com")
206
+
assert.Equal(t, "uid=gitea,ou=service,dc=planetexpress,dc=com", binddn)
207
207
208
208
req = NewRequestWithValues(t, "POST", href, buildAuthSourceLDAPPayload(csrf, "", "", "", "off"))
209
209
session.MakeRequest(t, req, http.StatusSeeOther)
···
214
214
host, _ = doc.Find(`input[name="host"]`).Attr("value")
215
215
assert.Equal(t, host, getLDAPServerHost())
216
216
binddn, _ = doc.Find(`input[name="bind_dn"]`).Attr("value")
217
-
assert.Equal(t, binddn, "uid=gitea,ou=service,dc=planetexpress,dc=com")
217
+
assert.Equal(t, "uid=gitea,ou=service,dc=planetexpress,dc=com", binddn)
218
218
}
219
219
220
220
func TestLDAPUserSync(t *testing.T) {
···
397
397
assert.NoError(t, err)
398
398
if user.Name == "fry" || user.Name == "leela" || user.Name == "bender" {
399
399
// assert members of LDAP group "cn=ship_crew" are added to mapped teams
400
-
assert.Equal(t, len(usersOrgs), 1, "User [%s] should be member of one organization", user.Name)
401
-
assert.Equal(t, usersOrgs[0].Name, "org26", "Membership should be added to the right organization")
400
+
assert.Len(t, usersOrgs, 1, "User [%s] should be member of one organization", user.Name)
401
+
assert.Equal(t, "org26", usersOrgs[0].Name, "Membership should be added to the right organization")
402
402
isMember, err := organization.IsTeamMember(db.DefaultContext, usersOrgs[0].ID, team.ID, user.ID)
403
403
assert.NoError(t, err)
404
404
assert.True(t, isMember, "Membership should be added to the right team")
+1
-1
tests/integration/cors_test.go
+1
-1
tests/integration/cors_test.go
···
19
19
resp := session.MakeRequest(t, req, http.StatusOK)
20
20
assert.Equal(t, resp.Code, http.StatusOK)
21
21
corsHeader := resp.Header().Get("Access-Control-Allow-Origin")
22
-
assert.Equal(t, corsHeader, "", "Access-Control-Allow-Origin: generated header should match") // header not set
22
+
assert.Empty(t, corsHeader, "Access-Control-Allow-Origin: generated header should match") // header not set
23
23
}
+2
-2
tests/integration/empty_repo_test.go
+2
-2
tests/integration/empty_repo_test.go
···
49
49
req := NewRequest(t, "GET", "/user30/empty/_new/"+setting.Repository.DefaultBranch)
50
50
resp := session.MakeRequest(t, req, http.StatusOK)
51
51
doc := NewHTMLParser(t, resp.Body).Find(`input[name="commit_choice"]`)
52
-
assert.Equal(t, "", doc.AttrOr("checked", "_no_"))
52
+
assert.Empty(t, doc.AttrOr("checked", "_no_"))
53
53
req = NewRequestWithValues(t, "POST", "/user30/empty/_new/"+setting.Repository.DefaultBranch, map[string]string{
54
54
"_csrf": GetCSRF(t, session, "/user/settings"),
55
55
"commit_choice": "direct",
···
76
76
req := NewRequest(t, "GET", "/user30/empty/_new/"+setting.Repository.DefaultBranch)
77
77
resp := session.MakeRequest(t, req, http.StatusOK)
78
78
doc := NewHTMLParser(t, resp.Body).Find(`input[name="commit_choice"]`)
79
-
assert.Equal(t, "", doc.AttrOr("checked", "_no_"))
79
+
assert.Empty(t, doc.AttrOr("checked", "_no_"))
80
80
81
81
body := &bytes.Buffer{}
82
82
mpForm := multipart.NewWriter(body)
+4
-4
tests/integration/git_test.go
+4
-4
tests/integration/git_test.go
···
763
763
return
764
764
}
765
765
assert.Equal(t, "user2/"+headBranch, pr1.HeadBranch)
766
-
assert.Equal(t, false, prMsg.HasMerged)
766
+
assert.False(t, prMsg.HasMerged)
767
767
assert.Contains(t, "Testing commit 1", prMsg.Body)
768
768
assert.Equal(t, commit, prMsg.Head.Sha)
769
769
···
785
785
return
786
786
}
787
787
assert.Equal(t, "user2/test/"+headBranch, pr2.HeadBranch)
788
-
assert.Equal(t, false, prMsg.HasMerged)
788
+
assert.False(t, prMsg.HasMerged)
789
789
})
790
790
791
791
if pr1 == nil || pr2 == nil {
···
829
829
if !assert.NoError(t, err) {
830
830
return
831
831
}
832
-
assert.Equal(t, false, prMsg.HasMerged)
832
+
assert.False(t, prMsg.HasMerged)
833
833
assert.Equal(t, commit, prMsg.Head.Sha)
834
834
835
835
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin").AddDynamicArguments("HEAD:refs/for/master/test/" + headBranch).RunStdString(&git.RunOpts{Dir: dstPath})
···
841
841
if !assert.NoError(t, err) {
842
842
return
843
843
}
844
-
assert.Equal(t, false, prMsg.HasMerged)
844
+
assert.False(t, prMsg.HasMerged)
845
845
assert.Equal(t, commit, prMsg.Head.Sha)
846
846
})
847
847
t.Run("Merge", doAPIMergePullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index))
+1
-1
tests/integration/pull_merge_test.go
+1
-1
tests/integration/pull_merge_test.go
···
414
414
assert.NoError(t, err)
415
415
416
416
// Ensure conflictedFiles is populated.
417
-
assert.Equal(t, 1, len(conflictingPR.ConflictedFiles))
417
+
assert.Len(t, conflictingPR.ConflictedFiles, 1)
418
418
// Check if status is correct.
419
419
assert.Equal(t, issues_model.PullRequestStatusConflict, conflictingPR.Status)
420
420
// Ensure that mergeable returns false
+4
-4
tests/integration/repo_test.go
+4
-4
tests/integration/repo_test.go
···
376
376
htmlDoc := NewHTMLParser(t, resp.Body)
377
377
src, exists := htmlDoc.doc.Find(`.markdown img`).Attr("src")
378
378
assert.True(t, exists, "Image not found in README")
379
-
assert.Equal(t, src, "/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg")
379
+
assert.Equal(t, "/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg", src)
380
380
381
381
req = NewRequest(t, "GET", "/user2/repo1/src/branch/home-md-img-check/README.md")
382
382
resp = session.MakeRequest(t, req, http.StatusOK)
···
384
384
htmlDoc = NewHTMLParser(t, resp.Body)
385
385
src, exists = htmlDoc.doc.Find(`.markdown img`).Attr("src")
386
386
assert.True(t, exists, "Image not found in markdown file")
387
-
assert.Equal(t, src, "/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg")
387
+
assert.Equal(t, "/user2/repo1/media/branch/home-md-img-check/test-fake-img.jpg", src)
388
388
}
389
389
390
390
func TestMarkDownReadmeImageSubfolder(t *testing.T) {
···
399
399
htmlDoc := NewHTMLParser(t, resp.Body)
400
400
src, exists := htmlDoc.doc.Find(`.markdown img`).Attr("src")
401
401
assert.True(t, exists, "Image not found in README")
402
-
assert.Equal(t, src, "/user2/repo1/media/branch/sub-home-md-img-check/docs/test-fake-img.jpg")
402
+
assert.Equal(t, "/user2/repo1/media/branch/sub-home-md-img-check/docs/test-fake-img.jpg", src)
403
403
404
404
req = NewRequest(t, "GET", "/user2/repo1/src/branch/sub-home-md-img-check/docs/README.md")
405
405
resp = session.MakeRequest(t, req, http.StatusOK)
···
407
407
htmlDoc = NewHTMLParser(t, resp.Body)
408
408
src, exists = htmlDoc.doc.Find(`.markdown img`).Attr("src")
409
409
assert.True(t, exists, "Image not found in markdown file")
410
-
assert.Equal(t, src, "/user2/repo1/media/branch/sub-home-md-img-check/docs/test-fake-img.jpg")
410
+
assert.Equal(t, "/user2/repo1/media/branch/sub-home-md-img-check/docs/test-fake-img.jpg", src)
411
411
}