X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fjobs%2Fjobs_test.go;h=3bb25787890ab46c14a69072784195898f13d451;hb=47d0ee37691eddc290a1f9e34091dfd2020db07f;hp=b53d85e66612e0174f7dc8b471abb6ff9d541867;hpb=280385634f160bb78a8944998e9106a2f6549eb0;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/jobs/jobs_test.go b/dmaap-mediator-producer/internal/jobs/jobs_test.go index b53d85e6..3bb25787 100644 --- a/dmaap-mediator-producer/internal/jobs/jobs_test.go +++ b/dmaap-mediator-producer/internal/jobs/jobs_test.go @@ -26,16 +26,15 @@ import ( "net/http" "os" "path/filepath" + "sync" "testing" "time" - "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient" - "oransc.org/nonrtric/dmaapmediatorproducer/mocks" ) -const typeDefinition = `{"id": "type1", "dmaapTopic": "unauthenticated.SEC_FAULT_OUTPUT", "schema": {"title": "Type 1"}}` +const typeDefinition = `{"types": [{"id": "type1", "dmaapTopicUrl": "events/unauthenticated.SEC_FAULT_OUTPUT/dmaapmediatorproducer/type1"}]}` func TestGetTypes_filesOkShouldReturnSliceOfTypesAndProvideSupportedTypes(t *testing.T) { assertions := require.New(t) @@ -47,19 +46,18 @@ func TestGetTypes_filesOkShouldReturnSliceOfTypesAndProvideSupportedTypes(t *tes os.RemoveAll(typesDir) clearAll() }) - typeDir = typesDir - fname := filepath.Join(typesDir, "type1.json") + fname := filepath.Join(typesDir, "type_config.json") + configFile = fname if err = os.WriteFile(fname, []byte(typeDefinition), 0666); err != nil { - t.Errorf("Unable to create temporary files for types due to: %v", err) + t.Errorf("Unable to create temporary config file for types due to: %v", err) } types, err := GetTypes() - wantedType := Type{ - TypeId: "type1", - DMaaPTopic: "unauthenticated.SEC_FAULT_OUTPUT", - Schema: `{"title":"Type 1"}`, - Jobs: make(map[string]JobInfo), + wantedType := TypeData{ + TypeId: "type1", + DMaaPTopicURL: "events/unauthenticated.SEC_FAULT_OUTPUT/dmaapmediatorproducer/type1", + Jobs: make(map[string]JobInfo), } - wantedTypes := []*Type{&wantedType} + wantedTypes := []TypeData{wantedType} assertions.EqualValues(wantedTypes, types) assertions.Nil(err) @@ -77,7 +75,7 @@ func TestAddJobWhenTypeIsSupported_shouldAddJobToAllJobsMap(t *testing.T) { InfoJobData: "{}", InfoTypeIdentity: "type1", } - allJobs["type1"] = Type{ + allTypes["type1"] = TypeData{ TypeId: "type1", Jobs: map[string]JobInfo{"job1": wantedJob}, } @@ -87,8 +85,8 @@ func TestAddJobWhenTypeIsSupported_shouldAddJobToAllJobsMap(t *testing.T) { err := AddJob(wantedJob) assertions.Nil(err) - assertions.Equal(1, len(allJobs["type1"].Jobs)) - assertions.Equal(wantedJob, allJobs["type1"].Jobs["job1"]) + assertions.Equal(1, len(allTypes["type1"].Jobs)) + assertions.Equal(wantedJob, allTypes["type1"].Jobs["job1"]) } func TestAddJobWhenTypeIsNotSupported_shouldReturnError(t *testing.T) { @@ -104,7 +102,7 @@ func TestAddJobWhenTypeIsNotSupported_shouldReturnError(t *testing.T) { func TestAddJobWhenJobIdMissing_shouldReturnError(t *testing.T) { assertions := require.New(t) - allJobs["type1"] = Type{ + allTypes["type1"] = TypeData{ TypeId: "type1", } t.Cleanup(func() { @@ -116,12 +114,12 @@ func TestAddJobWhenJobIdMissing_shouldReturnError(t *testing.T) { err := AddJob(jobInfo) assertions.NotNil(err) - assertions.Equal("missing required job identity: { type1}", err.Error()) + assertions.Equal("missing required job identity: { type1}", err.Error()) } func TestAddJobWhenTargetUriMissing_shouldReturnError(t *testing.T) { assertions := require.New(t) - allJobs["type1"] = Type{ + allTypes["type1"] = TypeData{ TypeId: "type1", } jobInfo := JobInfo{ @@ -131,10 +129,9 @@ func TestAddJobWhenTargetUriMissing_shouldReturnError(t *testing.T) { err := AddJob(jobInfo) assertions.NotNil(err) - assertions.Equal("missing required target URI: { job1 type1}", err.Error()) + assertions.Equal("missing required target URI: { job1 type1}", err.Error()) clearAll() } - func TestPollAndDistributeMessages(t *testing.T) { assertions := require.New(t) jobInfo := JobInfo{ @@ -142,45 +139,84 @@ func TestPollAndDistributeMessages(t *testing.T) { InfoJobIdentity: "job1", TargetUri: "http://consumerHost/target", } - allJobs["type1"] = Type{ - TypeId: "type1", - DMaaPTopic: "topic", - Jobs: map[string]JobInfo{"job1": jobInfo}, + allTypes["type1"] = TypeData{ + TypeId: "type1", + DMaaPTopicURL: "topicUrl", + Jobs: map[string]JobInfo{"job1": jobInfo}, } t.Cleanup(func() { clearAll() }) - body := ioutil.NopCloser(bytes.NewReader([]byte(`[{"message": {"data": "data"}}]`))) - clientMock := mocks.HTTPClient{} - clientMock.On("Get", mock.Anything).Return(&http.Response{ - StatusCode: http.StatusOK, - Body: body, - }, nil) - - clientMock.On("Do", mock.Anything).Return(&http.Response{ - StatusCode: http.StatusOK, - }, nil) + wg := sync.WaitGroup{} + wg.Add(2) // Two calls should be made to the server, one to poll and one to distribute + messages := `[{"message": {"data": "data"}}]` + clientMock := NewTestClient(func(req *http.Request) *http.Response { + if req.URL.String() == "http://mrAddr/topicUrl" { + assertions.Equal(req.Method, "GET") + wg.Done() + return &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(bytes.NewReader([]byte(messages))), + Header: make(http.Header), // Must be set to non-nil value or it panics + } + } else if req.URL.String() == "http://consumerHost/target" { + assertions.Equal(req.Method, "POST") + assertions.Equal(messages, getBodyAsString(req)) + assertions.Equal("application/json; charset=utf-8", req.Header.Get("Content-Type")) + wg.Done() + return &http.Response{ + StatusCode: 200, + Body: ioutil.NopCloser(bytes.NewBufferString(`OK`)), + Header: make(http.Header), // Must be set to non-nil value or it panics + } + } + t.Error("Wrong call to client: ", req) + t.Fail() + return nil + }) - restclient.Client = &clientMock + restclient.Client = clientMock pollAndDistributeMessages("http://mrAddr") - time.Sleep(100 * time.Millisecond) - - var actualRequest *http.Request - clientMock.AssertCalled(t, "Get", "http://mrAddr/events/topic/users/dmaapmediatorproducer") - clientMock.AssertNumberOfCalls(t, "Get", 1) - - clientMock.AssertCalled(t, "Do", mock.MatchedBy(func(req *http.Request) bool { - actualRequest = req - return true - })) - assertions.Equal(http.MethodPost, actualRequest.Method) - assertions.Equal("consumerHost", actualRequest.URL.Host) - assertions.Equal("/target", actualRequest.URL.Path) - assertions.Equal("application/json; charset=utf-8", actualRequest.Header.Get("Content-Type")) - actualBody, _ := ioutil.ReadAll(actualRequest.Body) - assertions.Equal([]byte(`[{"message": {"data": "data"}}]`), actualBody) - clientMock.AssertNumberOfCalls(t, "Do", 1) + if waitTimeout(&wg, 100*time.Millisecond) { + t.Error("Not all calls to server were made") + t.Fail() + } +} + +type RoundTripFunc func(req *http.Request) *http.Response + +func (f RoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) { + return f(req), nil +} + +//NewTestClient returns *http.Client with Transport replaced to avoid making real calls +func NewTestClient(fn RoundTripFunc) *http.Client { + return &http.Client{ + Transport: RoundTripFunc(fn), + } +} + +// waitTimeout waits for the waitgroup for the specified max timeout. +// Returns true if waiting timed out. +func waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool { + c := make(chan struct{}) + go func() { + defer close(c) + wg.Wait() + }() + select { + case <-c: + return false // completed normally + case <-time.After(timeout): + return true // timed out + } +} + +func getBodyAsString(req *http.Request) string { + buf := new(bytes.Buffer) + buf.ReadFrom(req.Body) + return buf.String() }