Skip to content

Commit 33f31cb

Browse files
committed
fix: correct majority of the testifylinter issues relating to error assertions
Signed-off-by: mikeee <[email protected]>
1 parent 46698f1 commit 33f31cb

27 files changed

+331
-291
lines changed

.github/workflows/dapr-bot/bot_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
)
1212

13-
var testBot *Bot = &Bot{
13+
var testBot = &Bot{
1414
ctx: context.Background(),
1515
issueClient: &testClient{},
1616
}
@@ -50,7 +50,7 @@ func TestHandleEvent(t *testing.T) {
5050
}
5151
testEventCopy.IssueCommentEvent.Comment.Body = github.String("/assign")
5252
res, err := testBot.HandleEvent(ctx, testEventCopy)
53-
assert.NoError(t, err)
53+
require.NoError(t, err)
5454
assert.NotEmpty(t, res)
5555
})
5656

@@ -67,7 +67,7 @@ func TestHandleEvent(t *testing.T) {
6767
}
6868
testEventCopy.IssueCommentEvent.Comment.Body = github.String("/assign \r \ntest body")
6969
res, err := testBot.HandleEvent(ctx, testEventCopy)
70-
assert.NoError(t, err)
70+
require.NoError(t, err)
7171
assert.NotEmpty(t, res)
7272
})
7373

@@ -84,7 +84,7 @@ func TestHandleEvent(t *testing.T) {
8484
}
8585
testEventCopy.IssueCommentEvent.Comment.Body = github.String("/assign")
8686
res, err := testBot.HandleEvent(ctx, testEventCopy)
87-
assert.Error(t, err)
87+
require.Error(t, err)
8888
assert.NotEmpty(t, res)
8989
})
9090

@@ -99,7 +99,7 @@ func TestHandleEvent(t *testing.T) {
9999
}
100100
testEventCopy.IssueCommentEvent.Comment.Body = github.String("assign")
101101
res, err := testBot.HandleEvent(ctx, testEventCopy)
102-
assert.NoError(t, err)
102+
require.NoError(t, err)
103103
assert.Equal(t, "no command found", res)
104104
})
105105
}
@@ -111,7 +111,7 @@ func TestCreateIssueComment(t *testing.T) {
111111
}
112112
testBot.issueClient = &tc
113113
err := testBot.CreateIssueComment("test", testEvent)
114-
assert.Error(t, err)
114+
require.Error(t, err)
115115
})
116116

117117
t.Run("create issue comment", func(t *testing.T) {
@@ -120,7 +120,7 @@ func TestCreateIssueComment(t *testing.T) {
120120
}
121121
testBot.issueClient = &tc
122122
err := testBot.CreateIssueComment("test", testEvent)
123-
assert.NoError(t, err)
123+
require.NoError(t, err)
124124
})
125125

126126
t.Run("create issue comment with empty body", func(t *testing.T) {
@@ -129,7 +129,7 @@ func TestCreateIssueComment(t *testing.T) {
129129
}
130130
testBot.issueClient = &tc
131131
err := testBot.CreateIssueComment("", testEvent)
132-
assert.Error(t, err)
132+
require.Error(t, err)
133133
})
134134
}
135135

@@ -140,7 +140,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
140140
}
141141
testBot.issueClient = &tc
142142
assignee, err := testBot.AssignIssueToCommenter(testEvent)
143-
assert.Error(t, err)
143+
require.Error(t, err)
144144
assert.Empty(t, assignee)
145145
})
146146

@@ -156,7 +156,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
156156
}
157157
testEventCopy.IssueCommentEvent.Issue.Assignees = []*github.User{}
158158
assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
159-
assert.NoError(t, err)
159+
require.NoError(t, err)
160160
assert.Equal(t, "testCommentLogin", assignee)
161161
})
162162

@@ -170,7 +170,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
170170
}
171171
testEventCopy.IssueCommentEvent.Issue.State = github.String("closed")
172172
assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
173-
assert.Error(t, err)
173+
require.Error(t, err)
174174
assert.Empty(t, assignee)
175175
})
176176

@@ -184,7 +184,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
184184
}
185185
testEventCopy.IssueCommentEvent.Issue.Assignees = []*github.User{{Login: github.String("testCommentLogin")}}
186186
assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
187-
assert.Error(t, err)
187+
require.Error(t, err)
188188
assert.Empty(t, assignee)
189189
})
190190

@@ -200,7 +200,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
200200
}
201201
testEventCopy.IssueCommentEvent.Issue.Assignees = []*github.User{{Login: github.String("testCommentLogin2")}}
202202
assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
203-
assert.Error(t, err)
203+
require.Error(t, err)
204204
assert.Empty(t, assignee)
205205
})
206206
}

.github/workflows/dapr-bot/event_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
)
1212

13-
var testEvent Event = Event{
13+
var testEvent = Event{
1414
Type: "issue_comment",
1515
Path: "test/test",
1616
IssueCommentEvent: &github.IssueCommentEvent{
@@ -36,14 +36,14 @@ func TestProcessEvent(t *testing.T) {
3636
}
3737
t.Run("process event", func(t *testing.T) {
3838
event, err := ProcessEvent(testEvent.Type, testEvent.Path, testEventData)
39-
assert.NoError(t, err)
39+
require.NoError(t, err)
4040
assert.NotNil(t, event)
4141
assert.Equal(t, "test/test", event.Path)
4242
})
4343

4444
t.Run("process event with empty path", func(t *testing.T) {
4545
event, err := ProcessEvent(testEvent.Type, "", testEventData)
46-
assert.Error(t, err)
46+
require.Error(t, err)
4747
assert.Empty(t, event)
4848
})
4949

@@ -53,14 +53,14 @@ func TestProcessEvent(t *testing.T) {
5353

5454
t.Run("process issue_comment event", func(t *testing.T) {
5555
event, err := ProcessEvent(testEvent.Type, testEvent.Path, testEventData)
56-
assert.NoError(t, err)
56+
require.NoError(t, err)
5757
assert.NotNil(t, event)
5858
assert.Equal(t, "issue_comment", event.Type)
5959
})
6060

6161
t.Run("process invalid event", func(t *testing.T) {
6262
event, err := ProcessEvent(testEvent.Type, testEvent.Path, randomData.Bytes())
63-
assert.Error(t, err)
63+
require.Error(t, err)
6464
assert.Empty(t, event)
6565
})
6666
}

actor/manager/container_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestContainerInvoke(t *testing.T) {
7272
mockCodec.EXPECT().Unmarshal([]byte(param), gomock.Any()).SetArg(1, "param").Return(nil)
7373

7474
rsp, err := container.Invoke("Invoke", []byte(param))
75-
require.Equal(t, 2, len(rsp))
75+
require.Len(t, rsp, 2)
7676
require.Equal(t, actorErr.Success, err)
7777
assert.Equal(t, param, rsp[0].Interface().(string))
7878
}

0 commit comments

Comments
 (0)