@@ -2,7 +2,6 @@ package tests
22
33import (
44 "context"
5- "encoding/json"
65 "fmt"
76 "testing"
87 "time"
@@ -36,9 +35,9 @@ func TestDeadLetterReceivesEvent(t *testing.T) {
3635 return fmt .Errorf ("error, this event will go to dead-letter" )
3736 }
3837
39- var eventFromDeadLetter bunnify.ConsumableEvent [json. RawMessage ]
40- defaultHandler := func (ctx context.Context , event bunnify.ConsumableEvent [json. RawMessage ]) error {
41- eventFromDeadLetter = event
38+ var deadEvent bunnify.ConsumableEvent [orderCreated ]
39+ deadEventHandler := func (ctx context.Context , event bunnify.ConsumableEvent [orderCreated ]) error {
40+ deadEvent = event
4241 return nil
4342 }
4443
@@ -61,7 +60,7 @@ func TestDeadLetterReceivesEvent(t *testing.T) {
6160
6261 deadLetterConsumer := connection .NewConsumer (
6362 deadLetterQueueName ,
64- bunnify .WithDefaultHandler ( defaultHandler ))
63+ bunnify .WithHandler ( routingKey , deadEventHandler ))
6564
6665 if err := deadLetterConsumer .Consume (); err != nil {
6766 t .Fatal (err )
@@ -81,32 +80,27 @@ func TestDeadLetterReceivesEvent(t *testing.T) {
8180 }
8281
8382 // Assert
84- if publishedEvent .ID != eventFromDeadLetter .ID {
85- t .Fatalf ("expected event ID %s, got %s" , publishedEvent .ID , eventFromDeadLetter .ID )
83+ if publishedEvent .ID != deadEvent .ID {
84+ t .Fatalf ("expected event ID %s, got %s" , publishedEvent .ID , deadEvent .ID )
8685 }
87- if publishedEvent .CorrelationID != eventFromDeadLetter .CorrelationID {
88- t .Fatalf ("expected correlation ID %s, got %s" , publishedEvent .CorrelationID , eventFromDeadLetter .CorrelationID )
86+ if publishedEvent .CorrelationID != deadEvent .CorrelationID {
87+ t .Fatalf ("expected correlation ID %s, got %s" , publishedEvent .CorrelationID , deadEvent .CorrelationID )
8988 }
90- if ! publishedEvent .Timestamp .Equal (eventFromDeadLetter .Timestamp ) {
91- t .Fatalf ("expected timestamp %s, got %s" , publishedEvent .Timestamp , eventFromDeadLetter .Timestamp )
89+ if ! publishedEvent .Timestamp .Equal (deadEvent .Timestamp ) {
90+ t .Fatalf ("expected timestamp %s, got %s" , publishedEvent .Timestamp , deadEvent .Timestamp )
9291 }
9392
94- var jsonData map [string ]interface {}
95- if err = json .Unmarshal (eventFromDeadLetter .Payload , & jsonData ); err != nil {
96- t .Fatal (err )
97- }
98-
99- if publishedOrderCreated .ID != jsonData ["id" ].(string ) {
100- t .Fatalf ("expected order created ID %s, got %s" , publishedOrderCreated .ID , jsonData ["id" ].(string ))
93+ if publishedOrderCreated .ID != deadEvent .Payload .ID {
94+ t .Fatalf ("expected order created ID %s, got %s" , publishedOrderCreated .ID , deadEvent .Payload .ID )
10195 }
102- if exchangeName != eventFromDeadLetter .DeliveryInfo .Exchange {
103- t .Fatalf ("expected exchange %s, got %s" , exchangeName , eventFromDeadLetter .DeliveryInfo .Exchange )
96+ if exchangeName != deadEvent .DeliveryInfo .Exchange {
97+ t .Fatalf ("expected exchange %s, got %s" , exchangeName , deadEvent .DeliveryInfo .Exchange )
10498 }
105- if queueName != eventFromDeadLetter .DeliveryInfo .Queue {
106- t .Fatalf ("expected queue %s, got %s" , queueName , eventFromDeadLetter .DeliveryInfo .Queue )
99+ if queueName != deadEvent .DeliveryInfo .Queue {
100+ t .Fatalf ("expected queue %s, got %s" , queueName , deadEvent .DeliveryInfo .Queue )
107101 }
108- if routingKey != eventFromDeadLetter .DeliveryInfo .RoutingKey {
109- t .Fatalf ("expected routing key %s, got %s" , routingKey , eventFromDeadLetter .DeliveryInfo .RoutingKey )
102+ if routingKey != deadEvent .DeliveryInfo .RoutingKey {
103+ t .Fatalf ("expected routing key %s, got %s" , routingKey , deadEvent .DeliveryInfo .RoutingKey )
110104 }
111105
112106 goleak .VerifyNone (t )
0 commit comments