[RIC-431] REDESIGN - Add RanListManager methods | Add/Update RnibWriter methods

[ric-plt/e2mgr.git] / E2Manager / services / rnib_data_service_test.go

diff --git a/E2Manager/services/rnib_data_service_test.go b/E2Manager/services/rnib_data_service_test.go
index 07e2c45..5460608 100644 (file)
--- a/E2Manager/services/rnib_data_service_test.go
+++ b/E2Manager/services/rnib_data_service_test.go
@@ -17,7 +17,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package services
 
 import (
@@ -47,10 +46,8 @@ func setupRnibDataServiceTestWithMaxAttempts(t *testing.T, maxAttempts int) (*rN
 
        readerMock := &mocks.RnibReaderMock{}
 
-
        writerMock := &mocks.RnibWriterMock{}
 
-
        rnibDataService := NewRnibDataService(logger, config, readerMock, writerMock)
        assert.NotNil(t, rnibDataService)
 
@@ -61,10 +58,9 @@ func TestSuccessfulSaveNodeb(t *testing.T) {
        rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
 
        nodebInfo := &entities.NodebInfo{}
-       nbIdentity := &entities.NbIdentity{}
-       writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
+       writerMock.On("SaveNodeb", nodebInfo).Return(nil)
 
-       rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
+       rnibDataService.SaveNodeb(nodebInfo)
        writerMock.AssertNumberOfCalls(t, "SaveNodeb", 1)
 }
 
@@ -72,11 +68,10 @@ func TestConnFailureSaveNodeb(t *testing.T) {
        rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
 
        nodebInfo := &entities.NodebInfo{}
-       nbIdentity := &entities.NbIdentity{}
        mockErr := &common.InternalError{Err: &net.OpError{Err: fmt.Errorf("connection error")}}
-       writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(mockErr)
+       writerMock.On("SaveNodeb", nodebInfo).Return(mockErr)
 
-       rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
+       rnibDataService.SaveNodeb(nodebInfo)
        writerMock.AssertNumberOfCalls(t, "SaveNodeb", 3)
 }
 
@@ -84,11 +79,10 @@ func TestNonConnFailureSaveNodeb(t *testing.T) {
        rnibDataService, _, writerMock := setupRnibDataServiceTest(t)
 
        nodebInfo := &entities.NodebInfo{}
-       nbIdentity := &entities.NbIdentity{}
        mockErr := &common.InternalError{Err: fmt.Errorf("non connection failure")}
-       writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(mockErr)
+       writerMock.On("SaveNodeb", nodebInfo).Return(mockErr)
 
-       rnibDataService.SaveNodeb(nbIdentity, nodebInfo)
+       rnibDataService.SaveNodeb(nodebInfo)
        writerMock.AssertNumberOfCalls(t, "SaveNodeb", 1)
 }
 
@@ -159,7 +153,7 @@ func TestConnFailureGetNodeb(t *testing.T) {
 
        res, err := rnibDataService.GetNodeb(invName)
        readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
-       assert.True(t, strings.Contains(err.Error(), "connection error", ))
+       assert.True(t, strings.Contains(err.Error(), "connection error"))
        assert.Equal(t, nodeb, res)
 }
 
@@ -184,7 +178,7 @@ func TestConnFailureGetNodebIdList(t *testing.T) {
 
        res, err := rnibDataService.GetListNodebIds()
        readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 3)
-       assert.True(t, strings.Contains(err.Error(), "connection error", ))
+       assert.True(t, strings.Contains(err.Error(), "connection error"))
        assert.Equal(t, nodeIds, res)
 }
 
@@ -200,12 +194,12 @@ func TestConnFailureTwiceGetNodebIdList(t *testing.T) {
 
        res, err := rnibDataService.GetListNodebIds()
        readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 3)
-       assert.True(t, strings.Contains(err.Error(), "connection error", ))
+       assert.True(t, strings.Contains(err.Error(), "connection error"))
        assert.Equal(t, nodeIds, res)
 
        res2, err := rnibDataService.GetNodeb(invName)
        readerMock.AssertNumberOfCalls(t, "GetNodeb", 3)
-       assert.True(t, strings.Contains(err.Error(), "connection error", ))
+       assert.True(t, strings.Contains(err.Error(), "connection error"))
        assert.Equal(t, nodeb, res2)
 }
 
@@ -218,7 +212,7 @@ func TestConnFailureWithAnotherConfig(t *testing.T) {
 
        res, err := rnibDataService.GetListNodebIds()
        readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 5)
-       assert.True(t, strings.Contains(err.Error(), "connection error", ))
+       assert.True(t, strings.Contains(err.Error(), "connection error"))
        assert.Equal(t, nodeIds, res)
 }
 
@@ -280,21 +274,6 @@ func TestConnFailureUpdateNodebInfoOnConnectionStatusInversion(t *testing.T) {
        writerMock.AssertNumberOfCalls(t, "UpdateNodebInfoOnConnectionStatusInversion", 3)
 }
 
-//func TestConnFailureThenSuccessGetNodebIdList(t *testing.T) {
-//     rnibDataService, readerMock, _ := setupRnibDataServiceTest(t)
-//
-//     var nilNodeIds []*entities.NbIdentity = nil
-//     nodeIds := []*entities.NbIdentity{}
-//     mockErr := &common.InternalError{Err: &net.OpError{Err:fmt.Errorf("connection error")}}
-//     //readerMock.On("GetListNodebIds").Return(nilNodeIds, mockErr)
-//     //readerMock.On("GetListNodebIds").Return(nodeIds, nil)
-//
-//     res, err := rnibDataService.GetListNodebIds()
-//     readerMock.AssertNumberOfCalls(t, "GetListNodebIds", 2)
-//     assert.True(t, strings.Contains(err.Error(),"connection failure", ))
-//     assert.Equal(t, nodeIds, res)
-//}
-
 func TestGetE2TInstanceConnFailure(t *testing.T) {
        rnibDataService, readerMock, _ := setupRnibDataServiceTest(t)
 
@@ -369,4 +348,4 @@ func TestRemoveEnbOtherError(t *testing.T) {
        err := rnibDataService.RemoveEnb(nodebInfo)
        writerMock.AssertNumberOfCalls(t, "RemoveEnb", 1)
        assert.NotNil(t, err)
-}
\ No newline at end of file
+}