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=afe34e22e0be919b8e054826c23c551b4e493f79;hp=08885077c7aede5ba8f165bb1283d2766c6c38da;hpb=4bbbfe8d82d08054a9baacdc63f117eb1dd24524;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/server/server_test.go b/dmaap-mediator-producer/internal/server/server_test.go
index 08885077..1d458c98 100644
--- a/dmaap-mediator-producer/internal/server/server_test.go
+++ b/dmaap-mediator-producer/internal/server/server_test.go
@@ -39,24 +39,31 @@ import (
 
 func TestNewRouter(t *testing.T) {
 	assertions := require.New(t)
+
 	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)
@@ -75,12 +82,14 @@ func TestNewRouter(t *testing.T) {
 
 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())
 }
 
@@ -98,7 +107,7 @@ func TestAddInfoJobHandler(t *testing.T) {
 		wantedBody   string
 	}{
 		{
-			name: "AddInfoJobHandler with correct path and method, should return OK",
+			name: "AddInfoJobHandler with correct job, should return OK",
 			args: args{
 				job: jobs.JobInfo{
 					Owner:            "owner",
@@ -127,7 +136,8 @@ func TestAddInfoJobHandler(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			jobHandlerMock := jobhandler.JobHandler{}
-			jobHandlerMock.On("AddJob", tt.args.job).Return(tt.args.mockReturn)
+			jobHandlerMock.On("AddJobFromRESTCall", tt.args.job).Return(tt.args.mockReturn)
+
 			callbackHandlerUnderTest := NewProducerCallbackHandler(&jobHandlerMock)
 
 			handler := http.HandlerFunc(callbackHandlerUnderTest.addInfoJobHandler)
@@ -138,7 +148,7 @@ func TestAddInfoJobHandler(t *testing.T) {
 
 			assertions.Equal(tt.wantedStatus, responseRecorder.Code, tt.name)
 			assertions.Contains(responseRecorder.Body.String(), tt.wantedBody, tt.name)
-			jobHandlerMock.AssertCalled(t, "AddJob", tt.args.job)
+			jobHandlerMock.AssertCalled(t, "AddJobFromRESTCall", tt.args.job)
 		})
 	}
 }
@@ -146,8 +156,8 @@ 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)
 	callbackHandlerUnderTest := NewProducerCallbackHandler(&jobHandlerMock)
 
 	responseRecorder := httptest.NewRecorder()
@@ -158,7 +168,7 @@ func TestDeleteJob(t *testing.T) {
 
 	assertions.Equal("", responseRecorder.Body.String())
 
-	jobHandlerMock.AssertCalled(t, "DeleteJob", "job1")
+	jobHandlerMock.AssertCalled(t, "DeleteJobFromRESTCall", "job1")
 }
 
 func newRequest(method string, url string, jobInfo *jobs.JobInfo, t *testing.T) *http.Request {