summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/test
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-02-17 09:48:20 +0200
committerIttay Stern <ittay.stern@att.com>2020-02-17 08:55:03 +0000
commita4fd70a3a183a3ced4c46415a25d081ece8ac098 (patch)
tree6b501395489531e0d16cd35a1098a8f11208bcc1 /vid-automation/src/test
parent599bfc9cf2a435006622332f9f3e5071f64bbbd6 (diff)
Fix intermittent test inProgressJobMoreThan24HoursIsFailedInVidAudit
Bit more time was needed. Issue-ID: VID-647 Change-Id: Ie7e101a2eb85e71a38d1cb2efd9f7327e4705fd3 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/test')
-rw-r--r--vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java63
1 files changed, 29 insertions, 34 deletions
diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java
index 5abc9a865..00aa69120 100644
--- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java
@@ -1,5 +1,6 @@
package org.onap.vid.api;
+import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.counting;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toList;
@@ -300,48 +301,42 @@ public class AsyncInstantiationMacroApiTest extends AsyncInstantiationBase {
}
- @Test
- public void inProgressJobMoreThan24HoursIsFailedInVidAudit() throws JsonProcessingException {
- addBulkPendingWithCustomList(Collections.singletonList(new PresetMSOOrchestrationRequestGet("IN_PROGRESS",24)));
+ @Test(dataProvider = "trueAndFalse", dataProviderClass = TestUtils.class)
+ public void inProgressJobMoreThan24HoursIsFailedInVidAudit(Boolean over24Hours) throws JsonProcessingException {
- AtomicReference<ServiceInfo> inProgressJob = new AtomicReference<>();
- AtomicReference<List<ServiceInfo>> serviceInfoRef = new AtomicReference<>();
- boolean isJobFound = Wait.waitFor(x->{
- List<ServiceInfo> serviceInfoList = serviceListCall().getBody();
- serviceInfoRef.set(serviceInfoList);
- inProgressJob.set(serviceInfoList.stream().
- filter(serviceInfo -> serviceInfo.serviceInstanceId.equals(PresetMSOOrchestrationRequestGet.DEFAULT_SERVICE_INSTANCE_ID) && serviceInfo.jobStatus.equals(JobStatus.FAILED))
- .findFirst()
- .orElse(null));
- return inProgressJob.get() != null;
- }, null, 15, 1);
+ // in case 24 did not pass -- IN_PROGRESS should persist; if 24 hour did pass -- fail
- org.junit.Assert.assertTrue(
- "Job with DEFAULT_SERVICE_INSTANCE_ID=" + PresetMSOOrchestrationRequestGet.DEFAULT_SERVICE_INSTANCE_ID
- + " and status FAILED should present: " + objectMapper.writeValueAsString(serviceInfoRef.get()), isJobFound);
+ int startedHoursAgo = over24Hours ? 24 : 23;
+ JobStatus jobStatus = over24Hours ? JobStatus.FAILED : JobStatus.IN_PROGRESS;
- verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList(JobStatus.PENDING.name(), JobStatus.IN_PROGRESS.name(),JobStatus.FAILED.name()), JobAuditStatus.SourceStatus.VID);
- verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList("REQUESTED", "IN_PROGRESS"), JobAuditStatus.SourceStatus.MSO);
- }
+ List<String> expectedStatuses = over24Hours
+ ? Arrays.asList(JobStatus.PENDING.name(), JobStatus.IN_PROGRESS.name(), JobStatus.FAILED.name())
+ : Arrays.asList(JobStatus.PENDING.name(), JobStatus.IN_PROGRESS.name());
- @Test
- public void inProgressJobLessThan24HoursIsStillInProgressInVidAudit(){
- addBulkPendingWithCustomList(Collections.singletonList(new PresetMSOOrchestrationRequestGet("IN_PROGRESS",23)));
+ AtomicReference<List<ServiceInfo>> serviceInfoRef = new AtomicReference<>();
+
+ Map<Keys, String> names = addBulkPendingWithCustomList(
+ singletonList(new PresetMSOOrchestrationRequestGet("IN_PROGRESS", startedHoursAgo)));
- AtomicReference<ServiceInfo> inProgressJob = new AtomicReference<>();
- boolean isJobFound = Wait.waitFor(x->{
+ boolean isJobFound = Wait.waitFor(x -> {
List<ServiceInfo> serviceInfoList = serviceListCall().getBody();
- inProgressJob.set(serviceInfoList.stream().filter(serviceInfo -> serviceInfo.serviceInstanceId.equals(PresetMSOOrchestrationRequestGet.DEFAULT_SERVICE_INSTANCE_ID))
- .findFirst()
- .orElse(null));
- return inProgressJob.get() != null;
- }, null, 15, 1);
+ serviceInfoRef.set(serviceInfoList);
+ ServiceInfo inProgressJob = serviceInfoList.stream()
+ .filter(serviceInfo -> serviceInfo.serviceInstanceName.equals(names.get(Keys.SERVICE_NAME)))
+ .findFirst()
+ .orElseThrow(() -> new AssertionError("Job with serviceInstanceName=" + Keys.SERVICE_NAME + " not found"));
- org.junit.Assert.assertTrue("Job with DEFAULT_SERVICE_INSTANCE_ID should present", isJobFound);
- org.junit.Assert.assertEquals("Tested job status is not as expected", JobStatus.IN_PROGRESS, inProgressJob.get().getJobStatus());
+ org.junit.Assert.assertEquals("Tested job status is not as expected",
+ jobStatus, inProgressJob.getJobStatus());
- verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList(JobStatus.PENDING.name(), JobStatus.IN_PROGRESS.name()), JobAuditStatus.SourceStatus.VID);
- verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList("REQUESTED", "IN_PROGRESS"), JobAuditStatus.SourceStatus.MSO);
+ verifyAuditStatuses(inProgressJob.jobId, expectedStatuses, JobAuditStatus.SourceStatus.VID);
+ verifyAuditStatuses(inProgressJob.jobId, Arrays.asList("REQUESTED", "IN_PROGRESS"), JobAuditStatus.SourceStatus.MSO);
+
+ return true;
+ }, null, 10, 2);
+
+ org.junit.Assert.assertTrue(
+ "Job with serviceInstanceName=" + Keys.SERVICE_NAME + " should present: " + objectMapper.writeValueAsString(serviceInfoRef.get()), isJobFound);
}
@Test