X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller_test.go;h=69dbfdae81b96977b3f826691707958afc7d378c;hb=3f9a67b3d8e15bc725f2f66adf499617ffc0d2fc;hp=b5c4b057cc44dfdba351dae6b075eb7db61d3894;hpb=e51ebb1fb4a0bba85577204a28c87365a041f640;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go index b5c4b05..69dbfda 100644 --- a/E2Manager/controllers/controller_test.go +++ b/E2Manager/controllers/controller_test.go @@ -58,7 +58,7 @@ func TestShutdownHandlerRnibError(t *testing.T) { return writerMock } - rnibErr := &common.RNibError{} + rnibErr := &common.ResourceNotFoundError{} var nbIdentityList []*entities.NbIdentity readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibErr) @@ -69,7 +69,7 @@ func TestShutdownHandlerRnibError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Err.Code) + assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Code) } func TestHeaderValidationFailed(t *testing.T) { @@ -98,8 +98,8 @@ func TestHeaderValidationFailed(t *testing.T) { err := e2managererrors.NewHeaderValidationError() assert.Equal(t, http.StatusUnsupportedMediaType, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestShutdownStatusNoContent(t *testing.T) { @@ -116,7 +116,7 @@ func TestShutdownStatusNoContent(t *testing.T) { } config := configuration.ParseConfiguration() - var rnibError common.IRNibError + var rnibError error nbIdentityList := []*entities.NbIdentity{} readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibError) @@ -149,8 +149,8 @@ func TestHandleInternalError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestHandleCommandAlreadyInProgressError(t *testing.T) { @@ -174,8 +174,8 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusMethodNotAllowed, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestValidateHeaders(t *testing.T) {