X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fget_nodeb_id_list_request_handler_test.go;h=644288586bac301c9d779479b494fde0007ec141;hb=848891ebc97494107f7b9fadd25769f200bd550b;hp=a8353776791542e272bf58ce4014fcbddb8fc6ad;hpb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/get_nodeb_id_list_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/get_nodeb_id_list_request_handler_test.go
index a835377..6442885 100644
--- a/E2Manager/handlers/httpmsghandlers/get_nodeb_id_list_request_handler_test.go
+++ b/E2Manager/handlers/httpmsghandlers/get_nodeb_id_list_request_handler_test.go
@@ -22,44 +22,39 @@ package httpmsghandlers
 
 import (
 	"e2mgr/configuration"
+	"e2mgr/managers"
 	"e2mgr/mocks"
 	"e2mgr/models"
 	"e2mgr/services"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
-func setupGetNodebIdListRequestHandlerTest(t *testing.T) (*GetNodebIdListRequestHandler, *mocks.RnibReaderMock) {
+func setupGetNodebIdListRequestHandlerTest(t *testing.T) (*GetNodebIdListRequestHandler, *mocks.RnibReaderMock, managers.RanListManager) {
 	log := initLog(t)
 	config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3}
 	readerMock := &mocks.RnibReaderMock{}
-	readerProvider := func() reader.RNibReader {
-		return readerMock
-	}
-	rnibDataService := services.NewRnibDataService(log, config, readerProvider, nil)
-	handler := NewGetNodebIdListRequestHandler(log, rnibDataService)
-	return handler, readerMock
+
+	rnibDataService := services.NewRnibDataService(log, config, readerMock, nil)
+	ranListManager := managers.NewRanListManager(log, rnibDataService)
+
+	handler := NewGetNodebIdListRequestHandler(log, rnibDataService, ranListManager)
+	return handler, readerMock, ranListManager
 }
 
 func TestHandleGetNodebIdListSuccess(t *testing.T) {
-	handler, readerMock := setupGetNodebIdListRequestHandlerTest(t)
+	handler, readerMock, ranListManager := setupGetNodebIdListRequestHandlerTest(t)
 	var rnibError error
 	readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{}, rnibError)
+
+	err := ranListManager.InitNbIdentityMap()
+	if err != nil {
+		t.Errorf("Error cannot init identity")
+	}
+
 	response, err := handler.Handle(nil)
 	assert.Nil(t, err)
 	assert.NotNil(t, response)
 	assert.IsType(t, &models.GetNodebIdListResponse{}, response)
 }
-
-func TestHandleGetNodebIdListFailure(t *testing.T) {
-	handler, readerMock := setupGetNodebIdListRequestHandlerTest(t)
-	var nodebIdList []*entities.NbIdentity
-	readerMock.On("GetListNodebIds").Return(nodebIdList, common.NewInternalError(errors.New("#reader.GetListNodebIds - Internal Error")))
-	response, err := handler.Handle(nil)
-	assert.NotNil(t, err)
-	assert.Nil(t, response)
-}