X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RSM%2Fproviders%2Frmrmsghandlerprovider%2Fmessage_handler_provider_test.go;h=fadcd5c1b018a8de3f82f2ae566b04a33229fb92;hb=refs%2Fchanges%2F70%2F2070%2F1;hp=9e7a7c23a84f5cb5cbbe7af71177ac0c1f89599f;hpb=7b80668df78103cebafdfb7caa0070dc92ed3779;p=ric-plt%2Fresource-status-manager.git

diff --git a/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go b/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go
index 9e7a7c2..fadcd5c 100644
--- a/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go
+++ b/RSM/providers/rmrmsghandlerprovider/message_handler_provider_test.go
@@ -13,15 +13,20 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 
 package rmrmsghandlerprovider
 
 import (
 	"fmt"
 	"rsm/configuration"
+	"rsm/converters"
+	"rsm/e2pdus"
 	"rsm/handlers/rmrmsghandlers"
-	"rsm/managers"
+	"rsm/services"
 	"rsm/tests/testhelper"
 	"strings"
 	"testing"
@@ -39,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 {
@@ -74,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
@@ -83,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 {