Merge "NONRTRIC - Implement DMaaP mediator producer service in Java"

[nonrtric.git] / dmaap-mediator-producer / internal / jobs / jobs_test.go

diff --git a/dmaap-mediator-producer/internal/jobs/jobs_test.go b/dmaap-mediator-producer/internal/jobs/jobs_test.go
index 9fe27c3..8533719 100644 (file)
--- a/dmaap-mediator-producer/internal/jobs/jobs_test.go
+++ b/dmaap-mediator-producer/internal/jobs/jobs_test.go
@@ -165,6 +165,7 @@ func TestDeleteJob(t *testing.T) {
 func TestPollAndDistributeMessages(t *testing.T) {
        assertions := require.New(t)
 
+       wg := sync.WaitGroup{}
        messages := `[{"message": {"data": "data"}}]`
        pollClientMock := NewTestClient(func(req *http.Request) *http.Response {
                if req.URL.String() == "http://mrAddr/topicUrl" {
@@ -196,7 +197,9 @@ func TestPollAndDistributeMessages(t *testing.T) {
                t.Fail()
                return nil
        })
+
        handlerUnderTest := NewJobHandlerImpl("", pollClientMock, distributeClientMock)
+
        jobInfo := JobInfo{
                InfoTypeIdentity: "type1",
                InfoJobIdentity:  "job1",
@@ -211,7 +214,6 @@ func TestPollAndDistributeMessages(t *testing.T) {
                handlerUnderTest.clearAll()
        })
 
-       wg := sync.WaitGroup{}
        wg.Add(2) // Two calls should be made to the server, one to poll and one to distribute
        handlerUnderTest.pollAndDistributeMessages("http://mrAddr")