refac: log entries and mocks

telekom · Jan 29, 2025 · b9df6bb · b9df6bb
1 parent 4be67c9
commit b9df6bb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/internal/handler/delivering_test.go b/internal/handler/delivering_test.go
@@ -28,12 +28,12 @@ func TestCheckDeliveringEvents_Success(t *testing.T) {
 	mockPicker := new(test.MockPicker)
 	test.InjectMockPicker(mockPicker)
 
-	deliveringHandler := new(test.DeliveringMockHandler)
-	cache.HandlerCache = deliveringHandler
+	handlerCache := new(test.MockHandlerCache)
+	cache.HandlerCache = handlerCache
 
-	deliveringHandler.On("NewLockContext", mock.Anything).Return(context.Background())
-	deliveringHandler.On("TryLockWithTimeout", mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
-	deliveringHandler.On("Unlock", mock.Anything, mock.Anything).Return(nil)
+	handlerCache.On("NewLockContext", mock.Anything).Return(context.Background())
+	handlerCache.On("TryLockWithTimeout", mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
+	handlerCache.On("Unlock", mock.Anything, mock.Anything).Return(nil)
 
 	config.Current.Republishing.BatchSize = 5
 	config.Current.Republishing.DeliveringStatesOffset = 30 * time.Minute
@@ -94,15 +94,15 @@ func TestCheckDeliveringEvents_NoEvents(t *testing.T) {
 	mockKafka := new(test.MockKafkaHandler)
 	kafka.CurrentHandler = mockKafka
 
-	deliveringHandler := new(test.DeliveringMockHandler)
-	cache.HandlerCache = deliveringHandler
+	handlerCache := new(test.MockHandlerCache)
+	cache.HandlerCache = handlerCache
 
 	mockPicker := new(test.MockPicker)
 	test.InjectMockPicker(mockPicker)
 
-	deliveringHandler.On("NewLockContext", mock.Anything).Return(context.Background())
-	deliveringHandler.On("TryLockWithTimeout", mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
-	deliveringHandler.On("Unlock", mock.Anything, mock.Anything).Return(nil)
+	handlerCache.On("NewLockContext", mock.Anything).Return(context.Background())
+	handlerCache.On("TryLockWithTimeout", mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
+	handlerCache.On("Unlock", mock.Anything, mock.Anything).Return(nil)
 
 	config.Current.Republishing.BatchSize = 5
 	config.Current.Republishing.DeliveringStatesOffset = 30 * time.Minute

diff --git a/internal/handler/failed_test.go b/internal/handler/failed_test.go
@@ -29,15 +29,15 @@ func TestCheckFailedEvents(t *testing.T) {
 	mockCache := new(test.SubscriptionMockCache)
 	cache.SubscriptionCache = mockCache
 
-	failedHandler := new(test.FailedMockHandler)
-	cache.HandlerCache = failedHandler
+	handlerCache := new(test.MockHandlerCache)
+	cache.HandlerCache = handlerCache
 
 	mockPicker := new(test.MockPicker)
 	test.InjectMockPicker(mockPicker)
 
-	failedHandler.On("NewLockContext", mock.Anything).Return(context.Background())
-	failedHandler.On("TryLockWithTimeout", mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
-	failedHandler.On("Unlock", mock.Anything, mock.Anything).Return(nil)
+	handlerCache.On("NewLockContext", mock.Anything).Return(context.Background())
+	handlerCache.On("TryLockWithTimeout", mock.Anything, mock.Anything, mock.Anything).Return(true, nil)
+	handlerCache.On("Unlock", mock.Anything, mock.Anything).Return(nil)
 
 	config.Current.Republishing.BatchSize = 5
 

diff --git a/internal/handler/waiting.go b/internal/handler/waiting.go
@@ -55,7 +55,7 @@ func (waitingHandler *waitingHandler) CheckWaitingEvents() {
 	}
 
 	// If no subscriptions found, return
-	log.Debug().Msgf("Found %i subscriptions with waiting messages: %v", len(dbSubscriptionsForWaitingEvents), dbSubscriptionsForWaitingEvents)
+	log.Debug().Msgf("Found %d subscriptions with waiting messages: %v", len(dbSubscriptionsForWaitingEvents), dbSubscriptionsForWaitingEvents)
 	if len(dbSubscriptionsForWaitingEvents) == 0 {
 		return
 	}
@@ -66,15 +66,15 @@ func (waitingHandler *waitingHandler) CheckWaitingEvents() {
 		log.Error().Err(err).Msgf("Error while fetching rebublishing cache entries for events stucked in state WAITING")
 		return
 	}
-	log.Debug().Msgf("Found %i rebublishing entries: %v", len(republishingSubscriptionsMap), republishingSubscriptionsMap)
+	log.Debug().Msgf("Found %d rebublishing entries: %v", len(republishingSubscriptionsMap), republishingSubscriptionsMap)
 
 	// Get all circuit-breaker entries with status OPEN
 	circuitBreakerSubscriptionsMap, err := WaitingHandlerService.GetCircuitBreakerSubscriptionsMap()
 	if err != nil {
 		log.Error().Err(err).Msgf("Error while fetching circuit breaker cache entries for events stucked in state WAITING")
 		return
 	}
-	log.Debug().Msgf("Found %i circuitbreaker entries in state OPEN: %v", len(circuitBreakerSubscriptionsMap), circuitBreakerSubscriptionsMap)
+	log.Debug().Msgf("Found %d circuitbreaker entries in state OPEN: %v", len(circuitBreakerSubscriptionsMap), circuitBreakerSubscriptionsMap)
 
 	// Check if subscription is in republishing cache or in circuit breaker cache. If not create a republishing cache entry
 	for _, subscriptionId := range dbSubscriptionsForWaitingEvents {

diff --git a/internal/test/waitinghandler_mock.go b/internal/test/waitinghandler_mock.go
@@ -1,3 +1,7 @@
+// Copyright 2025 Deutsche Telekom IT GmbH
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package test
 
 import "github.com/stretchr/testify/mock"