diff options
Diffstat (limited to 'src/test/java/org/onap/nbi/apis/ApiTest.java')
-rw-r--r-- | src/test/java/org/onap/nbi/apis/ApiTest.java | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/test/java/org/onap/nbi/apis/ApiTest.java b/src/test/java/org/onap/nbi/apis/ApiTest.java index 22e6200..5bf9983 100644 --- a/src/test/java/org/onap/nbi/apis/ApiTest.java +++ b/src/test/java/org/onap/nbi/apis/ApiTest.java @@ -49,6 +49,7 @@ import org.onap.nbi.apis.serviceorder.repositories.ExecutionTaskRepository; import org.onap.nbi.apis.serviceorder.repositories.ServiceOrderRepository; import org.onap.nbi.apis.serviceorder.workflow.SOTaskProcessor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.ResponseEntity; @@ -102,6 +103,9 @@ public class ApiTest { static Validator validator; + @Value("${scheduler.pollingDurationInMins}") + private float pollingDurationInMins; + @Before public void before() { MockHttpServletRequest request = new MockHttpServletRequest(); @@ -998,11 +1002,8 @@ public class ApiTest { } } executionTaskA = getExecutionTask("A"); - assertThat(executionTaskA.getNbRetries()).isEqualTo(2); - SoTaskProcessor.processOrderItem(executionTaskA); - executionTaskA = getExecutionTask("A"); - SoTaskProcessor.processOrderItem(executionTaskA); - executionTaskA = getExecutionTask("A"); + assertThat(executionTaskA.getLastAttemptDate().getTime()>executionTaskA.getCreateDate().getTime()).isTrue(); + Thread.sleep((long)(pollingDurationInMins*60000 + 1)); SoTaskProcessor.processOrderItem(executionTaskA); serviceOrderChecked = serviceOrderRepository.findOne("test"); @@ -1038,11 +1039,8 @@ public class ApiTest { } } executionTaskA = getExecutionTask("A"); - assertThat(executionTaskA.getNbRetries()).isEqualTo(2); - SoTaskProcessor.processOrderItem(executionTaskA); - executionTaskA = getExecutionTask("A"); - SoTaskProcessor.processOrderItem(executionTaskA); - executionTaskA = getExecutionTask("A"); + assertThat(executionTaskA.getLastAttemptDate().getTime()>executionTaskA.getCreateDate().getTime()).isTrue(); + Thread.sleep((long)(pollingDurationInMins*60000 + 1)); SoTaskProcessor.processOrderItem(executionTaskA); serviceOrderChecked = serviceOrderRepository.findOne("test"); @@ -1228,11 +1226,8 @@ public class ApiTest { } } executionTaskA = getExecutionTask("A"); - assertThat(executionTaskA.getNbRetries()).isEqualTo(2); - SoTaskProcessor.processOrderItem(executionTaskA); - executionTaskA = getExecutionTask("A"); - SoTaskProcessor.processOrderItem(executionTaskA); - executionTaskA = getExecutionTask("A"); + assertThat(executionTaskA.getLastAttemptDate().getTime()>executionTaskA.getCreateDate().getTime()).isTrue(); + Thread.sleep((long)(pollingDurationInMins*60000 + 1)); SoTaskProcessor.processOrderItem(executionTaskA); serviceOrderChecked = serviceOrderRepository.findOne("test"); |