From 3fe611e0943c24a2ef886d2838690a88320ef25a Mon Sep 17 00:00:00 2001 From: Daniel Pupius Date: Mon, 21 Apr 2025 11:13:08 -0700 Subject: [PATCH] Update tests to inject loggers - Add logger injection in client_test.go - Add logger injection in broker_test.go - Add test logger with appropriate test namespace - Fix all tests to work with updated constructor signatures --- mqtt/broker_test.go | 14 ++++++++++---- mqtt/client_test.go | 8 ++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mqtt/broker_test.go b/mqtt/broker_test.go index c047c56..fd25920 100644 --- a/mqtt/broker_test.go +++ b/mqtt/broker_test.go @@ -5,6 +5,8 @@ import ( "testing" "time" + "github.com/dpup/prefab/logging" + "meshstream/decoder" ) @@ -14,7 +16,8 @@ func TestBrokerSubscribeUnsubscribe(t *testing.T) { sourceChan := make(chan *Packet, 10) // Create a broker with the source channel - broker := NewBroker(sourceChan) + testLogger := logging.NewDevLogger().Named("test") + broker := NewBroker(sourceChan, testLogger) defer broker.Close() // Subscribe to the broker @@ -99,7 +102,8 @@ func TestBrokerMultipleSubscribers(t *testing.T) { sourceChan := make(chan *Packet, 10) // Create a broker with the source channel - broker := NewBroker(sourceChan) + testLogger := logging.NewDevLogger().Named("test") + broker := NewBroker(sourceChan, testLogger) defer broker.Close() // Create multiple subscribers @@ -144,7 +148,8 @@ func TestBrokerSlowSubscriber(t *testing.T) { sourceChan := make(chan *Packet, 10) // Create a broker with the source channel - broker := NewBroker(sourceChan) + testLogger := logging.NewDevLogger().Named("test") + broker := NewBroker(sourceChan, testLogger) defer broker.Close() // Create a slow subscriber with buffer size 1 @@ -215,7 +220,8 @@ func TestBrokerCloseWithSubscribers(t *testing.T) { sourceChan := make(chan *Packet, 10) // Create a broker with the source channel - broker := NewBroker(sourceChan) + testLogger := logging.NewDevLogger().Named("test") + broker := NewBroker(sourceChan, testLogger) // Subscribe to the broker subscriber := broker.Subscribe(5) diff --git a/mqtt/client_test.go b/mqtt/client_test.go index 248dcdf..62d8f47 100644 --- a/mqtt/client_test.go +++ b/mqtt/client_test.go @@ -3,6 +3,8 @@ package mqtt import ( "testing" "time" + + "github.com/dpup/prefab/logging" ) // TestClientConfig verifies that the client can be created with a config @@ -15,7 +17,8 @@ func TestClientConfig(t *testing.T) { Topic: "test/topic", } - client := NewClient(config) + testLogger := logging.NewDevLogger().Named("test") + client := NewClient(config, testLogger) if client == nil { t.Fatal("Expected client to be created, got nil") } @@ -46,7 +49,8 @@ func TestClientConfig(t *testing.T) { // This test is a mock test and doesn't actually connect to MQTT // It just verifies that the messages channel works as expected func TestMessagesChannel(t *testing.T) { - client := NewClient(Config{}) + testLogger := logging.NewDevLogger().Named("test") + client := NewClient(Config{}, testLogger) ch := client.Messages() // Verify we get the channel