X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fjobs%2Fjobs_test.go;h=552b5fa103b7096b1d639f5958ff59dc5c078c13;hb=46a0fd717e5f49ebae6cb2c4fbcf54f0e329dc86;hp=066823d5ab3c2a523b37046fb1769854a97f7665;hpb=5ee9fd987436011e7130eb05126858cfe54ca545;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/jobs/jobs_test.go b/dmaap-mediator-producer/internal/jobs/jobs_test.go
index 066823d5..552b5fa1 100644
--- a/dmaap-mediator-producer/internal/jobs/jobs_test.go
+++ b/dmaap-mediator-producer/internal/jobs/jobs_test.go
@@ -83,7 +83,7 @@ func TestJobsManagerAddJobWhenTypeIsSupported_shouldAddJobToChannel(t *testing.T
 
 	var err error
 	go func() {
-		err = managerUnderTest.AddJob(wantedJob)
+		err = managerUnderTest.AddJobFromRESTCall(wantedJob)
 	}()
 
 	assertions.Nil(err)
@@ -98,7 +98,7 @@ func TestJobsManagerAddJobWhenTypeIsNotSupported_shouldReturnError(t *testing.T)
 		InfoTypeIdentity: "type1",
 	}
 
-	err := managerUnderTest.AddJob(jobInfo)
+	err := managerUnderTest.AddJobFromRESTCall(jobInfo)
 	assertions.NotNil(err)
 	assertions.Equal("type not supported: type1", err.Error())
 }
@@ -113,7 +113,7 @@ func TestJobsManagerAddJobWhenJobIdMissing_shouldReturnError(t *testing.T) {
 	jobInfo := JobInfo{
 		InfoTypeIdentity: "type1",
 	}
-	err := managerUnderTest.AddJob(jobInfo)
+	err := managerUnderTest.AddJobFromRESTCall(jobInfo)
 	assertions.NotNil(err)
 	assertions.Equal("missing required job identity: {    <nil> type1}", err.Error())
 }
@@ -129,7 +129,7 @@ func TestJobsManagerAddJobWhenTargetUriMissing_shouldReturnError(t *testing.T) {
 		InfoTypeIdentity: "type1",
 		InfoJobIdentity:  "job1",
 	}
-	err := managerUnderTest.AddJob(jobInfo)
+	err := managerUnderTest.AddJobFromRESTCall(jobInfo)
 	assertions.NotNil(err)
 	assertions.Equal("missing required target URI: {  job1  <nil> type1}", err.Error())
 }
@@ -144,7 +144,7 @@ func TestJobsManagerDeleteJob_shouldSendDeleteToChannel(t *testing.T) {
 		jobsHandler: &jobsHandler,
 	}
 
-	go managerUnderTest.DeleteJob("job2")
+	go managerUnderTest.DeleteJobFromRESTCall("job2")
 
 	assertions.Equal("job2", <-jobsHandler.deleteJobCh)
 }
@@ -177,7 +177,7 @@ func TestAddJobToJobsManager_shouldStartPollAndDistributeMessages(t *testing.T)
 	distributeClientMock := NewTestClient(func(req *http.Request) *http.Response {
 		if req.URL.String() == "http://consumerHost/target" {
 			assertions.Equal(req.Method, "POST")
-			assertions.Equal(messages, getBodyAsString(req))
+			assertions.Equal(messages, getBodyAsString(req, t))
 			assertions.Equal("application/json", req.Header.Get("Content-Type"))
 			wg.Done()
 			return &http.Response{
@@ -199,7 +199,7 @@ func TestAddJobToJobsManager_shouldStartPollAndDistributeMessages(t *testing.T)
 		jobsHandler:   jobsHandler,
 	}
 
-	jobsManager.StartJobs()
+	jobsManager.StartJobsForAllTypes()
 
 	jobInfo := JobInfo{
 		InfoTypeIdentity: "type1",
@@ -208,7 +208,8 @@ func TestAddJobToJobsManager_shouldStartPollAndDistributeMessages(t *testing.T)
 	}
 
 	wg.Add(1) // Wait till the distribution has happened
-	jobsManager.AddJob(jobInfo)
+	err := jobsManager.AddJobFromRESTCall(jobInfo)
+	assertions.Nil(err)
 
 	if waitTimeout(&wg, 2*time.Second) {
 		t.Error("Not all calls to server were made")
@@ -287,8 +288,10 @@ func waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool {
 	}
 }
 
-func getBodyAsString(req *http.Request) string {
+func getBodyAsString(req *http.Request, t *testing.T) string {
 	buf := new(bytes.Buffer)
-	buf.ReadFrom(req.Body)
+	if _, err := buf.ReadFrom(req.Body); err != nil {
+		t.Fail()
+	}
 	return buf.String()
 }