X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller_test.go;h=6bc16136fd1165c6c521e4dca314d7d07da136b6;hb=refs%2Fchanges%2F32%2F732%2F1;hp=e753bcff33bf5805fa4e2f4f01968ce6ff4b048f;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go
index e753bcf..6bc1613 100644
--- a/E2Manager/controllers/controller_test.go
+++ b/E2Manager/controllers/controller_test.go
@@ -42,6 +42,7 @@ func TestShutdownHandlerRnibError(t *testing.T) {
 	log := initLog(t)
 	config := configuration.ParseConfiguration()
 
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -50,14 +51,13 @@ func TestShutdownHandlerRnibError(t *testing.T) {
 	writerProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
-	var messageChannel chan<- *models.NotificationResponse
 
 	rnibErr := &common.RNibError{}
 	var nbIdentityList []*entities.NbIdentity
 	readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibErr)
 
 	writer := httptest.NewRecorder()
-	controller := NewController(log, readerProvider, writerProvider, config, messageChannel)
+	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
 	controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil)
 
 	var errorResponse = parseJsonRequest(t, writer.Body)
@@ -70,6 +70,7 @@ func TestHeaderValidationFailed(t *testing.T) {
 	log := initLog(t)
 	config := configuration.ParseConfiguration()
 
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -78,11 +79,10 @@ func TestHeaderValidationFailed(t *testing.T) {
 	writerProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
-	var messageChannel chan<- *models.NotificationResponse
 
 	writer := httptest.NewRecorder()
 
-	controller := NewController(log, readerProvider, writerProvider, config, messageChannel)
+	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
 
 	header := &http.Header{}
 
@@ -99,6 +99,7 @@ func TestHeaderValidationFailed(t *testing.T) {
 func TestShutdownStatusNoContent(t *testing.T){
 	log := initLog(t)
 
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -108,14 +109,13 @@ func TestShutdownStatusNoContent(t *testing.T){
 		return writerMock
 	}
 	config := configuration.ParseConfiguration()
-	var messageChannel chan<- *models.NotificationResponse
 
 	var rnibError common.IRNibError
 	nbIdentityList := []*entities.NbIdentity{}
 	readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibError)
 
 	writer := httptest.NewRecorder()
-	controller := NewController(log, readerProvider, writerProvider, config, messageChannel)
+	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
 	controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil)
 
 	assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode)
@@ -125,6 +125,7 @@ func TestHandleInternalError(t *testing.T) {
 	log := initLog(t)
 	config := configuration.ParseConfiguration()
 
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -133,10 +134,9 @@ func TestHandleInternalError(t *testing.T) {
 	writerProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
-	var messageChannel chan<- *models.NotificationResponse
 
 	writer := httptest.NewRecorder()
-	controller := NewController(log, readerProvider, writerProvider, config, messageChannel)
+	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
 	err := e2managererrors.NewInternalError()
 
 	controller.handleErrorResponse(err, writer)
@@ -151,6 +151,7 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) {
 	log := initLog(t)
 	config := configuration.ParseConfiguration()
 
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -159,9 +160,8 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) {
 	writerProvider := func() rNibWriter.RNibWriter {
 		return writerMock
 	}
-	var messageChannel chan<- *models.NotificationResponse
 	writer := httptest.NewRecorder()
-	controller := NewController(log, readerProvider, writerProvider, config, messageChannel)
+	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
 	err := e2managererrors.NewCommandAlreadyInProgressError()
 
 	controller.handleErrorResponse(err, writer)
@@ -175,6 +175,7 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) {
 func TestValidateHeaders(t *testing.T){
 	log := initLog(t)
 
+	rmrMessengerMock := &mocks.RmrMessengerMock{}
 	readerMock := &mocks.RnibReaderMock{}
 	readerProvider := func() reader.RNibReader {
 		return readerMock
@@ -184,9 +185,8 @@ func TestValidateHeaders(t *testing.T){
 		return writerMock
 	}
 	config := configuration.ParseConfiguration()
-	var messageChannel chan<- *models.NotificationResponse
 
-	controller := NewController(log, readerProvider, writerProvider, config, messageChannel)
+	controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config)
 
 	header := http.Header{}
 	header.Set("Content-Type", "application/json")