Skip to content

Commit 437d8bd

Browse files
TheFox0x7TheFox0x7
committed
refactor(tests): move some asserts to require
this touches only the cases where the intent was to terminate the test early
1 parent 7152a8f commit 437d8bd

22 files changed

+109
-186
lines changed

‎models/asymkey/gpg_key_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515

1616
"github.com/keybase/go-crypto/openpgp/packet"
1717
"github.com/stretchr/testify/assert"
18+
"github.com/stretchr/testify/require"
1819
)
1920

2021
func TestCheckArmoredGPGKeyString(t *testing.T) {
@@ -107,9 +108,8 @@ MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
107108
=i9b7
108109
-----END PGP PUBLIC KEY BLOCK-----`
109110
keys, err := checkArmoredGPGKeyString(testGPGArmor)
110-
if !assert.NotEmpty(t, keys) {
111-
return
112-
}
111+
require.NotEmpty(t, keys)
112+
113113
ekey := keys[0]
114114
assert.NoError(t, err, "Could not parse a valid GPG armored key", ekey)
115115

‎models/organization/org_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"code.gitea.io/gitea/modules/structs"
1717

1818
"github.com/stretchr/testify/assert"
19+
"github.com/stretchr/testify/require"
1920
)
2021

2122
func TestUser_IsOwnedBy(t *testing.T) {
@@ -180,9 +181,8 @@ func TestRestrictedUserOrgMembers(t *testing.T) {
180181
ID: 29,
181182
IsRestricted: true,
182183
})
183-
if !assert.True(t, restrictedUser.IsRestricted) {
184-
return // ensure fixtures return restricted user
185-
}
184+
// ensure fixtures return restricted user
185+
require.True(t, restrictedUser.IsRestricted)
186186

187187
testCases := []struct {
188188
name string

‎models/user/openid_test.go

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
user_model "code.gitea.io/gitea/models/user"
1212

1313
"github.com/stretchr/testify/assert"
14+
"github.com/stretchr/testify/require"
1415
)
1516

1617
func TestGetUserOpenIDs(t *testing.T) {
@@ -34,30 +35,23 @@ func TestGetUserOpenIDs(t *testing.T) {
3435
func TestToggleUserOpenIDVisibility(t *testing.T) {
3536
assert.NoError(t, unittest.PrepareTestDatabase())
3637
oids, err := user_model.GetUserOpenIDs(db.DefaultContext, int64(2))
37-
if !assert.NoError(t, err) || !assert.Len(t, oids, 1) {
38-
return
39-
}
38+
require.NoError(t, err)
39+
require.Len(t, oids, 1)
4040
assert.True(t, oids[0].Show)
4141

4242
err = user_model.ToggleUserOpenIDVisibility(db.DefaultContext, oids[0].ID)
43-
if !assert.NoError(t, err) {
44-
return
45-
}
43+
require.NoError(t, err)
4644

4745
oids, err = user_model.GetUserOpenIDs(db.DefaultContext, int64(2))
48-
if !assert.NoError(t, err) || !assert.Len(t, oids, 1) {
49-
return
50-
}
46+
require.NoError(t, err)
47+
require.Len(t, oids, 1)
48+
5149
assert.False(t, oids[0].Show)
5250
err = user_model.ToggleUserOpenIDVisibility(db.DefaultContext, oids[0].ID)
53-
if !assert.NoError(t, err) {
54-
return
55-
}
51+
require.NoError(t, err)
5652

5753
oids, err = user_model.GetUserOpenIDs(db.DefaultContext, int64(2))
58-
if !assert.NoError(t, err) {
59-
return
60-
}
54+
require.NoError(t, err)
6155
if assert.Len(t, oids, 1) {
6256
assert.True(t, oids[0].Show)
6357
}

‎modules/git/blob_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ func TestBlob_Data(t *testing.T) {
1717
output := "file2\n"
1818
bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
1919
repo, err := openRepositoryWithDefaultContext(bareRepo1Path)
20-
if !assert.NoError(t, err) {
21-
t.Fatal()
22-
}
20+
require.NoError(t, err)
2321
defer repo.Close()
2422

2523
testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")

‎modules/git/commit_sha256_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"testing"
1212

1313
"github.com/stretchr/testify/assert"
14+
"github.com/stretchr/testify/require"
1415
)
1516

1617
func TestCommitsCountSha256(t *testing.T) {
@@ -94,9 +95,7 @@ signed commit`
9495

9596
commitFromReader, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString))
9697
assert.NoError(t, err)
97-
if !assert.NotNil(t, commitFromReader) {
98-
return
99-
}
98+
require.NotNil(t, commitFromReader)
10099
assert.EqualValues(t, sha, commitFromReader.ID)
101100
assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
102101

‎modules/git/commit_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"testing"
1212

1313
"github.com/stretchr/testify/assert"
14+
"github.com/stretchr/testify/require"
1415
)
1516

1617
func TestCommitsCount(t *testing.T) {
@@ -91,9 +92,7 @@ empty commit`
9192

9293
commitFromReader, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString))
9394
assert.NoError(t, err)
94-
if !assert.NotNil(t, commitFromReader) {
95-
return
96-
}
95+
require.NotNil(t, commitFromReader)
9796
assert.EqualValues(t, sha, commitFromReader.ID)
9897
assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
9998
@@ -159,9 +158,7 @@ ISO-8859-1`
159158

160159
commitFromReader, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString))
161160
assert.NoError(t, err)
162-
if !assert.NotNil(t, commitFromReader) {
163-
return
164-
}
161+
require.NotNil(t, commitFromReader)
165162
assert.EqualValues(t, sha, commitFromReader.ID)
166163
assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
167164

‎modules/git/repo_language_stats_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@ import (
1010
"testing"
1111

1212
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
1314
)
1415

1516
func TestRepository_GetLanguageStats(t *testing.T) {
1617
repoPath := filepath.Join(testReposDir, "language_stats_repo")
1718
gitRepo, err := openRepositoryWithDefaultContext(repoPath)
18-
if !assert.NoError(t, err) {
19-
t.Fatal()
20-
}
19+
require.NoError(t, err)
20+
2121
defer gitRepo.Close()
2222

2323
stats, err := gitRepo.GetLanguageStats("8fee858da5796dfb37704761701bb8e800ad9ef3")
24-
if !assert.NoError(t, err) {
25-
t.Fatal()
26-
}
24+
require.NoError(t, err)
2725

2826
assert.EqualValues(t, map[string]int64{
2927
"Python": 134,

‎modules/httplib/serve_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"testing"
1414

1515
"github.com/stretchr/testify/assert"
16+
"github.com/stretchr/testify/require"
1617
)
1718

1819
func TestServeContentByReader(t *testing.T) {
@@ -71,9 +72,7 @@ func TestServeContentByReadSeeker(t *testing.T) {
7172
}
7273

7374
seekReader, err := os.OpenFile(tmpFile, os.O_RDONLY, 0o644)
74-
if !assert.NoError(t, err) {
75-
return
76-
}
75+
require.NoError(t, err)
7776
defer seekReader.Close()
7877

7978
w := httptest.NewRecorder()

‎modules/indexer/issues/indexer_test.go

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ import (
1919
_ "code.gitea.io/gitea/models/activities"
2020

2121
"github.com/stretchr/testify/assert"
22+
"github.com/stretchr/testify/require"
2223
)
2324

2425
func TestMain(m *testing.M) {
2526
unittest.MainTest(m)
2627
}
2728

2829
func TestDBSearchIssues(t *testing.T) {
29-
assert.NoError(t, unittest.PrepareTestDatabase())
30+
require.NoError(t, unittest.PrepareTestDatabase())
3031

3132
setting.Indexer.IssueType = "db"
3233
InitIssueIndexer(true)
@@ -83,9 +84,7 @@ func searchIssueWithKeyword(t *testing.T) {
8384

8485
for _, test := range tests {
8586
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
86-
if !assert.NoError(t, err) {
87-
return
88-
}
87+
require.NoError(t, err)
8988
assert.Equal(t, test.expectedIDs, issueIDs)
9089
}
9190
}
@@ -120,9 +119,7 @@ func searchIssueByIndex(t *testing.T) {
120119

121120
for _, test := range tests {
122121
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
123-
if !assert.NoError(t, err) {
124-
return
125-
}
122+
require.NoError(t, err)
126123
assert.Equal(t, test.expectedIDs, issueIDs)
127124
}
128125
}
@@ -166,9 +163,7 @@ func searchIssueInRepo(t *testing.T) {
166163

167164
for _, test := range tests {
168165
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
169-
if !assert.NoError(t, err) {
170-
return
171-
}
166+
require.NoError(t, err)
172167
assert.Equal(t, test.expectedIDs, issueIDs)
173168
}
174169
}
@@ -238,9 +233,7 @@ func searchIssueByID(t *testing.T) {
238233

239234
for _, test := range tests {
240235
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
241-
if !assert.NoError(t, err) {
242-
return
243-
}
236+
require.NoError(t, err)
244237
assert.Equal(t, test.expectedIDs, issueIDs)
245238
}
246239
}
@@ -265,9 +258,7 @@ func searchIssueIsPull(t *testing.T) {
265258
}
266259
for _, test := range tests {
267260
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
268-
if !assert.NoError(t, err) {
269-
return
270-
}
261+
require.NoError(t, err)
271262
assert.Equal(t, test.expectedIDs, issueIDs)
272263
}
273264
}
@@ -292,9 +283,7 @@ func searchIssueIsClosed(t *testing.T) {
292283
}
293284
for _, test := range tests {
294285
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
295-
if !assert.NoError(t, err) {
296-
return
297-
}
286+
require.NoError(t, err)
298287
assert.Equal(t, test.expectedIDs, issueIDs)
299288
}
300289
}
@@ -319,9 +308,7 @@ func searchIssueIsArchived(t *testing.T) {
319308
}
320309
for _, test := range tests {
321310
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
322-
if !assert.NoError(t, err) {
323-
return
324-
}
311+
require.NoError(t, err)
325312
assert.Equal(t, test.expectedIDs, issueIDs)
326313
}
327314
}
@@ -346,9 +333,7 @@ func searchIssueByMilestoneID(t *testing.T) {
346333
}
347334
for _, test := range tests {
348335
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
349-
if !assert.NoError(t, err) {
350-
return
351-
}
336+
require.NoError(t, err)
352337
assert.Equal(t, test.expectedIDs, issueIDs)
353338
}
354339
}
@@ -379,9 +364,7 @@ func searchIssueByLabelID(t *testing.T) {
379364
}
380365
for _, test := range tests {
381366
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
382-
if !assert.NoError(t, err) {
383-
return
384-
}
367+
require.NoError(t, err)
385368
assert.Equal(t, test.expectedIDs, issueIDs)
386369
}
387370
}
@@ -400,9 +383,7 @@ func searchIssueByTime(t *testing.T) {
400383
}
401384
for _, test := range tests {
402385
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
403-
if !assert.NoError(t, err) {
404-
return
405-
}
386+
require.NoError(t, err)
406387
assert.Equal(t, test.expectedIDs, issueIDs)
407388
}
408389
}
@@ -421,9 +402,7 @@ func searchIssueWithOrder(t *testing.T) {
421402
}
422403
for _, test := range tests {
423404
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
424-
if !assert.NoError(t, err) {
425-
return
426-
}
405+
require.NoError(t, err)
427406
assert.Equal(t, test.expectedIDs, issueIDs)
428407
}
429408
}
@@ -454,9 +433,7 @@ func searchIssueInProject(t *testing.T) {
454433
}
455434
for _, test := range tests {
456435
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)
457-
if !assert.NoError(t, err) {
458-
return
459-
}
436+
require.NoError(t, err)
460437
assert.Equal(t, test.expectedIDs, issueIDs)
461438
}
462439
}
@@ -479,9 +456,7 @@ func searchIssueWithPaginator(t *testing.T) {
479456
}
480457
for _, test := range tests {
481458
issueIDs, total, err := SearchIssues(context.TODO(), &test.opts)
482-
if !assert.NoError(t, err) {
483-
return
484-
}
459+
require.NoError(t, err)
485460
assert.Equal(t, test.expectedIDs, issueIDs)
486461
assert.Equal(t, test.expectedTotal, total)
487462
}

‎modules/queue/base_levelqueue_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"gitea.com/lunny/levelqueue"
1313
"github.com/stretchr/testify/assert"
14+
"github.com/stretchr/testify/require"
1415
"github.com/syndtr/goleveldb/leveldb"
1516
)
1617

@@ -29,9 +30,7 @@ func TestCorruptedLevelQueue(t *testing.T) {
2930
// sometimes the levelqueue could be in a corrupted state, this test is to make sure it can recover from it
3031
dbDir := t.TempDir() + "/levelqueue-test"
3132
db, err := leveldb.OpenFile(dbDir, nil)
32-
if !assert.NoError(t, err) {
33-
return
34-
}
33+
require.NoError(t, err)
3534
defer db.Close()
3635

3736
assert.NoError(t, db.Put([]byte("other-key"), []byte("other-value"), nil))

‎modules/queue/base_redis_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"code.gitea.io/gitea/modules/setting"
1515

1616
"github.com/stretchr/testify/assert"
17+
"github.com/stretchr/testify/require"
1718
)
1819

1920
func waitRedisReady(conn string, dur time.Duration) (ready bool) {
@@ -61,9 +62,7 @@ func TestBaseRedis(t *testing.T) {
6162
return
6263
}
6364
assert.NoError(t, redisServer.Start())
64-
if !assert.True(t, waitRedisReady("redis://127.0.0.1:6379/0", 5*time.Second), "start redis-server") {
65-
return
66-
}
65+
require.True(t, waitRedisReady("redis://127.0.0.1:6379/0", 5*time.Second), "start redis-server")
6766
}
6867

6968
testQueueBasic(t, newBaseRedisSimple, toBaseConfig("baseRedis", setting.QueueSettings{Length: 10}), false)

0 commit comments

Comments
 (0)