X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fproviders%2Fhttpmsghandlerprovider%2Fincoming_request_handler_provider_test.go;h=91abb0e5d2394edb09b60af5cd4cf82ce6ea3b16;hb=33f84e1a0998af025880be3e8eb087fac34af731;hp=a6c4e493ccc8d697dacf747a893e108bf4c8f462;hpb=0e58b60a82f5912f815be9292fe0c072a80b79a7;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 a6c4e49..91abb0e 100644
--- a/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
+++ b/E2Manager/providers/httpmsghandlerprovider/incoming_request_handler_provider_test.go
@@ -22,6 +22,7 @@ import (
 	"e2mgr/e2managererrors"
 	"e2mgr/handlers/httpmsghandlers"
 	"e2mgr/logger"
+	"e2mgr/managers"
 	"e2mgr/mocks"
 	"e2mgr/models"
 	"e2mgr/rNibWriter"
@@ -52,11 +53,8 @@ func TestNewIncomingRequestHandlerProvider(t *testing.T) {
 	writerProvider := func() rNibWriter.RNibWriter {
 		return &mocks.RnibWriterMock{}
 	}
-
-	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider)
-	/*if provider == nil {
-		t.Errorf("want: provider, got: nil")
-	}*/
+	ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
 
 	assert.NotNil(t, provider)
 }
@@ -72,22 +70,65 @@ func TestShutdownRequestHandler(t *testing.T) {
 		return &mocks.RnibWriterMock{}
 	}
 
-	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider)
+	ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
 
 	handler, err := provider.GetHandler(ShutdownRequest)
 
-	/*if handler == nil {
-		t.Errorf("failed to get x2 setup handler")
-	}*/
 	assert.NotNil(t, provider)
 	assert.Nil(t, err)
 
 	_, ok := handler.(*httpmsghandlers.DeleteAllRequestHandler)
 
 	assert.True(t, ok)
-	/*if !ok {
-		t.Errorf("failed to delete all handler")
-	}*/
+}
+
+func TestX2SetupRequestHandler(t *testing.T) {
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
+
+	log := initLog(t)
+	readerProvider := func() reader.RNibReader {
+		return &mocks.RnibReaderMock{}
+	}
+	writerProvider := func() rNibWriter.RNibWriter {
+		return &mocks.RnibWriterMock{}
+	}
+
+	ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
+
+	handler, err := provider.GetHandler(X2SetupRequest)
+
+	assert.NotNil(t, provider)
+	assert.Nil(t, err)
+
+	_, ok := handler.(*httpmsghandlers.SetupRequestHandler)
+
+	assert.True(t, ok)
+}
+
+func TestEndcSetupRequestHandler(t *testing.T) {
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
+
+	log := initLog(t)
+	readerProvider := func() reader.RNibReader {
+		return &mocks.RnibReaderMock{}
+	}
+	writerProvider := func() rNibWriter.RNibWriter {
+		return &mocks.RnibWriterMock{}
+	}
+
+	ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider,ranSetupManager)
+
+	handler, err := provider.GetHandler(EndcSetupRequest)
+
+	assert.NotNil(t, provider)
+	assert.Nil(t, err)
+
+	_, ok := handler.(*httpmsghandlers.SetupRequestHandler)
+
+	assert.True(t, ok)
 }
 
 func TestGetShutdownHandlerFailure(t *testing.T) {
@@ -100,7 +141,8 @@ func TestGetShutdownHandlerFailure(t *testing.T) {
 		return &mocks.RnibWriterMock{}
 	}
 
-	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider)
+	ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter)
+	provider := NewIncomingRequestHandlerProvider(log, getRmrService(rmrMessengerMock, log), configuration.ParseConfiguration(), writerProvider, readerProvider, ranSetupManager)
 
 	_, actual := provider.GetHandler("test")
 	expected := &e2managererrors.InternalError{}