Merge "upgrade RMR version to 1.13.0" into PI3

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / e2_term_init_notification_handler_test.go

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
index 2cfc6f5..f649da2 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
@@ -103,7 +103,7 @@ func TestE2TermInitExistingE2TInstanceNoAssociatedRans(t *testing.T) {
        e2tInstancesManagerMock.AssertCalled(t, "GetE2TInstance", e2tInstanceAddress)
 }
 
-func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
+func TestE2TermInitHandlerSuccessOneRan(t *testing.T) {
        _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
@@ -117,7 +117,7 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
        xaction := []byte(RanName)
        msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction)
 
-       rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
        e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName)
@@ -130,11 +130,9 @@ func TestE2TerminInitHandlerSuccessOneRan(t *testing.T) {
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
-func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
+func TestE2TermInitHandlerSuccessTwoRans(t *testing.T) {
        _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
        var rnibErr error
-
-
        var initialNodeb0 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var initialNodeb1 = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        readerMock.On("GetNodeb", RanName).Return(initialNodeb0, rnibErr)
@@ -147,7 +145,7 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
        xaction := []byte(RanName)
        msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction)
 
-       rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil)
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
        e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, RanName, "test2")
@@ -160,7 +158,7 @@ func TestE2TerminInitHandlerSuccessTwoRans(t *testing.T) {
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2)
 }
 
-func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
+func TestE2TermInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
        log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
@@ -187,7 +185,7 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
        //xaction = []byte(ids[1].InventoryName)
        //msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-       rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, fmt.Errorf("RMR Error"))
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, fmt.Errorf("RMR Error"))
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
        e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3")
@@ -202,7 +200,7 @@ func TestE2TerminInitHandlerSuccessThreeRansFirstRmrFailure(t *testing.T) {
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
-func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T) {
+func TestE2TermInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T) {
        log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
@@ -234,7 +232,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
        //xaction = []byte(ids[1].InventoryName)
        //msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-       rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, nil)
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, nil)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
        e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3")
@@ -250,7 +248,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondNotFoundFailure(t *testing.T)
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 2)
 }
 
-func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *testing.T) {
+func TestE2TermInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *testing.T) {
        log, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
        var rnibErr error
 
@@ -282,7 +280,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
        //xaction = []byte(ids[1].InventoryName)
        //msg1 := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ids[1].InventoryName, &payload, &xaction)
 
-       rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg0, nil)
+       rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg0, nil)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
        e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, "test1", "test2", "test3")
@@ -298,7 +296,7 @@ func TestE2TerminInitHandlerSuccessThreeRansSecondRnibInternalErrorFailure(t *te
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 1)
 }
 
-func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
+func TestE2TermInitHandlerSuccessZeroRans(t *testing.T) {
        _, handler, _, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress)
@@ -311,7 +309,7 @@ func TestE2TerminInitHandlerSuccessZeroRans(t *testing.T) {
        rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0)
 }
 
-func TestE2TerminInitHandlerFailureGetListNodebIds(t *testing.T) {
+func TestE2TermInitHandlerFailureGetListNodebIds(t *testing.T) {
        _, handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock := initRanLostConnectionTest(t)
 
        var nodebInfo *entities.NodebInfo