update tests to subscribe on wildcard

Signed-off-by: rodneyosodo <[email protected]>
absmach · Apr 6, 2023 · 30820ee · 30820ee
1 parent ed14de1
commit 30820ee
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 35 deletions.
diff --git a/pkg/messaging/kafka/pubsub_test.go b/pkg/messaging/kafka/pubsub_test.go
@@ -33,44 +33,62 @@ func TestPubsub(t *testing.T) {
 	// require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
 	cases := []struct {
 		desc     string
-		channel  string
+		topic    string
 		subtopic string
 		payload  []byte
+		err      error
 	}{
+		{
+			desc:    "publish message with empty topic",
+			topic:   "",
+			err:     kafka.ErrEmptyTopic,
+			payload: data,
+		},
 		{
 			desc:    "publish message with nil payload",
+			topic:   channel,
 			payload: nil,
+			err:     nil,
 		},
 		{
 			desc:    "publish message with string payload",
+			topic:   channel,
 			payload: data,
+			err:     nil,
 		},
 		{
-			desc:    "publish message with channel",
+			desc:    "publish message with topic",
 			payload: data,
-			channel: channel,
+			topic:   channel,
+			err:     nil,
 		},
 		{
 			desc:     "publish message with subtopic",
 			payload:  data,
 			subtopic: subtopic,
+			err:      kafka.ErrEmptyTopic,
 		},
 		{
-			desc:     "publish message with channel and subtopic",
+			desc:     "publish message with topic and subtopic",
 			payload:  data,
-			channel:  channel,
+			topic:    channel,
 			subtopic: subtopic,
+			err:      nil,
 		},
 	}
 
 	for _, tc := range cases {
 		expectedMsg := messaging.Message{
-			Channel:  tc.channel,
 			Subtopic: tc.subtopic,
 			Payload:  tc.payload,
 		}
-		err := publisher.Publish(topic, &expectedMsg)
-		require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
+		err := publisher.Publish(tc.topic, &expectedMsg)
+		if tc.err == nil {
+			require.Nil(t, err, fmt.Sprintf("%s got unexpected error: %s", tc.desc, err))
+		} else {
+			assert.Equal(t, err, tc.err)
+		}
+
 	}
 
 	// Test Subscribe and Unsubscribe

diff --git a/pkg/messaging/nats/pubsub_test.go b/pkg/messaging/nats/pubsub_test.go
@@ -28,56 +28,62 @@ var (
 )
 
 func TestPublisher(t *testing.T) {
-	err := pubsub.Subscribe(clientID, fmt.Sprintf("%s.%s", chansPrefix, topic), handler{})
-	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-	err = pubsub.Subscribe(clientID, fmt.Sprintf("%s.%s.%s", chansPrefix, topic, subtopic), handler{})
+	err := pubsub.Subscribe(clientID, fmt.Sprintf("%s.>", chansPrefix), handler{})
 	require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
 
 	cases := []struct {
 		desc     string
-		channel  string
+		topic    string
 		subtopic string
 		payload  []byte
+		err      error
 	}{
 		{
 			desc:    "publish message with nil payload",
+			topic:   channel,
 			payload: nil,
+			err:     nil,
 		},
 		{
-			desc:    "publish message with string payload",
+			desc:    "publish message with empty topic",
+			topic:   "",
 			payload: data,
+			err:     nats.ErrEmptyTopic,
 		},
 		{
-			desc:    "publish message with channel",
+			desc:    "publish message with string payload",
+			topic:   channel,
 			payload: data,
-			channel: channel,
+			err:     nil,
 		},
 		{
 			desc:     "publish message with subtopic",
 			payload:  data,
 			subtopic: subtopic,
+			err:      nats.ErrEmptyTopic,
 		},
 		{
-			desc:     "publish message with channel and subtopic",
+			desc:     "publish message with topic and subtopic",
 			payload:  data,
-			channel:  channel,
+			topic:    channel,
 			subtopic: subtopic,
+			err:      nil,
 		},
 	}
 
 	for _, tc := range cases {
 		expectedMsg := messaging.Message{
-			Channel:  tc.channel,
 			Subtopic: tc.subtopic,
 			Payload:  tc.payload,
 		}
-		require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-		err = pubsub.Publish(topic, &expectedMsg)
-		require.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
-
-		receivedMsg := <-msgChan
-		assert.Equal(t, expectedMsg.Payload, receivedMsg.Payload, fmt.Sprintf("%s: expected %+v got %+v\n", tc.desc, &expectedMsg.Payload, receivedMsg.Payload))
+		err = pubsub.Publish(tc.topic, &expectedMsg)
+		if tc.err == nil {
+			require.Nil(t, err, fmt.Sprintf("%s got unexpected error: %s", tc.desc, err))
+			receivedMsg := <-msgChan
+			assert.Equal(t, expectedMsg.Payload, receivedMsg.Payload, fmt.Sprintf("%s: expected %+v got %+v\n", tc.desc, &expectedMsg.Payload, receivedMsg.Payload))
+		} else {
+			assert.Equal(t, err, tc.err)
+		}
 	}
 }
 

diff --git a/pkg/messaging/rabbitmq/pubsub_test.go b/pkg/messaging/rabbitmq/pubsub_test.go
@@ -37,11 +37,8 @@ func TestPublisher(t *testing.T) {
 	conn, ch, err := newConn()
 	assert.Nil(t, err, fmt.Sprintf("got unexpected error: %s", err))
 
-	topicChan := subscribe(t, ch, fmt.Sprintf("%s.%s", chansPrefix, topic))
-	subtopicChan := subscribe(t, ch, fmt.Sprintf("%s.%s.%s", chansPrefix, topic, subtopic))
-
+	topicChan := subscribe(t, ch, fmt.Sprintf("%s.#", chansPrefix))
 	go rabbitHandler(topicChan, handler{})
-	go rabbitHandler(subtopicChan, handler{})
 
 	t.Cleanup(func() {
 		conn.Close()
@@ -78,15 +75,17 @@ func TestPublisher(t *testing.T) {
 	for _, tc := range cases {
 		expectedMsg := messaging.Message{
 			Publisher: clientID,
-			Channel:   tc.channel,
 			Subtopic:  tc.subtopic,
 			Payload:   tc.payload,
 		}
-		err = pubsub.Publish(topic, &expectedMsg)
-		assert.Nil(t, err, fmt.Sprintf("%s: got unexpected error: %s", tc.desc, err))
-
-		receivedMsg := <-msgChan
-		assert.Equal(t, expectedMsg.Payload, receivedMsg.Payload, fmt.Sprintf("%s: expected %+v got %+v\n", tc.desc, &expectedMsg.Payload, receivedMsg.Payload))
+		err := publisher.Publish(tc.topic, &expectedMsg)
+		if tc.err == nil {
+			assert.Nil(t, err, fmt.Sprintf("%s: got unexpected error: %s", tc.desc, err))
+			receivedMsg := <-msgChan
+			assert.Equal(t, expectedMsg.Payload, receivedMsg.Payload, fmt.Sprintf("%s: expected %+v got %+v\n", tc.desc, &expectedMsg.Payload, receivedMsg.Payload))
+		} else {
+			assert.Equal(t, err, tc.err)
+		}
 	}
 	expectedMsg := messaging.Message{
 		Channel:  channel,