X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fproviders%2Fhttpmsghandlerprovider%2Fincoming_request_handler_provider_test.go;h=840d9c23367408c445fd47f161861053cb4fd503;hb=372a275602ae05da22130a4601709291c7fbbaa6;hp=73dfbf655ceb40d04767e0faa59c62a25c8bdc83;hpb=2c9d450c93e4f0b312a68d39429efb685ec02022;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go index 73dfbf6..840d9c2 100644 --- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go +++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go @@ -27,12 +27,10 @@ import ( "e2mgr/logger" "e2mgr/managers" "e2mgr/mocks" - "e2mgr/rNibWriter" "e2mgr/rmrCgo" "e2mgr/services" "e2mgr/services/rmrsender" "e2mgr/tests" - "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader" "github.com/stretchr/testify/assert" "reflect" "testing" @@ -41,23 +39,20 @@ import ( func getRmrSender(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *rmrsender.RmrSender { rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock) rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger) - return rmrsender.NewRmrSender(log, &rmrMessenger) + return rmrsender.NewRmrSender(log, rmrMessenger) } func setupTest(t *testing.T) *IncomingRequestHandlerProvider { rmrMessengerMock := &mocks.RmrMessengerMock{} log := initLog(t) config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3} - readerProvider := func() reader.RNibReader { - return &mocks.RnibReaderMock{} - } - writerProvider := func() rNibWriter.RNibWriter { - return &mocks.RnibWriterMock{} - } - rnibDataService := services.NewRnibDataService(log, config, readerProvider, writerProvider) + readerMock := &mocks.RnibReaderMock{} + writerMock := &mocks.RnibWriterMock{} + rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock) rmrSender := getRmrSender(rmrMessengerMock, log) ranSetupManager := managers.NewRanSetupManager(log, rmrSender, rnibDataService) - return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager) + e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, log) + return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager, e2tInstancesManager) } func TestNewIncomingRequestHandlerProvider(t *testing.T) {