X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver_test.go;h=1d458c9838fb8f063585f440f81bedb267127e45;hb=46a0fd717e5f49ebae6cb2c4fbcf54f0e329dc86;hp=59439143cbffd23437377d5568ea34d00861914f;hpb=2f0d0d08efe5efe671178e63fdab4dacee543f9a;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/server/server_test.go b/dmaap-mediator-producer/internal/server/server_test.go
index 59439143..1d458c98 100644
--- a/dmaap-mediator-producer/internal/server/server_test.go
+++ b/dmaap-mediator-producer/internal/server/server_test.go
@@ -39,31 +39,37 @@ import (
 
 func TestNewRouter(t *testing.T) {
 	assertions := require.New(t)
-	r := NewRouter()
+
+	r := NewRouter(nil)
 	statusRoute := r.Get("status")
 	assertions.NotNil(statusRoute)
 	supportedMethods, err := statusRoute.GetMethods()
 	assertions.Equal([]string{http.MethodGet}, supportedMethods)
 	assertions.Nil(err)
+	path, _ := statusRoute.GetPathTemplate()
+	assertions.Equal("/status", path)
 
 	addJobRoute := r.Get("add")
 	assertions.NotNil(addJobRoute)
 	supportedMethods, err = addJobRoute.GetMethods()
 	assertions.Equal([]string{http.MethodPost}, supportedMethods)
 	assertions.Nil(err)
+	path, _ = addJobRoute.GetPathTemplate()
+	assertions.Equal("/jobs", path)
 
 	deleteJobRoute := r.Get("delete")
 	assertions.NotNil(deleteJobRoute)
 	supportedMethods, err = deleteJobRoute.GetMethods()
 	assertions.Equal([]string{http.MethodDelete}, supportedMethods)
 	assertions.Nil(err)
+	path, _ = deleteJobRoute.GetPathTemplate()
+	assertions.Equal("/jobs/{infoJobId}", path)
 
 	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
@@ -71,68 +77,57 @@ func TestNewRouter(t *testing.T) {
 	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)
+
+	handler := http.HandlerFunc(statusHandler)
 	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(http.StatusOK, responseRecorder.Code)
 	assertions.Equal("", responseRecorder.Body.String())
 }
 
 func TestAddInfoJobHandler(t *testing.T) {
 	assertions := require.New(t)
-	jobHandlerMock := jobhandler.JobHandler{}
-
-	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
 
 	type args struct {
-		responseRecorder *httptest.ResponseRecorder
-		r                *http.Request
+		job        jobs.JobInfo
+		mockReturn error
 	}
 	tests := []struct {
 		name         string
 		args         args
 		wantedStatus int
 		wantedBody   string
-		assertFunc   assertMockFunk
 	}{
 		{
-			name: "AddInfoJobHandler with correct path and method, should return OK",
+			name: "AddInfoJobHandler with correct job, should return OK",
 			args: args{
-				responseRecorder: httptest.NewRecorder(),
-				r:                newRequest(http.MethodPost, "/jobs", &goodJobInfo, t),
+				job: jobs.JobInfo{
+					Owner:            "owner",
+					LastUpdated:      "now",
+					InfoJobIdentity:  "jobId",
+					TargetUri:        "target",
+					InfoJobData:      "{}",
+					InfoTypeIdentity: "type",
+				},
 			},
 			wantedStatus: http.StatusOK,
 			wantedBody:   "",
-			assertFunc: func(mock *jobhandler.JobHandler) {
-				mock.AssertCalled(t, "AddJob", goodJobInfo)
-			},
 		},
 		{
 			name: "AddInfoJobHandler with incorrect job info, should return BadRequest",
 			args: args{
-				responseRecorder: httptest.NewRecorder(),
-				r:                newRequest(http.MethodPost, "/jobs", &badJobInfo, t),
+				job: jobs.JobInfo{
+					Owner: "bad",
+				},
+				mockReturn: errors.New("error"),
 			},
 			wantedStatus: http.StatusBadRequest,
 			wantedBody:   "Invalid job info. Cause: error",
@@ -140,15 +135,20 @@ func TestAddInfoJobHandler(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			handler := http.HandlerFunc(addInfoJobHandler)
-			handler.ServeHTTP(tt.args.responseRecorder, tt.args.r)
-			assertions.Equal(tt.wantedStatus, tt.args.responseRecorder.Code, tt.name)
+			jobHandlerMock := jobhandler.JobHandler{}
+			jobHandlerMock.On("AddJobFromRESTCall", tt.args.job).Return(tt.args.mockReturn)
+
+			callbackHandlerUnderTest := NewProducerCallbackHandler(&jobHandlerMock)
 
-			assertions.Contains(tt.args.responseRecorder.Body.String(), tt.wantedBody, tt.name)
+			handler := http.HandlerFunc(callbackHandlerUnderTest.addInfoJobHandler)
+			responseRecorder := httptest.NewRecorder()
+			r := newRequest(http.MethodPost, "/jobs", &tt.args.job, t)
 
-			if tt.assertFunc != nil {
-				tt.assertFunc(&jobHandlerMock)
-			}
+			handler.ServeHTTP(responseRecorder, r)
+
+			assertions.Equal(tt.wantedStatus, responseRecorder.Code, tt.name)
+			assertions.Contains(responseRecorder.Body.String(), tt.wantedBody, tt.name)
+			jobHandlerMock.AssertCalled(t, "AddJobFromRESTCall", tt.args.job)
 		})
 	}
 }
@@ -156,23 +156,21 @@ func TestAddInfoJobHandler(t *testing.T) {
 func TestDeleteJob(t *testing.T) {
 	assertions := require.New(t)
 	jobHandlerMock := jobhandler.JobHandler{}
+	jobHandlerMock.On("DeleteJobFromRESTCall", mock.Anything).Return(nil)
 
-	jobHandlerMock.On("DeleteJob", mock.Anything).Return(nil)
-	jobs.Handler = &jobHandlerMock
+	callbackHandlerUnderTest := NewProducerCallbackHandler(&jobHandlerMock)
 
 	responseRecorder := httptest.NewRecorder()
 	r := mux.SetURLVars(newRequest(http.MethodDelete, "/jobs/", nil, t), map[string]string{"infoJobId": "job1"})
-	handler := http.HandlerFunc(deleteInfoJobHandler)
+	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")
+	jobHandlerMock.AssertCalled(t, "DeleteJobFromRESTCall", "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 {