X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver_test.go;h=59439143cbffd23437377d5568ea34d00861914f;hb=2cad3ee78ecb765bba72185e7b26902084c47c7d;hp=d221c933e17c32ac432432a14d22afa1561f7ab6;hpb=f93e105a428fcf22795effb23ac17f1472ba5f7e;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/server/server_test.go b/dmaap-mediator-producer/internal/server/server_test.go index d221c933..59439143 100644 --- a/dmaap-mediator-producer/internal/server/server_test.go +++ b/dmaap-mediator-producer/internal/server/server_test.go @@ -30,65 +30,65 @@ import ( "net/http/httptest" "testing" + "github.com/gorilla/mux" + "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs" - "oransc.org/nonrtric/dmaapmediatorproducer/mocks" + "oransc.org/nonrtric/dmaapmediatorproducer/mocks/jobhandler" ) +func TestNewRouter(t *testing.T) { + assertions := require.New(t) + r := NewRouter() + statusRoute := r.Get("status") + assertions.NotNil(statusRoute) + supportedMethods, err := statusRoute.GetMethods() + assertions.Equal([]string{http.MethodGet}, supportedMethods) + assertions.Nil(err) + + addJobRoute := r.Get("add") + assertions.NotNil(addJobRoute) + supportedMethods, err = addJobRoute.GetMethods() + assertions.Equal([]string{http.MethodPost}, supportedMethods) + assertions.Nil(err) + + deleteJobRoute := r.Get("delete") + assertions.NotNil(deleteJobRoute) + supportedMethods, err = deleteJobRoute.GetMethods() + assertions.Equal([]string{http.MethodDelete}, supportedMethods) + assertions.Nil(err) + + notFoundHandler := r.NotFoundHandler + handler := http.HandlerFunc(notFoundHandler.ServeHTTP) + responseRecorder := httptest.NewRecorder() + handler.ServeHTTP(responseRecorder, newRequest("GET", "/wrong", nil, t)) + assertions.Equal(http.StatusNotFound, responseRecorder.Code) + + assertions.Contains(responseRecorder.Body.String(), "404 not found.") + + methodNotAllowedHandler := r.MethodNotAllowedHandler + handler = http.HandlerFunc(methodNotAllowedHandler.ServeHTTP) + responseRecorder = httptest.NewRecorder() + handler.ServeHTTP(responseRecorder, newRequest(http.MethodPut, "/status", nil, t)) + assertions.Equal(http.StatusMethodNotAllowed, responseRecorder.Code) + + assertions.Contains(responseRecorder.Body.String(), "Method is not supported.") +} + func TestStatusHandler(t *testing.T) { assertions := require.New(t) - type args struct { - responseRecorder *httptest.ResponseRecorder - r *http.Request - } - tests := []struct { - name string - args args - wantedStatus int - wantedBody string - }{ - { - name: "StatusHandler with correct path and method, should return OK", - args: args{ - responseRecorder: httptest.NewRecorder(), - r: newRequest("GET", "/", nil, t), - }, - wantedStatus: http.StatusOK, - wantedBody: "All is well!", - }, - { - name: "StatusHandler with incorrect path, should return NotFound", - args: args{ - responseRecorder: httptest.NewRecorder(), - r: newRequest("GET", "/wrong", nil, t), - }, - wantedStatus: http.StatusNotFound, - wantedBody: "404 not found.\n", - }, - { - name: "StatusHandler with incorrect method, should return MethodNotAllowed", - args: args{ - responseRecorder: httptest.NewRecorder(), - r: newRequest("PUT", "/", nil, t), - }, - wantedStatus: http.StatusMethodNotAllowed, - wantedBody: "Method is not supported.\n", - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - handler := http.HandlerFunc(StatusHandler) - handler.ServeHTTP(tt.args.responseRecorder, tt.args.r) - assertions.Equal(tt.wantedStatus, tt.args.responseRecorder.Code) + responseRecorder := httptest.NewRecorder() + r := newRequest(http.MethodGet, "/status", nil, t) + handler := http.HandlerFunc(statusHandler) + handler.ServeHTTP(responseRecorder, r) + assertions.Equal(http.StatusOK, responseRecorder.Code) - assertions.Equal(tt.wantedBody, tt.args.responseRecorder.Body.String()) - }) - } + assertions.Equal("", responseRecorder.Body.String()) } -func TestCreateInfoJobHandler(t *testing.T) { +func TestAddInfoJobHandler(t *testing.T) { assertions := require.New(t) - jobHandlerMock := mocks.JobHandler{} + jobHandlerMock := jobhandler.JobHandler{} goodJobInfo := jobs.JobInfo{ Owner: "owner", @@ -114,55 +114,65 @@ func TestCreateInfoJobHandler(t *testing.T) { args args wantedStatus int wantedBody string + assertFunc assertMockFunk }{ { - name: "CreateInfoJobHandler with correct path and method, should return OK", + name: "AddInfoJobHandler with correct path and method, should return OK", args: args{ responseRecorder: httptest.NewRecorder(), - r: newRequest("POST", "/producer_simulator/info_job", &goodJobInfo, t), + r: newRequest(http.MethodPost, "/jobs", &goodJobInfo, t), }, wantedStatus: http.StatusOK, wantedBody: "", + assertFunc: func(mock *jobhandler.JobHandler) { + mock.AssertCalled(t, "AddJob", goodJobInfo) + }, }, { - name: "CreateInfoJobHandler with incorrect job info, should return BadRequest", + name: "AddInfoJobHandler with incorrect job info, should return BadRequest", args: args{ responseRecorder: httptest.NewRecorder(), - r: newRequest("POST", "/producer_simulator/info_job", &badJobInfo, t), + r: newRequest(http.MethodPost, "/jobs", &badJobInfo, t), }, wantedStatus: http.StatusBadRequest, wantedBody: "Invalid job info. Cause: error", }, - { - name: "CreateInfoJobHandler with incorrect path, should return NotFound", - args: args{ - responseRecorder: httptest.NewRecorder(), - r: newRequest("GET", "/wrong", nil, t), - }, - wantedStatus: http.StatusNotFound, - wantedBody: "404 not found.", - }, - { - name: "CreateInfoJobHandler with incorrect method, should return MethodNotAllowed", - args: args{ - responseRecorder: httptest.NewRecorder(), - r: newRequest("PUT", "/producer_simulator/info_job", nil, t), - }, - wantedStatus: http.StatusMethodNotAllowed, - wantedBody: "Method is not supported.", - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - handler := http.HandlerFunc(CreateInfoJobHandler) + handler := http.HandlerFunc(addInfoJobHandler) handler.ServeHTTP(tt.args.responseRecorder, tt.args.r) - assertions.Equal(tt.wantedStatus, tt.args.responseRecorder.Code) + assertions.Equal(tt.wantedStatus, tt.args.responseRecorder.Code, tt.name) + + assertions.Contains(tt.args.responseRecorder.Body.String(), tt.wantedBody, tt.name) - assertions.Contains(tt.args.responseRecorder.Body.String(), tt.wantedBody) + if tt.assertFunc != nil { + tt.assertFunc(&jobHandlerMock) + } }) } } +func TestDeleteJob(t *testing.T) { + assertions := require.New(t) + jobHandlerMock := jobhandler.JobHandler{} + + jobHandlerMock.On("DeleteJob", mock.Anything).Return(nil) + jobs.Handler = &jobHandlerMock + + responseRecorder := httptest.NewRecorder() + r := mux.SetURLVars(newRequest(http.MethodDelete, "/jobs/", nil, t), map[string]string{"infoJobId": "job1"}) + handler := http.HandlerFunc(deleteInfoJobHandler) + handler.ServeHTTP(responseRecorder, r) + assertions.Equal(http.StatusOK, responseRecorder.Result().StatusCode) + + assertions.Equal("", responseRecorder.Body.String()) + + jobHandlerMock.AssertCalled(t, "DeleteJob", "job1") +} + +type assertMockFunk func(mock *jobhandler.JobHandler) + func newRequest(method string, url string, jobInfo *jobs.JobInfo, t *testing.T) *http.Request { var body io.Reader if jobInfo != nil {