X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=E2Manager%2Fproviders%2Fhttpmsghandlerprovider%2Fincoming_request_handler_provider_test.go;h=393b800da252397547b263a8644096fe2c2e86d8;hb=refs%2Fchanges%2F43%2F943%2F1;hp=718704bc4c5de54e94a46ab83a16b8b2468398e0;hpb=19e72a51b5edbf108d230093fdf85b42fe5ab470;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 718704b..393b800 100644
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -20,14 +20,14 @@ package httpmsghandlerprovider
 import (
 	"e2mgr/configuration"
 	"e2mgr/e2managererrors"
-	"e2mgr/handlers"
+	"e2mgr/handlers/httpmsghandlers"
 	"e2mgr/logger"
+	"e2mgr/managers"
 	"e2mgr/mocks"
 	"e2mgr/models"
 	"e2mgr/rNibWriter"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
-	"e2mgr/sessions"
 	"e2mgr/tests"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 	"github.com/stretchr/testify/assert"
@@ -39,69 +39,68 @@ func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger)
 	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, messageChannel)
 }
 
-func TestNewIncomingRequestHandlerProvider(t *testing.T) {
+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)
+	ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rnibDataService)
+	return NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), rnibDataService, ranSetupManager)
+}
 
-	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider)
-	/*if provider == nil {
-		t.Errorf("want: provider, got: nil")
-	}*/
+func TestNewIncomingRequestHandlerProvider(t *testing.T) {
+	provider := setupTest(t)
 
 	assert.NotNil(t, provider)
 }
 
 func TestShutdownRequestHandler(t *testing.T) {
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
+	provider := setupTest(t)
+	handler, err := provider.GetHandler(ShutdownRequest)
 
-	log := initLog(t)
-	readerProvider := func() reader.RNibReader {
-		return &mocks.RnibReaderMock{}
-	}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return &mocks.RnibWriterMock{}
-	}
+	assert.NotNil(t, provider)
+	assert.Nil(t, err)
 
-	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider)
+	_, ok := handler.(*httpmsghandlers.DeleteAllRequestHandler)
 
-	handler, err := provider.GetHandler(ShutdownRequest)
+	assert.True(t, ok)
+}
+
+func TestX2SetupRequestHandler(t *testing.T) {
+	provider := setupTest(t)
+	handler, err := provider.GetHandler(X2SetupRequest)
 
-	/*if handler == nil {
-		t.Errorf("failed to get x2 setup handler")
-	}*/
 	assert.NotNil(t, provider)
 	assert.Nil(t, err)
 
-	_, ok := handler.(*handlers.DeleteAllRequestHandler)
+	_, ok := handler.(*httpmsghandlers.SetupRequestHandler)
 
 	assert.True(t, ok)
-	/*if !ok {
-		t.Errorf("failed to delete all handler")
-	}*/
 }
 
-func TestGetShutdownHandlerFailure(t *testing.T) {
-	rmrMessengerMock := &mocks.RmrMessengerMock{}
-	log := initLog(t)
-	readerProvider := func() reader.RNibReader {
-		return &mocks.RnibReaderMock{}
-	}
-	writerProvider := func() rNibWriter.RNibWriter {
-		return &mocks.RnibWriterMock{}
-	}
+func TestEndcSetupRequestHandler(t *testing.T) {
+	provider := setupTest(t)
+	handler, err := provider.GetHandler(EndcSetupRequest)
+
+	assert.NotNil(t, provider)
+	assert.Nil(t, err)
 
-	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider)
+	_, ok := handler.(*httpmsghandlers.SetupRequestHandler)
 
+	assert.True(t, ok)
+}
+
+func TestGetShutdownHandlerFailure(t *testing.T) {
+	provider := setupTest(t)
 	_, actual := provider.GetHandler("test")
 	expected := &e2managererrors.InternalError{}