"time"
"github.com/stretchr/testify/require"
- "oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient"
+ "oransc.org/nonrtric/dmaapmediatorproducer/internal/config"
)
const typeDefinition = `{"types": [{"id": "type1", "dmaapTopicUrl": "events/unauthenticated.SEC_FAULT_OUTPUT/dmaapmediatorproducer/type1"}]}`
if err != nil {
t.Errorf("Unable to create temporary directory for types due to: %v", err)
}
+ fname := filepath.Join(typesDir, "type_config.json")
+ managerUnderTest := NewJobsManagerImpl(fname, nil, "", nil)
t.Cleanup(func() {
os.RemoveAll(typesDir)
- clearAll()
})
- 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 config file for types due to: %v", err)
}
- types, err := GetTypes()
- wantedType := TypeData{
- TypeId: "type1",
- DMaaPTopicURL: "events/unauthenticated.SEC_FAULT_OUTPUT/dmaapmediatorproducer/type1",
- Jobs: make(map[string]JobInfo),
+ types, err := managerUnderTest.LoadTypesFromConfiguration()
+ wantedType := config.TypeDefinition{
+ Id: "type1",
+ DmaapTopicURL: "events/unauthenticated.SEC_FAULT_OUTPUT/dmaapmediatorproducer/type1",
}
- wantedTypes := []TypeData{wantedType}
+ wantedTypes := []config.TypeDefinition{wantedType}
assertions.EqualValues(wantedTypes, types)
assertions.Nil(err)
- supportedTypes := GetSupportedTypes()
+ supportedTypes := managerUnderTest.GetSupportedTypes()
assertions.EqualValues([]string{"type1"}, supportedTypes)
}
-func TestAddJobWhenTypeIsSupported_shouldAddJobToAllJobsMap(t *testing.T) {
+func TestManagerAddJobWhenTypeIsSupported_shouldAddJobToChannel(t *testing.T) {
assertions := require.New(t)
+ managerUnderTest := NewJobsManagerImpl("", nil, "", nil)
wantedJob := JobInfo{
Owner: "owner",
LastUpdated: "now",
InfoJobData: "{}",
InfoTypeIdentity: "type1",
}
- allTypes["type1"] = TypeData{
- TypeId: "type1",
- Jobs: map[string]JobInfo{"job1": wantedJob},
+ jobHandler := jobHandler{
+ addJobCh: make(chan JobInfo)}
+ managerUnderTest.allTypes["type1"] = TypeData{
+ TypeId: "type1",
+ jobHandler: &jobHandler,
}
- t.Cleanup(func() {
- clearAll()
- })
- err := AddJob(wantedJob)
+ var err error
+ go func() {
+ err = managerUnderTest.AddJob(wantedJob)
+ }()
+
assertions.Nil(err)
- assertions.Equal(1, len(allTypes["type1"].Jobs))
- assertions.Equal(wantedJob, allTypes["type1"].Jobs["job1"])
+ addedJob := <-jobHandler.addJobCh
+ assertions.Equal(wantedJob, addedJob)
}
-func TestAddJobWhenTypeIsNotSupported_shouldReturnError(t *testing.T) {
+func TestManagerAddJobWhenTypeIsNotSupported_shouldReturnError(t *testing.T) {
assertions := require.New(t)
+ managerUnderTest := NewJobsManagerImpl("", nil, "", nil)
jobInfo := JobInfo{
InfoTypeIdentity: "type1",
}
- err := AddJob(jobInfo)
+ err := managerUnderTest.AddJob(jobInfo)
assertions.NotNil(err)
assertions.Equal("type not supported: type1", err.Error())
}
-func TestAddJobWhenJobIdMissing_shouldReturnError(t *testing.T) {
+func TestManagerAddJobWhenJobIdMissing_shouldReturnError(t *testing.T) {
assertions := require.New(t)
- allTypes["type1"] = TypeData{
+ managerUnderTest := NewJobsManagerImpl("", nil, "", nil)
+ managerUnderTest.allTypes["type1"] = TypeData{
TypeId: "type1",
}
- t.Cleanup(func() {
- clearAll()
- })
+
jobInfo := JobInfo{
InfoTypeIdentity: "type1",
}
-
- err := AddJob(jobInfo)
+ err := managerUnderTest.AddJob(jobInfo)
assertions.NotNil(err)
assertions.Equal("missing required job identity: { <nil> type1}", err.Error())
}
-func TestAddJobWhenTargetUriMissing_shouldReturnError(t *testing.T) {
+func TestManagerAddJobWhenTargetUriMissing_shouldReturnError(t *testing.T) {
assertions := require.New(t)
- allTypes["type1"] = TypeData{
+ managerUnderTest := NewJobsManagerImpl("", nil, "", nil)
+ managerUnderTest.allTypes["type1"] = TypeData{
TypeId: "type1",
}
+
jobInfo := JobInfo{
InfoTypeIdentity: "type1",
InfoJobIdentity: "job1",
}
-
- err := AddJob(jobInfo)
+ err := managerUnderTest.AddJob(jobInfo)
assertions.NotNil(err)
assertions.Equal("missing required target URI: { job1 <nil> type1}", err.Error())
- clearAll()
}
-func TestDeleteJob(t *testing.T) {
+func TestManagerDeleteJob(t *testing.T) {
assertions := require.New(t)
- jobToKeep := JobInfo{
- InfoJobIdentity: "job1",
- InfoTypeIdentity: "type1",
- }
- jobToDelete := JobInfo{
- InfoJobIdentity: "job2",
- InfoTypeIdentity: "type1",
+ managerUnderTest := NewJobsManagerImpl("", nil, "", nil)
+ jobHandler := jobHandler{
+ deleteJobCh: make(chan string)}
+ managerUnderTest.allTypes["type1"] = TypeData{
+ TypeId: "type1",
+ jobHandler: &jobHandler,
}
- allTypes["type1"] = TypeData{
- TypeId: "type1",
- Jobs: map[string]JobInfo{"job1": jobToKeep, "job2": jobToDelete},
- }
- t.Cleanup(func() {
- clearAll()
- })
- DeleteJob("job2")
- assertions.Equal(1, len(allTypes["type1"].Jobs))
- assertions.Equal(jobToKeep, allTypes["type1"].Jobs["job1"])
+ go managerUnderTest.DeleteJob("job2")
+
+ assertions.Equal("job2", <-jobHandler.deleteJobCh)
}
-func TestPollAndDistributeMessages(t *testing.T) {
+func TestHandlerPollAndDistributeMessages(t *testing.T) {
assertions := require.New(t)
- jobInfo := JobInfo{
- InfoTypeIdentity: "type1",
- InfoJobIdentity: "job1",
- TargetUri: "http://consumerHost/target",
- }
- allTypes["type1"] = TypeData{
- TypeId: "type1",
- DMaaPTopicURL: "topicUrl",
- Jobs: map[string]JobInfo{"job1": jobInfo},
- }
- t.Cleanup(func() {
- clearAll()
- })
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 {
+ pollClientMock := NewTestClient(func(req *http.Request) *http.Response {
if req.URL.String() == "http://mrAddr/topicUrl" {
assertions.Equal(req.Method, "GET")
- wg.Done()
+ wg.Done() // Signal that the poll call has been made
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" {
+ }
+ t.Error("Wrong call to client: ", req)
+ t.Fail()
+ return nil
+ })
+ 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("application/json; charset=utf-8", req.Header.Get("Content-Type"))
- wg.Done()
+ assertions.Equal("application/json", req.Header.Get("Content-Type"))
+ wg.Done() // Signal that the distribution call has been made
return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(bytes.NewBufferString(`OK`)),
return nil
})
- restclient.Client = clientMock
+ jobInfo := JobInfo{
+ InfoTypeIdentity: "type1",
+ InfoJobIdentity: "job1",
+ TargetUri: "http://consumerHost/target",
+ }
+ handlerUnderTest := jobHandler{
+ topicUrl: "/topicUrl",
+ jobs: map[string]JobInfo{jobInfo.InfoJobIdentity: jobInfo},
+ pollClient: pollClientMock,
+ distributeClient: distributeClientMock,
+ }
- pollAndDistributeMessages("http://mrAddr")
+ wg.Add(2) // Two calls should be made to the server, one to poll and one to distribute
+ handlerUnderTest.pollAndDistributeMessages("http://mrAddr")
if waitTimeout(&wg, 100*time.Millisecond) {
t.Error("Not all calls to server were made")
}
}
+func TestHandlerAddJob_shouldAddJobToJobsMap(t *testing.T) {
+ assertions := require.New(t)
+
+ jobInfo := JobInfo{
+ InfoTypeIdentity: "type1",
+ InfoJobIdentity: "job1",
+ TargetUri: "http://consumerHost/target",
+ }
+
+ addCh := make(chan JobInfo)
+ handlerUnderTest := jobHandler{
+ mu: sync.Mutex{},
+ jobs: map[string]JobInfo{},
+ addJobCh: addCh,
+ }
+
+ go func() {
+ addCh <- jobInfo
+ }()
+
+ handlerUnderTest.monitorManagementChannels()
+
+ assertions.Len(handlerUnderTest.jobs, 1)
+ assertions.Equal(jobInfo, handlerUnderTest.jobs["job1"])
+}
+
+func TestHandlerDeleteJob_shouldDeleteJobFromJobsMap(t *testing.T) {
+ assertions := require.New(t)
+
+ deleteCh := make(chan string)
+ handlerUnderTest := jobHandler{
+ mu: sync.Mutex{},
+ jobs: map[string]JobInfo{"job1": {
+ InfoJobIdentity: "job1",
+ }},
+ deleteJobCh: deleteCh,
+ }
+
+ go func() {
+ deleteCh <- "job1"
+ }()
+
+ handlerUnderTest.monitorManagementChannels()
+
+ assertions.Len(handlerUnderTest.jobs, 0)
+}
+
type RoundTripFunc func(req *http.Request) *http.Response
func (f RoundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
Code Review / nonrtric.git / blobdiff