Skip to content

Commit 598a7fc

Browse files
committed
enable empty rule
1 parent c3dedcf commit 598a7fc

32 files changed

+75
-76
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ linters:
9393
- go-require
9494
- require-error
9595
- equal-values
96-
- empty
9796
- formatter
9897
usetesting:
9998
os-temp-dir: true

cmd/admin_user_create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ func TestAdminUserCreate(t *testing.T) {
6161
assert.NoError(t, createUser("u", "--user-type bot"))
6262
u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: "u"})
6363
assert.Equal(t, user_model.UserTypeBot, u.Type)
64-
assert.Equal(t, "", u.Passwd)
64+
assert.Empty(t, u.Passwd)
6565
})
6666
}

cmd/main_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,27 @@ func TestCliCmdError(t *testing.T) {
131131
r, err := runTestApp(app, "./gitea", "test-cmd")
132132
assert.Error(t, err)
133133
assert.Equal(t, 1, r.ExitCode)
134-
assert.Equal(t, "", r.Stdout)
134+
assert.Empty(t, r.Stdout)
135135
assert.Equal(t, "Command error: normal error\n", r.Stderr)
136136

137137
app = newTestApp(func(ctx *cli.Context) error { return cli.Exit("exit error", 2) })
138138
r, err = runTestApp(app, "./gitea", "test-cmd")
139139
assert.Error(t, err)
140140
assert.Equal(t, 2, r.ExitCode)
141-
assert.Equal(t, "", r.Stdout)
141+
assert.Empty(t, r.Stdout)
142142
assert.Equal(t, "exit error\n", r.Stderr)
143143

144144
app = newTestApp(func(ctx *cli.Context) error { return nil })
145145
r, err = runTestApp(app, "./gitea", "test-cmd", "--no-such")
146146
assert.Error(t, err)
147147
assert.Equal(t, 1, r.ExitCode)
148148
assert.Equal(t, "Incorrect Usage: flag provided but not defined: -no-such\n\n", r.Stdout)
149-
assert.Equal(t, "", r.Stderr) // the cli package's strange behavior, the error message is not in stderr ....
149+
assert.Empty(t, r.Stderr) // the cli package's strange behavior, the error message is not in stderr ....
150150

151151
app = newTestApp(func(ctx *cli.Context) error { return nil })
152152
r, err = runTestApp(app, "./gitea", "test-cmd")
153153
assert.NoError(t, err)
154154
assert.Equal(t, -1, r.ExitCode) // the cli.OsExiter is not called
155-
assert.Equal(t, "", r.Stdout)
156-
assert.Equal(t, "", r.Stderr)
155+
assert.Empty(t, r.Stdout)
156+
assert.Empty(t, r.Stderr)
157157
}

models/auth/oauth2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func TestOAuth2Application_CreateGrant(t *testing.T) {
126126
assert.NotNil(t, grant)
127127
assert.Equal(t, int64(2), grant.UserID)
128128
assert.Equal(t, int64(1), grant.ApplicationID)
129-
assert.Equal(t, "", grant.Scope)
129+
assert.Empty(t, grant.Scope)
130130
}
131131

132132
//////////////////// Grant

models/migrations/v1_19/v233_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func Test_AddHeaderAuthorizationEncryptedColWebhook(t *testing.T) {
6464
assert.Equal(t, e.Meta, got[i].Meta)
6565

6666
if e.HeaderAuthorization == "" {
67-
assert.Equal(t, "", got[i].HeaderAuthorizationEncrypted)
67+
assert.Empty(t, got[i].HeaderAuthorizationEncrypted)
6868
} else {
6969
cipherhex := got[i].HeaderAuthorizationEncrypted
7070
cleartext, err := secret.DecryptSecret(setting.SecretKey, cipherhex)

models/user/setting_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestSettings(t *testing.T) {
3838

3939
settingValue, err = user_model.GetUserSetting(db.DefaultContext, 99, "no_such")
4040
assert.NoError(t, err)
41-
assert.EqualValues(t, "", settingValue)
41+
assert.Empty(t, settingValue)
4242

4343
// updated setting
4444
updatedSetting := &user_model.Setting{UserID: 99, SettingKey: keyName, SettingValue: "Updated"}

modules/cache/cache_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ func TestGetString(t *testing.T) {
6060
return "", fmt.Errorf("some error")
6161
})
6262
assert.Error(t, err)
63-
assert.Equal(t, "", data)
63+
assert.Empty(t, data)
6464

6565
data, err = GetString("key", func() (string, error) {
6666
return "", nil
6767
})
6868
assert.NoError(t, err)
69-
assert.Equal(t, "", data)
69+
assert.Empty(t, data)
7070

7171
data, err = GetString("key", func() (string, error) {
7272
return "some data", nil
7373
})
7474
assert.NoError(t, err)
75-
assert.Equal(t, "", data)
75+
assert.Empty(t, data)
7676
Remove("key")
7777

7878
data, err = GetString("key", func() (string, error) {

modules/indexer/issues/meilisearch/meilisearch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func TestConvertHits(t *testing.T) {
7878
}
7979

8080
func TestDoubleQuoteKeyword(t *testing.T) {
81-
assert.EqualValues(t, "", doubleQuoteKeyword(""))
81+
assert.Empty(t, doubleQuoteKeyword(""))
8282
assert.EqualValues(t, `"a" "b" "c"`, doubleQuoteKeyword("a b c"))
8383
assert.EqualValues(t, `"a" "d" "g"`, doubleQuoteKeyword("a d g"))
8484
assert.EqualValues(t, `"a" "d" "g"`, doubleQuoteKeyword("a d g"))

modules/markup/markdown/meta_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestExtractMetadata(t *testing.T) {
5151
var meta IssueTemplate
5252
body, err := ExtractMetadata(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, sepTest), &meta)
5353
assert.NoError(t, err)
54-
assert.Equal(t, "", body)
54+
assert.Empty(t, body)
5555
assert.Equal(t, metaTest, meta)
5656
assert.True(t, meta.Valid())
5757
})
@@ -83,7 +83,7 @@ func TestExtractMetadataBytes(t *testing.T) {
8383
var meta IssueTemplate
8484
body, err := ExtractMetadataBytes([]byte(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, sepTest)), &meta)
8585
assert.NoError(t, err)
86-
assert.Equal(t, "", string(body))
86+
assert.Empty(t, string(body))
8787
assert.Equal(t, metaTest, meta)
8888
assert.True(t, meta.Valid())
8989
})

modules/queue/manager_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ CONN_STR = redis://
4747
assert.Equal(t, filepath.Join(setting.AppDataPath, "queues/common"), q.baseConfig.DataFullDir)
4848
assert.Equal(t, 100000, q.baseConfig.Length)
4949
assert.Equal(t, 20, q.batchLength)
50-
assert.Equal(t, "", q.baseConfig.ConnStr)
50+
assert.Empty(t, q.baseConfig.ConnStr)
5151
assert.Equal(t, "default_queue", q.baseConfig.QueueFullName)
5252
assert.Equal(t, "default_queue_unique", q.baseConfig.SetFullName)
5353
assert.NotZero(t, q.GetWorkerMaxNumber())
@@ -101,7 +101,7 @@ MAX_WORKERS = 123
101101
assert.Equal(t, filepath.Join(setting.AppDataPath, "queues/dir2"), q2.baseConfig.DataFullDir)
102102
assert.Equal(t, 102, q2.baseConfig.Length)
103103
assert.Equal(t, 22, q2.batchLength)
104-
assert.Equal(t, "", q2.baseConfig.ConnStr)
104+
assert.Empty(t, q2.baseConfig.ConnStr)
105105
assert.Equal(t, "sub_q2", q2.baseConfig.QueueFullName)
106106
assert.Equal(t, "sub_q2_u2", q2.baseConfig.SetFullName)
107107
assert.Equal(t, 123, q2.GetWorkerMaxNumber())

0 commit comments

Comments
 (0)