refactor: unit test file

Author: siddhanta-rath

services/mqtt/client/logger_test.go

@@ -10,20 +10,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// testHook captures log entries emitted by logrus.
-type testHook struct {
-	entries []logrus.Entry
-}
-
-func (h *testHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
-
-func (h *testHook) Fire(e *logrus.Entry) error {
-	h.entries = append(h.entries, *e)
-	return nil
-}
-
 func TestLogger_InfoAndError(t *testing.T) {
 	// Arrange
 	baseLogger := logrus.New()
@@ -77,3 +63,17 @@ func TestNewLogger(t *testing.T) {
 	assert.NotNil(t, l.log)
 	assert.Equal(t, logger.GetLogger(), l.log)
 }
+
+// testHook captures log entries emitted by logrus.
+type testHook struct {
+	entries []logrus.Entry
+}
+
+func (h *testHook) Levels() []logrus.Level {
+	return logrus.AllLevels
+}
+
+func (h *testHook) Fire(e *logrus.Entry) error {
+	h.entries = append(h.entries, *e)
+	return nil
+}

services/mqtt/client/pubsub_test.go

@@ -13,36 +13,6 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-// ---- Mock Definitions ----
-
-type mockCourierClient struct {
-	mock.Mock
-}
-
-func (m *mockCourierClient) Start() error {
-	args := m.Called()
-	return args.Error(0)
-}
-func (m *mockCourierClient) Stop() {
-	m.Called()
-}
-func (m *mockCourierClient) IsConnected() bool {
-	args := m.Called()
-	return args.Bool(0)
-}
-
-type mockResolver struct {
-	mock.Mock
-	wg *sync.WaitGroup
-}
-
-func (m *mockResolver) Start() {
-	defer m.wg.Done()
-	m.Called()
-}
-
-// ---- Tests ----
-
 func TestMqttPubSubClient_Start(t *testing.T) {
 
 	t.Run("Start success", func(t *testing.T) {
@@ -141,6 +111,34 @@ func TestNewMqttPubSubClient(t *testing.T) {
 
 }
 
+// ---- Mock Definitions ----
+
+type mockCourierClient struct {
+	mock.Mock
+}
+
+func (m *mockCourierClient) Start() error {
+	args := m.Called()
+	return args.Error(0)
+}
+func (m *mockCourierClient) Stop() {
+	m.Called()
+}
+func (m *mockCourierClient) IsConnected() bool {
+	args := m.Called()
+	return args.Bool(0)
+}
+
+type mockResolver struct {
+	mock.Mock
+	wg *sync.WaitGroup
+}
+
+func (m *mockResolver) Start() {
+	defer m.wg.Done()
+	m.Called()
+}
+
 type MockPubSub struct {
 	mock.Mock
 }

services/mqtt/handler_test.go

@@ -16,8 +16,6 @@ import (
 	"github.com/goto/raccoon/collection"
 )
 
-// --- Tests ---
-
 func TestHandler_MQTTHandler(t *testing.T) {
 	req := pb.SendEventRequest{
 		ReqGuid: "test-1",

services/mqtt/service_test.go

@@ -12,27 +12,6 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-// -------------------- Mock types --------------------
-
-type MockPubSubClient struct {
-	mock.Mock
-}
-
-func (m *MockPubSubClient) Start() error {
-	args := m.Called()
-	return args.Error(0)
-}
-
-func (m *MockPubSubClient) Stop() error {
-	args := m.Called()
-	return args.Error(0)
-}
-
-func (m *MockPubSubClient) IsConnected() bool {
-	args := m.Called()
-	return args.Bool(0)
-}
-
 func TestService_NewMQTTService(t *testing.T) {
 	ctx := context.Background()
 	mockCollector := new(collection.MockCollector)
@@ -134,3 +113,24 @@ func TestService_Name(t *testing.T) {
 	s := &Service{}
 	assert.Equal(t, "MQTT", s.Name())
 }
+
+// -------------------- Mock types --------------------
+
+type MockPubSubClient struct {
+	mock.Mock
+}
+
+func (m *MockPubSubClient) Start() error {
+	args := m.Called()
+	return args.Error(0)
+}
+
+func (m *MockPubSubClient) Stop() error {
+	args := m.Called()
+	return args.Error(0)
+}
+
+func (m *MockPubSubClient) IsConnected() bool {
+	args := m.Called()
+	return args.Bool(0)
+}