You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/02/12 17:55:06 UTC
[camel-quarkus] branch master updated: Fix intermittent failure of
SpringRabbitmqTest
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 1c1bc00 Fix intermittent failure of SpringRabbitmqTest
1c1bc00 is described below
commit 1c1bc00c7517ec9b709b1ddedb6c095846135f74
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Feb 12 15:22:21 2021 +0000
Fix intermittent failure of SpringRabbitmqTest
---
.../spring/rabbitmq/it/SpringRabbitmqResource.java | 6 ++----
.../component/spring/rabbitmq/it/SpringRabbitmqTest.java | 13 +------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/integration-tests/spring-rabbitmq/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqResource.java b/integration-tests/spring-rabbitmq/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqResource.java
index 39d1607..72a0076 100644
--- a/integration-tests/spring-rabbitmq/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqResource.java
+++ b/integration-tests/spring-rabbitmq/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqResource.java
@@ -63,10 +63,8 @@ public class SpringRabbitmqResource {
@Path("/getFromDirect")
@POST
@Produces(MediaType.TEXT_PLAIN)
- public String getFromDirect(@QueryParam(QUERY_DIRECT) String directName, @QueryParam(QUERY_TIMEOUT) int timeout) {
- final String message = timeout > 0 ? consumerTemplate.receiveBody(directName, timeout, String.class)
- : consumerTemplate.receiveBodyNoWait(directName, String.class);
- return message;
+ public String getFromDirect(@QueryParam(QUERY_DIRECT) String directName) {
+ return consumerTemplate.receiveBody(directName, 5000, String.class);
}
@Path("/send")
diff --git a/integration-tests/spring-rabbitmq/src/test/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqTest.java b/integration-tests/spring-rabbitmq/src/test/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqTest.java
index 255bef8..2fdddec 100644
--- a/integration-tests/spring-rabbitmq/src/test/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqTest.java
+++ b/integration-tests/spring-rabbitmq/src/test/java/org/apache/camel/quarkus/component/spring/rabbitmq/it/SpringRabbitmqTest.java
@@ -40,18 +40,12 @@ class SpringRabbitmqTest {
@Test
public void testInOut() {
- //direct has to be empty
- getFromDirect(SpringRabbitmqResource.DIRECT_IN_OUT)
- .then()
- .statusCode(204);
-
sendToExchange(SpringRabbitmqResource.EXCHANGE_IN_OUT, SpringRabbitmqResource.ROUTING_KEY_IN_OUT, "Sheldon");
getFromDirect(SpringRabbitmqResource.DIRECT_IN_OUT)
.then()
.statusCode(200)
.body(is("Hello Sheldon"));
-
}
@Test
@@ -71,7 +65,7 @@ class SpringRabbitmqTest {
sendToExchange(EXCHANGE_POLLING, ROUTING_KEY_POLLING, "Sheldon");
//get result from direct (for pooling) with timeout
- getFromDirect(SpringRabbitmqResource.DIRECT_POLLING, 1000)
+ getFromDirect(SpringRabbitmqResource.DIRECT_POLLING)
.then()
.statusCode(200)
.body(is("Polling Hello Sheldon"));
@@ -87,13 +81,8 @@ class SpringRabbitmqTest {
}
private Response getFromDirect(String direct) {
- return getFromDirect(direct, 0);
- }
-
- private Response getFromDirect(String direct, int timeout) {
return RestAssured.given()
.queryParam(SpringRabbitmqResource.QUERY_DIRECT, direct)
- .queryParam(SpringRabbitmqResource.QUERY_TIMEOUT, timeout)
.post("/spring-rabbitmq/getFromDirect");
}