@@ -29,29 +29,29 @@ import (
29
29
func TestTopicErrors (t * testing.T ) {
30
30
server := getTestServer ()
31
31
err := server .AddTopicEventHandler (nil , nil )
32
- require .Errorf (t , err , "expected error on nil sub with AddTopicEventHandler" )
32
+ require .Error (t , err , "expected error on nil sub with AddTopicEventHandler" )
33
33
34
34
err = server .AddBulkTopicEventHandler (nil , nil , 0 , 0 )
35
- require .Errorf (t , err , "expected error on nil sub with AddBulkTopicEventHandler" )
35
+ require .Error (t , err , "expected error on nil sub with AddBulkTopicEventHandler" )
36
36
37
37
sub := & common.Subscription {}
38
38
err = server .AddTopicEventHandler (sub , nil )
39
- require .Errorf (t , err , "expected error on invalid sub with AddTopicEventHandler" )
39
+ require .Error (t , err , "expected error on invalid sub with AddTopicEventHandler" )
40
40
err = server .AddBulkTopicEventHandler (sub , nil , 0 , 0 )
41
- require .Errorf (t , err , "expected error on invalid sub with AddBulkTopicEventHandler" )
41
+ require .Error (t , err , "expected error on invalid sub with AddBulkTopicEventHandler" )
42
42
43
43
sub .PubsubName = "messages"
44
44
err = server .AddTopicEventHandler (sub , nil )
45
- require .Errorf (t , err , "expected error on sub without topic with AddTopicEventHandler" )
45
+ require .Error (t , err , "expected error on sub without topic with AddTopicEventHandler" )
46
46
sub .PubsubName = "messages"
47
47
err = server .AddBulkTopicEventHandler (sub , nil , 0 , 0 )
48
- require .Errorf (t , err , "expected error on sub without topic with AddBulkTopicEventHandler" )
48
+ require .Error (t , err , "expected error on sub without topic with AddBulkTopicEventHandler" )
49
49
50
50
sub .Topic = "test"
51
51
err = server .AddTopicEventHandler (sub , nil )
52
- require .Errorf (t , err , "expected error on sub without handler" )
52
+ require .Error (t , err , "expected error on sub without handler" )
53
53
err = server .AddBulkTopicEventHandler (sub , nil , 0 , 0 )
54
- require .Errorf (t , err , "expected error on sub without handler" )
54
+ require .Error (t , err , "expected error on sub without handler" )
55
55
}
56
56
57
57
func TestTopicSubscriptionList (t * testing.T ) {
@@ -64,7 +64,7 @@ func TestTopicSubscriptionList(t *testing.T) {
64
64
Route : "/test" ,
65
65
}
66
66
err := server .AddTopicEventHandler (sub1 , eventHandler )
67
- assert . Nil (t , err )
67
+ require . NoError (t , err )
68
68
resp , err := server .ListTopicSubscriptions (context .Background (), & empty.Empty {})
69
69
require .NoError (t , err )
70
70
assert .NotNil (t , resp )
@@ -83,7 +83,7 @@ func TestTopicSubscriptionList(t *testing.T) {
83
83
Match : `event.type == "other"` ,
84
84
}
85
85
err = server .AddTopicEventHandler (sub2 , eventHandler )
86
- assert . Nil (t , err )
86
+ require . NoError (t , err )
87
87
resp , err = server .ListTopicSubscriptions (context .Background (), & empty.Empty {})
88
88
require .NoError (t , err )
89
89
assert .NotNil (t , resp )
@@ -109,7 +109,7 @@ func TestTopicSubscriptionList(t *testing.T) {
109
109
Route : "/test" ,
110
110
}
111
111
err := server .AddBulkTopicEventHandler (sub1 , eventHandler , 10 , 1000 )
112
- assert . Nil (t , err )
112
+ require . NoError (t , err )
113
113
resp , err := server .ListTopicSubscriptions (context .Background (), & empty.Empty {})
114
114
require .NoError (t , err )
115
115
assert .NotNil (t , resp )
@@ -128,7 +128,7 @@ func TestTopicSubscriptionList(t *testing.T) {
128
128
Match : `event.type == "other"` ,
129
129
}
130
130
err = server .AddBulkTopicEventHandler (sub2 , eventHandler , 10 , 1000 )
131
- assert . Nil (t , err )
131
+ require . NoError (t , err )
132
132
resp , err = server .ListTopicSubscriptions (context .Background (), & empty.Empty {})
133
133
require .NoError (t , err )
134
134
assert .NotNil (t , resp )
@@ -160,7 +160,7 @@ func TestTopic(t *testing.T) {
160
160
server := getTestServer ()
161
161
162
162
err := server .AddTopicEventHandler (sub , eventHandler )
163
- assert . Nil (t , err )
163
+ require . NoError (t , err )
164
164
165
165
startTestServer (server )
166
166
@@ -204,7 +204,7 @@ func TestTopic(t *testing.T) {
204
204
server := getTestServer ()
205
205
206
206
err := server .AddBulkTopicEventHandler (sub , eventHandler , 10 , 1000 )
207
- assert . Nil (t , err )
207
+ require . NoError (t , err )
208
208
209
209
startTestServer (server )
210
210
@@ -252,7 +252,7 @@ func TestTopicWithValidationDisabled(t *testing.T) {
252
252
server := getTestServer ()
253
253
254
254
err := server .AddTopicEventHandler (sub , eventHandler )
255
- assert . Nil (t , err )
255
+ require . NoError (t , err )
256
256
257
257
startTestServer (server )
258
258
@@ -281,7 +281,7 @@ func TestTopicWithValidationDisabled(t *testing.T) {
281
281
server := getTestServer ()
282
282
283
283
err := server .AddBulkTopicEventHandler (sub , eventHandler , 10 , 1000 )
284
- assert . Nil (t , err )
284
+ require . NoError (t , err )
285
285
286
286
startTestServer (server )
287
287
@@ -317,10 +317,10 @@ func TestTopicWithErrors(t *testing.T) {
317
317
server := getTestServer ()
318
318
319
319
err := server .AddTopicEventHandler (sub1 , eventHandlerWithRetryError )
320
- assert . Nil (t , err )
320
+ require . NoError (t , err )
321
321
322
322
err = server .AddTopicEventHandler (sub2 , eventHandlerWithError )
323
- assert . Nil (t , err )
323
+ require . NoError (t , err )
324
324
325
325
startTestServer (server )
326
326
@@ -373,10 +373,10 @@ func TestTopicWithErrors(t *testing.T) {
373
373
server := getTestServer ()
374
374
375
375
err := server .AddBulkTopicEventHandler (sub1 , eventHandlerWithRetryError , 10 , 1000 )
376
- assert . Nil (t , err )
376
+ require . NoError (t , err )
377
377
378
378
err = server .AddBulkTopicEventHandler (sub2 , eventHandlerWithError , 10 , 1000 )
379
- assert . Nil (t , err )
379
+ require . NoError (t , err )
380
380
381
381
startTestServer (server )
382
382
@@ -483,7 +483,7 @@ func TestEventDataHandling(t *testing.T) {
483
483
return false , nil
484
484
}
485
485
err := s .AddTopicEventHandler (sub , handler )
486
- require .NoErrorf (t , err , "error adding event handler" )
486
+ require .NoError (t , err , "error adding event handler" )
487
487
488
488
startTestServer (s )
489
489
@@ -557,7 +557,7 @@ func TestEventDataHandling(t *testing.T) {
557
557
return false , nil
558
558
}
559
559
err := s .AddBulkTopicEventHandler (sub , handler , 10 , 1000 )
560
- require .NoErrorf (t , err , "error adding event handler" )
560
+ require .NoError (t , err , "error adding event handler" )
561
561
562
562
startTestServer (s )
563
563
0 commit comments