"io/ioutil"
"net/http"
+ "github.com/gorilla/mux"
"oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
)
-const StatusCallbackPath = "/status"
-const JobsCallbackPath = "/jobs"
+const StatusPath = "/status"
+const AddJobPath = "/jobs"
+const jobIdToken = "infoJobId"
+const deleteJobPath = AddJobPath + "/{" + jobIdToken + "}"
-func StatusHandler(w http.ResponseWriter, r *http.Request) {
- if r.URL.Path != StatusCallbackPath {
- http.Error(w, "404 not found.", http.StatusNotFound)
- return
- }
-
- if r.Method != "GET" {
- http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
- return
- }
-
- fmt.Fprintf(w, "All is well!")
+func NewRouter() *mux.Router {
+ r := mux.NewRouter()
+ r.HandleFunc(StatusPath, statusHandler).Methods(http.MethodGet).Name("status")
+ r.HandleFunc(AddJobPath, addInfoJobHandler).Methods(http.MethodPost).Name("add")
+ r.HandleFunc(deleteJobPath, deleteInfoJobHandler).Methods(http.MethodDelete).Name("delete")
+ r.NotFoundHandler = ¬FoundHandler{}
+ r.MethodNotAllowedHandler = &methodNotAllowedHandler{}
+ return r
}
-func CreateInfoJobHandler(w http.ResponseWriter, r *http.Request) {
- if r.URL.Path != JobsCallbackPath {
- http.Error(w, "404 not found.", http.StatusNotFound)
- return
- }
-
- if r.Method != "POST" {
- http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
- return
- }
+func statusHandler(w http.ResponseWriter, r *http.Request) {}
+func addInfoJobHandler(w http.ResponseWriter, r *http.Request) {
b, readErr := ioutil.ReadAll(r.Body)
if readErr != nil {
http.Error(w, fmt.Sprintf("Unable to read body due to: %v", readErr), http.StatusBadRequest)
http.Error(w, fmt.Sprintf("Invalid job info. Cause: %v", err), http.StatusBadRequest)
}
}
+
+func deleteInfoJobHandler(w http.ResponseWriter, r *http.Request) {
+ vars := mux.Vars(r)
+ id, ok := vars[jobIdToken]
+ if !ok {
+ http.Error(w, "Must provide infoJobId.", http.StatusBadRequest)
+ return
+ }
+
+ jobs.DeleteJob(id)
+}
+
+type notFoundHandler struct{}
+
+func (h *notFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ http.Error(w, "404 not found.", http.StatusNotFound)
+}
+
+type methodNotAllowedHandler struct{}
+
+func (h *methodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
+}
"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 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", "/status", 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", "/status", 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 := jobhandler.JobHandler{}
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", "/jobs", &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", "/jobs", &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", "/jobs", 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)
+ assertions.Contains(tt.args.responseRecorder.Body.String(), tt.wantedBody, tt.name)
+
+ 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, http.StatusOK)
+
+ 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 {
Code Review / nonrtric.git / commitdiff