Copy latest code to master

[ric-plt/resource-status-manager.git] / RSM / providers / rmrmsghandlerprovider / message_handler_provider_test.go

diff --git a/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go b/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go
index a43f641..fadcd5c 100644 (file)
--- a/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go
+++ b/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go
@@ -23,8 +23,10 @@ package rmrmsghandlerprovider
 import (
        "fmt"
        "rsm/configuration"
+       "rsm/converters"
+       "rsm/e2pdus"
        "rsm/handlers/rmrmsghandlers"
-       "rsm/managers"
+       "rsm/services"
        "rsm/tests/testhelper"
        "strings"
        "testing"
@@ -42,18 +44,18 @@ func TestGetNotificationHandlerSuccess(t *testing.T) {
        if err != nil {
                t.Errorf("#... - failed to parse configuration error: %s", err)
        }
-       resourceStatusInitiateManager := managers.NewResourceStatusInitiateManager(logger, rnibDataService, rmrSender)
-
+       resourceStatusService := services.NewResourceStatusService(logger, rmrSender)
+       unpacker := converters.NewX2apPduUnpacker(logger, e2pdus.MaxAsn1CodecMessageBufferSize)
        var testCases = []struct {
                msgType int
                handler rmrmsghandlers.RmrMessageHandler
        }{
-               {rmrcgo.RanConnected, rmrmsghandlers.NewResourceStatusInitiateNotificationHandler(logger, config, resourceStatusInitiateManager, RanConnected)},
-               {rmrcgo.RanRestarted, rmrmsghandlers.NewResourceStatusInitiateNotificationHandler(logger, config, resourceStatusInitiateManager, RanRestarted)},
+               {rmrcgo.RanConnected, rmrmsghandlers.NewResourceStatusInitiateNotificationHandler(logger, rnibDataService, resourceStatusService, RanConnected)},
+               {rmrcgo.RanRestarted, rmrmsghandlers.NewResourceStatusInitiateNotificationHandler(logger, rnibDataService, resourceStatusService, RanRestarted)},
        }
 
        for _, tc := range testCases {
-               provider := NewMessageHandlerProvider(logger, config, rnibDataService, rmrSender, resourceStatusInitiateManager, nil)
+               provider := NewMessageHandlerProvider(logger, config, rnibDataService, rmrSender, resourceStatusService, converters.NewResourceStatusResponseConverter(unpacker), converters.NewResourceStatusFailureConverter(unpacker))
                t.Run(fmt.Sprintf("%d", tc.msgType), func(t *testing.T) {
                        handler, err := provider.GetMessageHandler(tc.msgType)
                        if err != nil {
@@ -77,7 +79,8 @@ func TestGetNotificationHandlerFailure(t *testing.T) {
        if err != nil {
                t.Errorf("#... - failed to parse configuration error: %s", err)
        }
-       resourceStatusInitiateManager := managers.NewResourceStatusInitiateManager(logger, rnibDataService, rmrSender)
+       resourceStatusService := services.NewResourceStatusService(logger, rmrSender)
+       unpacker := converters.NewX2apPduUnpacker(logger, e2pdus.MaxAsn1CodecMessageBufferSize)
 
        var testCases = []struct {
                msgType   int
@@ -86,7 +89,7 @@ func TestGetNotificationHandlerFailure(t *testing.T) {
                {9999 /*unknown*/, "notification handler not found"},
        }
        for _, tc := range testCases {
-               provider := NewMessageHandlerProvider(logger, config, rnibDataService, rmrSender, resourceStatusInitiateManager, nil)
+               provider := NewMessageHandlerProvider(logger, config, rnibDataService, rmrSender, resourceStatusService, converters.NewResourceStatusResponseConverter(unpacker), converters.NewResourceStatusFailureConverter(unpacker))
                t.Run(fmt.Sprintf("%d", tc.msgType), func(t *testing.T) {
                        _, err := provider.GetMessageHandler(tc.msgType)
                        if err == nil {