X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=E2Manager%2Fservices%2Freceivers%2Frmr_service_receiver_test.go;h=45a50c9d1c952625c6c04a9cf7d321d0e7bfe363;hb=19e72a51b5edbf108d230093fdf85b42fe5ab470;hp=937a7c56900db3d74ce404cecfae583d545d5746;hpb=f9e31bbb0a80ae78cf72eabea8303c28abcdb2e8;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/services/receivers/rmr_service_receiver_test.go b/E2Manager/services/receivers/rmr_service_receiver_test.go index 937a7c5..45a50c9 100644 --- a/E2Manager/services/receivers/rmr_service_receiver_test.go +++ b/E2Manager/services/receivers/rmr_service_receiver_test.go @@ -18,8 +18,10 @@ package receivers import ( + "e2mgr/configuration" "e2mgr/logger" "e2mgr/managers" + "e2mgr/managers/notificationmanager" "e2mgr/mocks" "e2mgr/models" "e2mgr/rNibWriter" @@ -33,9 +35,9 @@ import ( "time" ) -func TestListenAndHandle(t *testing.T){ +func TestListenAndHandle(t *testing.T) { log, err := logger.InitLogger(logger.DebugLevel) - if err!=nil{ + if err != nil { t.Errorf("#rmr_service_test.TestListenAndHandle - failed to initialize logger, error: %s", err) } rmrMessengerMock := &mocks.RmrMessengerMock{} @@ -44,20 +46,20 @@ func TestListenAndHandle(t *testing.T){ e := fmt.Errorf("test error") rmrMessengerMock.On("RecvMsg").Return(buf, e) - go getRmrServiceReceiver(rmrMessengerMock,log).ListenAndHandle() + go getRmrServiceReceiver(rmrMessengerMock, log).ListenAndHandle() - time.Sleep(time.Microsecond*10) + time.Sleep(time.Microsecond * 10) } func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *services.RmrService { rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock) messageChannel := make(chan *models.NotificationResponse) rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger) - return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel) + return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel) } -func getRmrServiceReceiver(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *RmrServiceReceiver { - readerMock :=&mocks.RnibReaderMock{} +func getRmrServiceReceiver(rmrMessengerMock *mocks.RmrMessengerMock, logger *logger.Logger) *RmrServiceReceiver { + readerMock := &mocks.RnibReaderMock{} rnibReaderProvider := func() reader.RNibReader { return readerMock } @@ -65,7 +67,12 @@ func getRmrServiceReceiver(rmrMessengerMock *mocks.RmrMessengerMock, log *logger rnibWriterProvider := func() rNibWriter.RNibWriter { return writerMock } - nManager := managers.NewNotificationManager(rnibReaderProvider, rnibWriterProvider) - rmrService := getRmrService(rmrMessengerMock,log) + + rmrService := getRmrService(rmrMessengerMock, logger) + + ranSetupManager := managers.NewRanSetupManager(logger, rmrService, rnibReaderProvider, rnibWriterProvider) + ranReconnectionManager := managers.NewRanReconnectionManager(logger, configuration.ParseConfiguration(), rnibReaderProvider, rnibWriterProvider, ranSetupManager) + nManager := notificationmanager.NewNotificationManager(rnibReaderProvider, rnibWriterProvider, ranReconnectionManager) + return NewRmrServiceReceiver(*rmrService, nManager) -} \ No newline at end of file +}