[RIC-475] [RIC-507] Inject RanStatusChangeManager | Enhance E2 Setup flow | Remove...

[ric-plt/e2mgr.git] / E2Manager / providers / httpmsghandlerprovider / incoming_request_handler_provider_test.go

diff --git a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
index 840d9c2..f359788 100644 (file)
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -21,6 +21,7 @@
 package httpmsghandlerprovider
 
 import (
+       "e2mgr/clients"
        "e2mgr/configuration"
        "e2mgr/e2managererrors"
        "e2mgr/handlers/httpmsghandlers"
@@ -46,13 +47,20 @@ func setupTest(t *testing.T) *IncomingRequestHandlerProvider {
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        log := initLog(t)
        config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
+       config.RoutingManager.BaseUrl = "http://10.10.2.15:12020/routingmanager"
        readerMock := &mocks.RnibReaderMock{}
        writerMock := &mocks.RnibWriterMock{}
        rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock)
        rmrSender := getRmrSender(rmrMessengerMock, log)
        ranSetupManager := managers.NewRanSetupManager(log, rmrSender, rnibDataService)
        e2tInstancesManager := managers.NewE2TInstancesManager(rnibDataService, log)
-       return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager, e2tInstancesManager)
+       httpClientMock := &mocks.HttpClientMock{}
+       rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock)
+       ranListManager := managers.NewRanListManager(log)
+       ranAlarmService := services.NewRanAlarmService(log, config)
+       ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(log, rnibDataService,ranListManager, ranAlarmService)
+       e2tAssociationManager := managers.NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager)
+       return NewIncomingRequestHandlerProvider(log, rmrSender, configuration.ParseConfiguration(), rnibDataService, ranSetupManager, e2tInstancesManager, e2tAssociationManager, rmClient)
 }
 
 func TestNewIncomingRequestHandlerProvider(t *testing.T) {
@@ -73,26 +81,14 @@ func TestShutdownRequestHandler(t *testing.T) {
        assert.True(t, ok)
 }
 
-func TestX2SetupRequestHandler(t *testing.T) {
+func TestSetGeneralConfigurationHandler(t *testing.T) {
        provider := setupTest(t)
-       handler, err := provider.GetHandler(X2SetupRequest)
+       handler, err := provider.GetHandler(SetGeneralConfigurationRequest)
 
        assert.NotNil(t, provider)
        assert.Nil(t, err)
 
-       _, ok := handler.(*httpmsghandlers.SetupRequestHandler)
-
-       assert.True(t, ok)
-}
-
-func TestEndcSetupRequestHandler(t *testing.T) {
-       provider := setupTest(t)
-       handler, err := provider.GetHandler(EndcSetupRequest)
-
-       assert.NotNil(t, provider)
-       assert.Nil(t, err)
-
-       _, ok := handler.(*httpmsghandlers.SetupRequestHandler)
+       _, ok := handler.(*httpmsghandlers.SetGeneralConfigurationHandler)
 
        assert.True(t, ok)
 }