Skip to content

Commit 38bc154

Browse files
sadath-12sadath-12
committed
require.Error
Signed-off-by: sadath-12 <[email protected]>
1 parent 36b78f5 commit 38bc154

File tree

4 files changed

+59
-57
lines changed

4 files changed

+59
-57
lines changed

‎service/grpc/topic_test.go

+27-26
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020

2121
"github.com/golang/protobuf/ptypes/empty"
2222
"github.com/stretchr/testify/assert"
23+
"github.com/stretchr/testify/require"
2324

2425
runtime "github.com/dapr/dapr/pkg/proto/runtime/v1"
2526
"github.com/dapr/go-sdk/service/common"
@@ -28,29 +29,29 @@ import (
2829
func TestTopicErrors(t *testing.T) {
2930
server := getTestServer()
3031
err := server.AddTopicEventHandler(nil, nil)
31-
assert.Errorf(t, err, "expected error on nil sub with AddTopicEventHandler")
32+
require.Errorf(t, err, "expected error on nil sub with AddTopicEventHandler")
3233

3334
err = server.AddBulkTopicEventHandler(nil, nil, 0, 0)
34-
assert.Errorf(t, err, "expected error on nil sub with AddBulkTopicEventHandler")
35+
require.Errorf(t, err, "expected error on nil sub with AddBulkTopicEventHandler")
3536

3637
sub := &common.Subscription{}
3738
err = server.AddTopicEventHandler(sub, nil)
38-
assert.Errorf(t, err, "expected error on invalid sub with AddTopicEventHandler")
39+
require.Errorf(t, err, "expected error on invalid sub with AddTopicEventHandler")
3940
err = server.AddBulkTopicEventHandler(sub, nil, 0, 0)
40-
assert.Errorf(t, err, "expected error on invalid sub with AddBulkTopicEventHandler")
41+
require.Errorf(t, err, "expected error on invalid sub with AddBulkTopicEventHandler")
4142

4243
sub.PubsubName = "messages"
4344
err = server.AddTopicEventHandler(sub, nil)
44-
assert.Errorf(t, err, "expected error on sub without topic with AddTopicEventHandler")
45+
require.Errorf(t, err, "expected error on sub without topic with AddTopicEventHandler")
4546
sub.PubsubName = "messages"
4647
err = server.AddBulkTopicEventHandler(sub, nil, 0, 0)
47-
assert.Errorf(t, err, "expected error on sub without topic with AddBulkTopicEventHandler")
48+
require.Errorf(t, err, "expected error on sub without topic with AddBulkTopicEventHandler")
4849

4950
sub.Topic = "test"
5051
err = server.AddTopicEventHandler(sub, nil)
51-
assert.Errorf(t, err, "expected error on sub without handler")
52+
require.Errorf(t, err, "expected error on sub without handler")
5253
err = server.AddBulkTopicEventHandler(sub, nil, 0, 0)
53-
assert.Errorf(t, err, "expected error on sub without handler")
54+
require.Errorf(t, err, "expected error on sub without handler")
5455
}
5556

5657
func TestTopicSubscriptionList(t *testing.T) {
@@ -65,7 +66,7 @@ func TestTopicSubscriptionList(t *testing.T) {
6566
err := server.AddTopicEventHandler(sub1, eventHandler)
6667
assert.Nil(t, err)
6768
resp, err := server.ListTopicSubscriptions(context.Background(), &empty.Empty{})
68-
assert.NoError(t, err)
69+
require.NoError(t, err)
6970
assert.NotNil(t, resp)
7071
if assert.Lenf(t, resp.Subscriptions, 1, "expected 1 handlers") {
7172
sub := resp.Subscriptions[0]
@@ -84,7 +85,7 @@ func TestTopicSubscriptionList(t *testing.T) {
8485
err = server.AddTopicEventHandler(sub2, eventHandler)
8586
assert.Nil(t, err)
8687
resp, err = server.ListTopicSubscriptions(context.Background(), &empty.Empty{})
87-
assert.NoError(t, err)
88+
require.NoError(t, err)
8889
assert.NotNil(t, resp)
8990
if assert.Lenf(t, resp.Subscriptions, 1, "expected 1 handlers") {
9091
sub := resp.Subscriptions[0]
@@ -110,7 +111,7 @@ func TestTopicSubscriptionList(t *testing.T) {
110111
err := server.AddBulkTopicEventHandler(sub1, eventHandler, 10, 1000)
111112
assert.Nil(t, err)
112113
resp, err := server.ListTopicSubscriptions(context.Background(), &empty.Empty{})
113-
assert.NoError(t, err)
114+
require.NoError(t, err)
114115
assert.NotNil(t, resp)
115116
if assert.Lenf(t, resp.Subscriptions, 1, "expected 1 handlers") {
116117
sub := resp.Subscriptions[0]
@@ -129,7 +130,7 @@ func TestTopicSubscriptionList(t *testing.T) {
129130
err = server.AddBulkTopicEventHandler(sub2, eventHandler, 10, 1000)
130131
assert.Nil(t, err)
131132
resp, err = server.ListTopicSubscriptions(context.Background(), &empty.Empty{})
132-
assert.NoError(t, err)
133+
require.NoError(t, err)
133134
assert.NotNil(t, resp)
134135
if assert.Lenf(t, resp.Subscriptions, 1, "expected 1 handlers") {
135136
sub := resp.Subscriptions[0]
@@ -165,15 +166,15 @@ func TestTopic(t *testing.T) {
165166

166167
t.Run("topic event without request", func(t *testing.T) {
167168
_, err := server.OnTopicEvent(ctx, nil)
168-
assert.Error(t, err)
169+
require.Error(t, err)
169170
})
170171

171172
t.Run("topic event for wrong topic", func(t *testing.T) {
172173
in := &runtime.TopicEventRequest{
173174
Topic: "invalid",
174175
}
175176
_, err := server.OnTopicEvent(ctx, in)
176-
assert.Error(t, err)
177+
require.Error(t, err)
177178
})
178179

179180
t.Run("topic event for valid topic", func(t *testing.T) {
@@ -188,7 +189,7 @@ func TestTopic(t *testing.T) {
188189
PubsubName: sub.PubsubName,
189190
}
190191
_, err := server.OnTopicEvent(ctx, in)
191-
assert.NoError(t, err)
192+
require.NoError(t, err)
192193
})
193194

194195
stopTestServer(t, server)
@@ -209,15 +210,15 @@ func TestTopic(t *testing.T) {
209210

210211
t.Run("topic event without request", func(t *testing.T) {
211212
_, err := server.OnTopicEvent(ctx, nil)
212-
assert.Error(t, err)
213+
require.Error(t, err)
213214
})
214215

215216
t.Run("topic event for wrong topic", func(t *testing.T) {
216217
in := &runtime.TopicEventRequest{
217218
Topic: "invalid",
218219
}
219220
_, err := server.OnTopicEvent(ctx, in)
220-
assert.Error(t, err)
221+
require.Error(t, err)
221222
})
222223

223224
t.Run("topic event for valid topic", func(t *testing.T) {
@@ -232,7 +233,7 @@ func TestTopic(t *testing.T) {
232233
PubsubName: sub.PubsubName,
233234
}
234235
_, err := server.OnTopicEvent(ctx, in)
235-
assert.NoError(t, err)
236+
require.NoError(t, err)
236237
})
237238

238239
stopTestServer(t, server)
@@ -267,7 +268,7 @@ func TestTopicWithValidationDisabled(t *testing.T) {
267268
}
268269

269270
_, err = server.OnTopicEvent(ctx, in)
270-
assert.NoError(t, err)
271+
require.NoError(t, err)
271272
})
272273
t.Run("With bulk event handling", func(t *testing.T) {
273274
ctx := context.Background()
@@ -296,7 +297,7 @@ func TestTopicWithValidationDisabled(t *testing.T) {
296297
}
297298

298299
_, err = server.OnTopicEvent(ctx, in)
299-
assert.NoError(t, err)
300+
require.NoError(t, err)
300301
})
301302
}
302303

@@ -335,7 +336,7 @@ func TestTopicWithErrors(t *testing.T) {
335336
PubsubName: sub1.PubsubName,
336337
}
337338
resp, err := server.OnTopicEvent(ctx, in)
338-
assert.Error(t, err)
339+
require.Error(t, err)
339340
assert.Equal(t, resp.GetStatus(), runtime.TopicEventResponse_RETRY)
340341
})
341342

@@ -351,7 +352,7 @@ func TestTopicWithErrors(t *testing.T) {
351352
PubsubName: sub2.PubsubName,
352353
}
353354
resp, err := server.OnTopicEvent(ctx, in)
354-
assert.NoError(t, err)
355+
require.NoError(t, err)
355356
assert.Equal(t, resp.GetStatus(), runtime.TopicEventResponse_DROP)
356357
})
357358

@@ -391,7 +392,7 @@ func TestTopicWithErrors(t *testing.T) {
391392
PubsubName: sub1.PubsubName,
392393
}
393394
resp, err := server.OnTopicEvent(ctx, in)
394-
assert.Error(t, err)
395+
require.Error(t, err)
395396
assert.Equal(t, resp.GetStatus(), runtime.TopicEventResponse_RETRY)
396397
})
397398

@@ -407,7 +408,7 @@ func TestTopicWithErrors(t *testing.T) {
407408
PubsubName: sub2.PubsubName,
408409
}
409410
resp, err := server.OnTopicEvent(ctx, in)
410-
assert.NoError(t, err)
411+
require.NoError(t, err)
411412
assert.Equal(t, resp.GetStatus(), runtime.TopicEventResponse_DROP)
412413
})
413414

@@ -482,7 +483,7 @@ func TestEventDataHandling(t *testing.T) {
482483
return false, nil
483484
}
484485
err := s.AddTopicEventHandler(sub, handler)
485-
assert.NoErrorf(t, err, "error adding event handler")
486+
require.NoErrorf(t, err, "error adding event handler")
486487

487488
startTestServer(s)
488489

@@ -556,7 +557,7 @@ func TestEventDataHandling(t *testing.T) {
556557
return false, nil
557558
}
558559
err := s.AddBulkTopicEventHandler(sub, handler, 10, 1000)
559-
assert.NoErrorf(t, err, "error adding event handler")
560+
require.NoErrorf(t, err, "error adding event handler")
560561

561562
startTestServer(s)
562563

‎service/http/topic_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestEventNilHandler(t *testing.T) {
5858
Metadata: map[string]string{},
5959
}
6060
err := s.AddTopicEventHandler(sub, nil)
61-
assert.Error(t, err, "expected error adding event handler")
61+
require.Error(t, err, "expected error adding event handler")
6262
})
6363
t.Run("With bulk event handling", func(t *testing.T) {
6464
s := newServer("", nil)
@@ -69,7 +69,7 @@ func TestEventNilHandler(t *testing.T) {
6969
Metadata: map[string]string{},
7070
}
7171
err := s.AddBulkTopicEventHandler(sub, nil, 10, 1000)
72-
assert.Error(t, err, "expected error adding event handler")
72+
require.Error(t, err, "expected error adding event handler")
7373
})
7474
}
7575

@@ -96,7 +96,7 @@ func TestEventHandler(t *testing.T) {
9696
Metadata: map[string]string{},
9797
}
9898
err := s.AddTopicEventHandler(sub, testTopicFunc)
99-
assert.NoError(t, err, "error adding event handler")
99+
require.NoError(t, err, "error adding event handler")
100100

101101
sub2 := &common.Subscription{
102102
PubsubName: "messages",
@@ -105,7 +105,7 @@ func TestEventHandler(t *testing.T) {
105105
Metadata: map[string]string{},
106106
}
107107
err = s.AddTopicEventHandler(sub2, testErrorTopicFunc)
108-
assert.NoError(t, err, "error adding error event handler")
108+
require.NoError(t, err, "error adding error event handler")
109109

110110
sub3 := &common.Subscription{
111111
PubsubName: "messages",
@@ -115,7 +115,7 @@ func TestEventHandler(t *testing.T) {
115115
Priority: 1,
116116
}
117117
err = s.AddTopicEventHandler(sub3, testTopicFunc)
118-
assert.NoError(t, err, "error adding error event handler")
118+
require.NoError(t, err, "error adding error event handler")
119119

120120
s.registerBaseHandler()
121121

@@ -182,7 +182,7 @@ func TestBulkEventHandler(t *testing.T) {
182182
Metadata: map[string]string{},
183183
}
184184
err := s.AddBulkTopicEventHandler(sub, testTopicFunc, 10, 1000)
185-
assert.NoError(t, err, "error adding event handler")
185+
require.NoError(t, err, "error adding event handler")
186186

187187
sub2 := &common.Subscription{
188188
PubsubName: "messages",
@@ -191,7 +191,7 @@ func TestBulkEventHandler(t *testing.T) {
191191
Metadata: map[string]string{},
192192
}
193193
err = s.AddBulkTopicEventHandler(sub2, testErrorTopicFunc, 10, 1000)
194-
assert.NoError(t, err, "error adding error event handler")
194+
require.NoError(t, err, "error adding error event handler")
195195

196196
sub3 := &common.Subscription{
197197
PubsubName: "messages",
@@ -201,7 +201,7 @@ func TestBulkEventHandler(t *testing.T) {
201201
Priority: 1,
202202
}
203203
err = s.AddBulkTopicEventHandler(sub3, testTopicFunc, 10, 1000)
204-
assert.NoError(t, err, "error adding error event handler")
204+
require.NoError(t, err, "error adding error event handler")
205205

206206
s.registerBaseHandler()
207207

@@ -355,7 +355,7 @@ func TestEventDataHandling(t *testing.T) {
355355
return false, nil
356356
}
357357
err := s.AddTopicEventHandler(sub, handler)
358-
assert.NoError(t, err, "error adding event handler")
358+
require.NoError(t, err, "error adding event handler")
359359

360360
s.registerBaseHandler()
361361

@@ -523,7 +523,7 @@ func TestBulkEventDataHandling(t *testing.T) {
523523
return false, nil
524524
}
525525
err := s.AddBulkTopicEventHandler(sub, handler, 5, 1000)
526-
assert.NoError(t, err, "error adding event handler")
526+
require.NoError(t, err, "error adding event handler")
527527

528528
s.registerBaseHandler()
529529

@@ -605,61 +605,61 @@ func makeRequest(t *testing.T, s *Server, route, data, method string, expectedSt
605605
t.Helper()
606606

607607
req, err := http.NewRequest(method, route, strings.NewReader(data))
608-
assert.NoErrorf(t, err, "error creating request: %s", data)
608+
require.NoErrorf(t, err, "error creating request: %s", data)
609609
testRequest(t, s, req, expectedStatusCode)
610610
}
611611

612612
func makeRequestWithExpectedBody(t *testing.T, s *Server, route, data, method string, expectedStatusCode int, expectedBody []byte) {
613613
t.Helper()
614614

615615
req, err := http.NewRequest(method, route, strings.NewReader(data))
616-
assert.NoErrorf(t, err, "error creating request: %s", data)
616+
require.NoErrorf(t, err, "error creating request: %s", data)
617617
testRequestWithResponseBody(t, s, req, expectedStatusCode, expectedBody)
618618
}
619619

620620
func makeEventRequest(t *testing.T, s *Server, route, data string, expectedStatusCode int) {
621621
t.Helper()
622622

623623
req, err := http.NewRequest(http.MethodPost, route, strings.NewReader(data))
624-
assert.NoErrorf(t, err, "error creating request: %s", data)
624+
require.NoErrorf(t, err, "error creating request: %s", data)
625625
req.Header.Set("Content-Type", "application/json")
626626
testRequest(t, s, req, expectedStatusCode)
627627
}
628628

629629
func TestAddingInvalidEventHandlers(t *testing.T) {
630630
s := newServer("", nil)
631631
err := s.AddTopicEventHandler(nil, testTopicFunc)
632-
assert.Error(t, err, "expected error adding no sub event handler")
632+
require.Error(t, err, "expected error adding no sub event handler")
633633

634634
sub := &common.Subscription{Metadata: map[string]string{}}
635635
err = s.AddTopicEventHandler(sub, testTopicFunc)
636-
assert.Error(t, err, "expected error adding empty sub event handler")
636+
require.Error(t, err, "expected error adding empty sub event handler")
637637

638638
sub.Topic = "test"
639639
err = s.AddTopicEventHandler(sub, testTopicFunc)
640-
assert.Error(t, err, "expected error adding sub without component event handler")
640+
require.Error(t, err, "expected error adding sub without component event handler")
641641

642642
sub.PubsubName = "messages"
643643
err = s.AddTopicEventHandler(sub, testTopicFunc)
644-
assert.Error(t, err, "expected error adding sub without route event handler")
644+
require.Error(t, err, "expected error adding sub without route event handler")
645645
}
646646

647647
func TestAddingInvalidBulkEventHandlers(t *testing.T) {
648648
s := newServer("", nil)
649649
err := s.AddBulkTopicEventHandler(nil, testTopicFunc, 10, 1000)
650-
assert.Error(t, err, "expected error adding no sub event handler")
650+
require.Error(t, err, "expected error adding no sub event handler")
651651

652652
sub := &common.Subscription{Metadata: map[string]string{}}
653653
err = s.AddBulkTopicEventHandler(sub, testTopicFunc, 10, 1000)
654-
assert.Error(t, err, "expected error adding empty sub event handler")
654+
require.Error(t, err, "expected error adding empty sub event handler")
655655

656656
sub.Topic = "test"
657657
err = s.AddBulkTopicEventHandler(sub, testTopicFunc, 10, 1000)
658-
assert.Error(t, err, "expected error adding sub without component event handler")
658+
require.Error(t, err, "expected error adding sub without component event handler")
659659

660660
sub.PubsubName = "messages"
661661
err = s.AddBulkTopicEventHandler(sub, testTopicFunc, 10, 1000)
662-
assert.Error(t, err, "expected error adding sub without route event handler")
662+
require.Error(t, err, "expected error adding sub without route event handler")
663663
}
664664

665665
func TestRawPayloadDecode(t *testing.T) {
@@ -671,7 +671,7 @@ func TestRawPayloadDecode(t *testing.T) {
671671
err = errors.New("error decode data_base64")
672672
}
673673
if err != nil {
674-
assert.NoError(t, err, "error rawPayload decode")
674+
require.NoError(t, err, "error rawPayload decode")
675675
}
676676
return
677677
}
@@ -693,7 +693,7 @@ func TestRawPayloadDecode(t *testing.T) {
693693
},
694694
}
695695
err := s.AddTopicEventHandler(sub3, testRawTopicFunc)
696-
assert.NoError(t, err, "error adding raw event handler")
696+
require.NoError(t, err, "error adding raw event handler")
697697

698698
s.registerBaseHandler()
699699
makeEventRequest(t, s, "/raw", rawData, http.StatusOK)
@@ -710,7 +710,7 @@ func TestRawPayloadDecode(t *testing.T) {
710710
},
711711
}
712712
err := s.AddBulkTopicEventHandler(sub3, testRawTopicFunc, 10, 1000)
713-
assert.NoError(t, err, "error adding raw event handler")
713+
require.NoError(t, err, "error adding raw event handler")
714714

715715
s.registerBaseHandler()
716716
makeEventRequest(t, s, "/raw", rawData, http.StatusOK)

0 commit comments

Comments
 (0)