broker refactor

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

broker/memory/memory_test.go

@@ -5,12 +5,23 @@ import (
 	"fmt"
 	"testing"
 
+	"go.uber.org/atomic"
 	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/metadata"
 )
 
+type hldr struct {
+	c atomic.Int64
+}
+
+func (h *hldr) Handler(m broker.Message) error {
+	h.c.Add(1)
+	return nil
+}
+
 func TestMemoryBroker(t *testing.T) {
-	b := NewBroker()
+	b := NewBroker(broker.Codec("application/octet-stream", codec.NewCodec()))
 	ctx := context.Background()
 
 	if err := b.Init(); err != nil {
@@ -22,28 +33,27 @@ func TestMemoryBroker(t *testing.T) {
 	}
 
 	topic := "test"
-	count := 10
+	count := int64(10)
 
-	fn := func(_ broker.Message) error {
-		return nil
-	}
+	h := &hldr{}
 
-	sub, err := b.Subscribe(ctx, topic, fn)
+	sub, err := b.Subscribe(ctx, topic, h.Handler)
 	if err != nil {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]*broker.Message, 0, count)
-	for i := 0; i < count; i++ {
-		message, err := b.NewMessage(ctx, metadata.Pairs()
-			Header: map[string]string{
-				metadata.HeaderTopic: topic,
-				"foo":                "bar",
-				"id":                 fmt.Sprintf("%d", i),
-			},
+	for i := int64(0); i < count; i++ {
+		message, err := b.NewMessage(ctx,
+			metadata.Pairs(
+				"foo", "bar",
+				"id", fmt.Sprintf("%d", i),
+			),
 			[]byte(`"hello world"`),
+			broker.PublishContentType("application/octet-stream"),
+		)
+		if err != nil {
+			t.Fatal(err)
 		}
-		msgs = append(msgs, message)
 
 		if err := b.Publish(ctx, topic, message); err != nil {
 			t.Fatalf("Unexpected error publishing %d err: %v", i, err)
@@ -57,4 +67,8 @@ func TestMemoryBroker(t *testing.T) {
 	if err := b.Disconnect(ctx); err != nil {
 		t.Fatalf("Unexpected connect error %v", err)
 	}
+
+	if h.c.Load() != count {
+		t.Fatal("invalid messages count received")
+	}
 }