diff options
author | Einat Vinouze <einat.vinouze@intl.att.com> | 2019-07-16 17:17:36 +0300 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-07-30 06:01:44 +0300 |
commit | e601bbdc43bae9a08e2e10c5139a6f76b47860d7 (patch) | |
tree | 1913f0b369ead3f2ea5557e5649d8281eca9871c /vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java | |
parent | 76c6ee4a697617ec4cdee2f3b48bc83136c858c5 (diff) |
Implant vid-app-common org.onap.vid.job (main and test)
Issue-ID: VID-378
Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java')
-rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java | 99 |
1 files changed, 58 insertions, 41 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java index bdb2a2834..ce5840bfc 100644 --- a/vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/services/AuditServiceImplTest.java @@ -19,71 +19,88 @@ */ package org.onap.vid.services; -import org.glassfish.grizzly.http.util.HttpStatus; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.onap.vid.dal.AsyncInstantiationRepository; import org.onap.vid.model.JobAuditStatus; +import org.onap.vid.mso.RestMsoImplementation; +import org.onap.vid.mso.RestObject; +import org.onap.vid.mso.rest.AsyncRequestStatus; import org.onap.vid.mso.rest.AsyncRequestStatusList; import org.onap.vid.testUtils.TestUtils; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.IOException; -import java.util.Date; import java.util.List; -import java.util.UUID; -import static java.util.stream.Collectors.toList; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.MockitoAnnotations.initMocks; +import static org.hamcrest.Matchers.equalTo; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.when; public class AuditServiceImplTest { + + @Mock + private RestMsoImplementation restMso; @Mock - private AsyncInstantiationBusinessLogic asyncInstantiationBL; + private AsyncInstantiationRepository asyncInstantiationRepository; @InjectMocks private AuditServiceImpl auditService; - @BeforeClass - public void init() { - initMocks(this); + @BeforeMethod + public void setUp() { + restMso = null; + asyncInstantiationRepository = null; + auditService = null; + MockitoAnnotations.initMocks(this); } @Test - public void setFailedAuditStatusFromMsoTest() { - - UUID jobUuid = UUID.randomUUID(); - String requestId = "1"; - int statusCode = HttpStatus.OK_200.getStatusCode(); - String msoResponse = "{}"; - - auditService.setFailedAuditStatusFromMso(jobUuid, requestId, statusCode, msoResponse); - - verify(asyncInstantiationBL, times(1)) - .auditMsoStatus( - Mockito.any(UUID.class), - Mockito.anyString(), - Mockito.anyString(), - Mockito.anyString()); + public void testGetRequestsIdsByServiceIdAndRequestTypeAndScope() throws Exception { + + String instanceId = "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2"; + //the request id in multipleOrchestrationRequestsServiceInstance.json + String expectedRequestId = "fab854bf-e53c-415e-b3cc-b6fcce8414b2"; + String msoBasePath = "/someMsoPath/v2019?"; + + AsyncRequestStatusList asyncRequestStatusList = TestUtils.readJsonResourceFileAsObject( + "/responses/mso/multipleOrchestrationRequestsServiceInstance.json", + AsyncRequestStatusList.class); + RestObject<AsyncRequestStatusList> msoResponse = new RestObject<>(); + msoResponse.set(asyncRequestStatusList); + msoResponse.setStatusCode(200); + when(restMso.GetForObject(eq(msoBasePath + "filter=serviceInstanceId:EQUALS:" + instanceId), + eq(AsyncRequestStatusList.class))) + .thenReturn(msoResponse); + TestUtils.testWithSystemProperty("mso.restapi.get.orc.reqs", msoBasePath, () -> { + List<AsyncRequestStatus.Request> result = auditService + .retrieveRequestsFromMsoByServiceIdAndRequestTypeAndScope(instanceId, "createInstance", "service"); + assertThat(result.size(), equalTo(1)); + assertThat(result.get(0).requestId, equalTo(expectedRequestId)); + assertThat(result.get(0).startTime, equalTo("Mon, 04 Mar 2019 20:47:15 GMT")); + }); } @Test - public void testConvertMsoResponseStatusToJobAuditStatus_missingDateFromMso_shouldNoError() throws IOException { - final AsyncRequestStatusList asyncRequestStatusList = TestUtils.readJsonResourceFileAsObject("/orchestrationRequestsByServiceInstanceId.json", AsyncRequestStatusList.class); - - AuditServiceImpl auditService = new AuditServiceImpl(null, null); - - final List<JobAuditStatus> jobAuditStatuses = auditService.convertMsoResponseStatusToJobAuditStatus(asyncRequestStatusList.getRequestList(), "foo"); - - final List<Date> dates = jobAuditStatuses.stream().map(JobAuditStatus::getCreatedDate).collect(toList()); - final List<String> statuses = jobAuditStatuses.stream().map(JobAuditStatus::getJobStatus).collect(toList()); + public void nextOrdinalAfter_givenNull_returnZero() { + assertThat( + auditService.nextOrdinalAfter(null), + equalTo(0) + ); + } - assertThat(dates, containsInAnyOrder(notNullValue(), notNullValue(), nullValue())); - assertThat(statuses, containsInAnyOrder("COMPLETE", "COMPLETE", "IN_PROGRESS")); + @Test + public void nextOrdinalAfter_givenX_returnXplus1() { + final int x = 6; + final JobAuditStatus jobAuditStatus = new JobAuditStatus(); + jobAuditStatus.setOrdinal(x); + + assertThat( + auditService.nextOrdinalAfter(jobAuditStatus), + equalTo(x + 1) + ); } } |