This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ac751b8701043f9c5ed6f6bbb3ff947105ab5577 Author: Vratislav Hais <[email protected]> AuthorDate: Wed Sep 15 10:07:27 2021 +0200 [#2777] Resolve comments in PR --- .../component/aws2/sqs/it/Aws2SqsSnsResource.java | 14 ++++++-------- .../quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java | 19 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/integration-test-groups/aws2/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsResource.java b/integration-test-groups/aws2/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsResource.java index 1a48c60..f1c3021 100644 --- a/integration-test-groups/aws2/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsResource.java +++ b/integration-test-groups/aws2/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsResource.java @@ -87,7 +87,7 @@ public class Aws2SqsSnsResource { @POST @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN) - public Response sqsSendSpecificQueue(@PathParam("queueName") String queueName, String message) throws Exception { + public Response sqsSendToSpecificQueue(@PathParam("queueName") String queueName, String message) throws Exception { final String response = producerTemplate.requestBody(componentUri(queueName), message, String.class); return Response .created(new URI("https://camel.apache.org/";)) @@ -179,13 +179,11 @@ public class Aws2SqsSnsResource { public List<String> autoCreateDelayedQueue(@PathParam("queueName") String queueName, @PathParam("delay") String delay) throws Exception { // queue creation without any operation resulted in 405 status code - return producerTemplate - .requestBody( - "aws2-sqs://" + queueName - + "?autoCreateQueue=true&delayQueue=true&delaySeconds=" + delay + "&operation=listQueues", - null, - ListQueuesResponse.class) - .queueUrls(); + return producerTemplate.requestBody( + "aws2-sqs://" + queueName + + "?autoCreateQueue=true&delayQueue=true&delaySeconds=" + delay + "&operation=listQueues", + null, + ListQueuesResponse.class).queueUrls(); } private String componentUri() { diff --git a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java index c68c2ad..7f41c1b 100644 --- a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java +++ b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java @@ -34,6 +34,7 @@ import org.awaitility.Awaitility; import org.eclipse.microprofile.config.ConfigProvider; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.anyOf; @@ -51,7 +52,7 @@ class Aws2SqsSnsTest { Assertions.assertTrue(Stream.of(queues).anyMatch(url -> url.contains(queueName))); final String msg = sendSingleMessageToQueue(queueName); - awaitMessageFromQueue(msg, queueName); + awaitMessageWithExpectedContentFromQueue(msg, queueName); } private String[] listQueues() { @@ -102,28 +103,26 @@ class Aws2SqsSnsTest { } @Test + @Disabled("https://github.com/apache/camel-quarkus/issues/3097";) public void sqsAutoCreateDelayedQueue() { final String qName = "delayQueue"; final int delay = 10; - createDelayQueueAndVerifyExistence("delayQueue", 10); + createDelayQueueAndVerifyExistence("delayQueue", delay); final String msgSent = sendSingleMessageToQueue(qName); Instant start = Instant.now(); - awaitMessageFromQueue(msgSent, qName); + awaitMessageWithExpectedContentFromQueue(msgSent, qName); Assertions.assertTrue(Duration.between(start, Instant.now()).getSeconds() >= delay); deleteQueue(qName); } private void createDelayQueueAndVerifyExistence(String queueName, int delay) { - final String[] queues = RestAssured.get("/aws2-sqs-sns/sqs/queue/autocreate/delayed/" + queueName + "/" + delay) + RestAssured.post("/aws2-sqs-sns/sqs/queue/autocreate/delayed/" + queueName + "/" + delay) .then() - .statusCode(200) - .extract() - .body() - .as(String[].class); - Assertions.assertTrue(Stream.of(queues).anyMatch(url -> url.contains(queueName))); + .statusCode(200); + Assertions.assertTrue(Stream.of(listQueues()).anyMatch(url -> url.contains(queueName))); } - private void awaitMessageFromQueue(String expectedContent, String queueName) { + private void awaitMessageWithExpectedContentFromQueue(String expectedContent, String queueName) { Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(120, TimeUnit.SECONDS).until( () -> receiveMessageFromQueue(queueName), Matchers.is(expectedContent));
