X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fdelete_all_request_handler_test.go;h=cd2a4f2d7a4766bdff26504d2cb4520866671960;hb=refs%2Fchanges%2F34%2F4434%2F3;hp=3cf5b46026ecf8c8029fd0f6da9289b3d7aed3ce;hpb=7000880c4031e607a2fe36046fd097f486476a84;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go
index 3cf5b46..cd2a4f2 100644
--- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go
+++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler_test.go
@@ -147,8 +147,10 @@ func TestTwoRansGetE2TAddressesEmptyListOneGetNodebFailure(t *testing.T) {
 	readerMock.On("GetNodeb", "RanName_2").Return(nb2, common.NewInternalError(errors.New("error")))
 	_, err = h.Handle(nil)
 	assert.IsType(t, &e2managererrors.RnibDbError{}, err)
-	writerMock.AssertExpectations(t)
-	readerMock.AssertExpectations(t)
+	writerMock.AssertNotCalled(t, "UpdateNodebInfo", nb2)
+	readerMock.AssertCalled(t, "GetE2TAddresses")
+	readerMock.AssertCalled(t, "GetListNodebIds")
+	readerMock.AssertCalled(t, "GetNodeb", "RanName_2")
 }
 
 func TestUpdateNodebInfoOnConnectionStatusInversionFailure(t *testing.T) {
@@ -163,6 +165,10 @@ func TestUpdateNodebInfoOnConnectionStatusInversionFailure(t *testing.T) {
 	nb1 := &entities.NodebInfo{RanName: "RanName_1", ConnectionStatus: entities.ConnectionStatus_CONNECTED}
 	readerMock.On("GetNodeb", "RanName_1").Return(nb1, nil)
 
+	nb2 := &entities.NodebInfo{RanName: "RanName_2", ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN}
+	readerMock.On("GetNodeb", "RanName_2").Return(nb2, nil)
+	writerMock.On("UpdateNodebInfo", nb2)
+
 	updatedNb1 := *nb1
 	updatedNb1.ConnectionStatus = entities.ConnectionStatus_SHUT_DOWN
 	writerMock.On("UpdateNodebInfoOnConnectionStatusInversion", &updatedNb1, "RanName_1_DISCONNECTED").Return(common.NewInternalError(errors.New("error")))
@@ -170,8 +176,10 @@ func TestUpdateNodebInfoOnConnectionStatusInversionFailure(t *testing.T) {
 	_, err := h.Handle(nil)
 
 	assert.IsType(t, &e2managererrors.RnibDbError{}, err)
-	writerMock.AssertExpectations(t)
-	readerMock.AssertExpectations(t)
+	writerMock.AssertCalled(t, "UpdateNodebInfoOnConnectionStatusInversion", &updatedNb1, "RanName_1_DISCONNECTED")
+	readerMock.AssertCalled(t, "GetE2TAddresses")
+	readerMock.AssertCalled(t, "GetListNodebIds")
+	readerMock.AssertCalled(t, "GetNodeb", "RanName_1")
 }
 
 func TestTwoRansGetE2TAddressesEmptyListOneUpdateNodebInfoFailure(t *testing.T) {
@@ -197,8 +205,10 @@ func TestTwoRansGetE2TAddressesEmptyListOneUpdateNodebInfoFailure(t *testing.T)
 	writerMock.On("UpdateNodebInfo", updatedNb2).Return(common.NewInternalError(errors.New("error")))
 	_, err = h.Handle(nil)
 	assert.IsType(t, &e2managererrors.RnibDbError{}, err)
-	readerMock.AssertExpectations(t)
-	writerMock.AssertExpectations(t)
+	readerMock.AssertCalled(t, "GetE2TAddresses")
+	readerMock.AssertCalled(t, "GetListNodebIds")
+	readerMock.AssertCalled(t, "GetNodeb", "RanName_2")
+	writerMock.AssertCalled(t, "UpdateNodebInfo", updatedNb2)
 }
 
 func TestOneRanWithStateShutDown(t *testing.T) {