X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver_test.go;h=08885077c7aede5ba8f165bb1283d2766c6c38da;hb=0af0d6013c831bfea032c34ce85e1dcf28b10855;hp=444deba49ea5168654bee369fbccef1e304240b8;hpb=82378715d387362e97a064665a2467c587afdeed;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/server/server_test.go b/dmaap-mediator-producer/internal/server/server_test.go index 444deba4..08885077 100644 --- a/dmaap-mediator-producer/internal/server/server_test.go +++ b/dmaap-mediator-producer/internal/server/server_test.go @@ -30,84 +30,66 @@ 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/jobhandler" ) -func TestStatusHandler(t *testing.T) { +func TestNewRouter(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) + r := NewRouter(nil) + statusRoute := r.Get("status") + assertions.NotNil(statusRoute) + supportedMethods, err := statusRoute.GetMethods() + assertions.Equal([]string{http.MethodGet}, supportedMethods) + assertions.Nil(err) - assertions.Equal(tt.wantedBody, tt.args.responseRecorder.Body.String()) - }) - } + 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 TestCreateInfoJobHandler(t *testing.T) { +func TestStatusHandler(t *testing.T) { assertions := require.New(t) - jobHandlerMock := jobhandler.JobHandler{} + responseRecorder := httptest.NewRecorder() + r := newRequest(http.MethodGet, "/status", nil, t) + handler := http.HandlerFunc(statusHandler) + handler.ServeHTTP(responseRecorder, r) + assertions.Equal(http.StatusOK, responseRecorder.Code) - goodJobInfo := jobs.JobInfo{ - Owner: "owner", - LastUpdated: "now", - InfoJobIdentity: "jobId", - TargetUri: "target", - InfoJobData: "{}", - InfoTypeIdentity: "type", - } - badJobInfo := jobs.JobInfo{ - Owner: "bad", - } - jobHandlerMock.On("AddJob", goodJobInfo).Return(nil) - jobHandlerMock.On("AddJob", badJobInfo).Return(errors.New("error")) - jobs.Handler = &jobHandlerMock + assertions.Equal("", responseRecorder.Body.String()) +} + +func TestAddInfoJobHandler(t *testing.T) { + assertions := require.New(t) type args struct { - responseRecorder *httptest.ResponseRecorder - r *http.Request + job jobs.JobInfo + mockReturn error } tests := []struct { name string @@ -116,53 +98,69 @@ func TestCreateInfoJobHandler(t *testing.T) { wantedBody string }{ { - 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), + job: jobs.JobInfo{ + Owner: "owner", + LastUpdated: "now", + InfoJobIdentity: "jobId", + TargetUri: "target", + InfoJobData: "{}", + InfoTypeIdentity: "type", + }, }, wantedStatus: http.StatusOK, wantedBody: "", }, { - 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), + job: jobs.JobInfo{ + Owner: "bad", + }, + mockReturn: errors.New("error"), }, 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.ServeHTTP(tt.args.responseRecorder, tt.args.r) - assertions.Equal(tt.wantedStatus, tt.args.responseRecorder.Code) + jobHandlerMock := jobhandler.JobHandler{} + jobHandlerMock.On("AddJob", tt.args.job).Return(tt.args.mockReturn) + callbackHandlerUnderTest := NewProducerCallbackHandler(&jobHandlerMock) + + handler := http.HandlerFunc(callbackHandlerUnderTest.addInfoJobHandler) + responseRecorder := httptest.NewRecorder() + r := newRequest(http.MethodPost, "/jobs", &tt.args.job, t) - assertions.Contains(tt.args.responseRecorder.Body.String(), tt.wantedBody) + handler.ServeHTTP(responseRecorder, r) + + assertions.Equal(tt.wantedStatus, responseRecorder.Code, tt.name) + assertions.Contains(responseRecorder.Body.String(), tt.wantedBody, tt.name) + jobHandlerMock.AssertCalled(t, "AddJob", tt.args.job) }) } } +func TestDeleteJob(t *testing.T) { + assertions := require.New(t) + jobHandlerMock := jobhandler.JobHandler{} + + jobHandlerMock.On("DeleteJob", mock.Anything).Return(nil) + callbackHandlerUnderTest := NewProducerCallbackHandler(&jobHandlerMock) + + responseRecorder := httptest.NewRecorder() + r := mux.SetURLVars(newRequest(http.MethodDelete, "/jobs/", nil, t), map[string]string{"infoJobId": "job1"}) + handler := http.HandlerFunc(callbackHandlerUnderTest.deleteInfoJobHandler) + handler.ServeHTTP(responseRecorder, r) + assertions.Equal(http.StatusOK, responseRecorder.Result().StatusCode) + + assertions.Equal("", responseRecorder.Body.String()) + + jobHandlerMock.AssertCalled(t, "DeleteJob", "job1") +} + func newRequest(method string, url string, jobInfo *jobs.JobInfo, t *testing.T) *http.Request { var body io.Reader if jobInfo != nil {