X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver_test.go;h=1db36446134b623b245838f0dc423850831c0269;hb=5feecd881172a3b22041d35443c1f946e7d5f63e;hp=08885077c7aede5ba8f165bb1283d2766c6c38da;hpb=0af0d6013c831bfea032c34ce85e1dcf28b10855;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..1db36446 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)
@@ -71,16 +78,26 @@ func TestNewRouter(t *testing.T) {
 	handler.ServeHTTP(responseRecorder, newRequest(http.MethodPut, "/status", nil, t))
 	assertions.Equal(http.StatusMethodNotAllowed, responseRecorder.Code)
 	assertions.Contains(responseRecorder.Body.String(), "Method is not supported.")
+
+	setLogLevelRoute := r.Get("setLogLevel")
+	assertions.NotNil(setLogLevelRoute)
+	supportedMethods, err = setLogLevelRoute.GetMethods()
+	assertions.Equal([]string{http.MethodPut}, supportedMethods)
+	assertions.Nil(err)
+	path, _ = setLogLevelRoute.GetPathTemplate()
+	assertions.Equal("/admin/log", path)
 }
 
 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 +115,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",
@@ -110,7 +127,6 @@ func TestAddInfoJobHandler(t *testing.T) {
 				},
 			},
 			wantedStatus: http.StatusOK,
-			wantedBody:   "",
 		},
 		{
 			name: "AddInfoJobHandler with incorrect job info, should return BadRequest",
@@ -127,7 +143,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 +155,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 +163,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 +175,51 @@ func TestDeleteJob(t *testing.T) {
 
 	assertions.Equal("", responseRecorder.Body.String())
 
-	jobHandlerMock.AssertCalled(t, "DeleteJob", "job1")
+	jobHandlerMock.AssertCalled(t, "DeleteJobFromRESTCall", "job1")
+}
+
+func TestSetLogLevel(t *testing.T) {
+	assertions := require.New(t)
+
+	type args struct {
+		logLevel string
+	}
+	tests := []struct {
+		name         string
+		args         args
+		wantedStatus int
+		wantedBody   string
+	}{
+		{
+			name: "Set to valid log level, should return OK",
+			args: args{
+				logLevel: "Debug",
+			},
+			wantedStatus: http.StatusOK,
+		},
+		{
+			name: "Set to invalid log level, should return BadRequest",
+			args: args{
+				logLevel: "bad",
+			},
+			wantedStatus: http.StatusBadRequest,
+			wantedBody:   "Invalid log level: bad",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			callbackHandlerUnderTest := NewProducerCallbackHandler(nil)
+
+			handler := http.HandlerFunc(callbackHandlerUnderTest.setLogLevel)
+			responseRecorder := httptest.NewRecorder()
+			r, _ := http.NewRequest(http.MethodPut, "/admin/log?level="+tt.args.logLevel, nil)
+
+			handler.ServeHTTP(responseRecorder, r)
+
+			assertions.Equal(tt.wantedStatus, responseRecorder.Code, tt.name)
+			assertions.Contains(responseRecorder.Body.String(), tt.wantedBody, tt.name)
+		})
+	}
 }
 
 func newRequest(method string, url string, jobInfo *jobs.JobInfo, t *testing.T) *http.Request {