You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/08/25 07:25:59 UTC
[camel] branch main updated: (chores) camel-amqp: fixed tests
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 770cd86b957 (chores) camel-amqp: fixed tests
770cd86b957 is described below
commit 770cd86b957b860e7c997024979f866afd1da1d1
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 25 07:28:11 2022 +0200
(chores) camel-amqp: fixed tests
Recent refactoring in camel-test-infra-activemq (such as
49af0f8) require adjusting the test service lifecycle
---
.../org/apache/camel/component/amqp/AMQPRouteTest.java | 2 +-
.../component/amqp/artemis/AMQPEmbeddedBrokerTest.java | 15 ++++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index f67a32b39f5..21079ac5aa3 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -49,7 +49,7 @@ public class AMQPRouteTest extends CamelTestSupport {
static int amqpPort = AvailablePortFinder.getNextAvailable();
@RegisterExtension
- public static ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
+ public ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
.defaultBroker()
.withAmqpTransport(amqpPort)
.build();
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
index 73dbfc617b7..0735955a99d 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.amqp.artemis;
+import java.util.concurrent.TimeUnit;
+
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
@@ -31,12 +33,15 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
import static org.apache.camel.component.amqp.AMQPConnectionDetails.AMQP_PORT;
import static org.apache.camel.component.amqp.AMQPConnectionDetails.AMQP_SET_TOPIC_PREFIX;
import static org.apache.camel.component.amqp.AMQPConnectionDetails.discoverAMQP;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class AMQPEmbeddedBrokerTest extends CamelTestSupport {
static int amqpPort = AvailablePortFinder.getNextAvailable();
@@ -78,11 +83,15 @@ public class AMQPEmbeddedBrokerTest extends CamelTestSupport {
server.stop();
}
- @Test
- public void testTopicWithoutPrefix() throws Exception {
+ @BeforeEach
+ void prepareTest() {
resultEndpoint.expectedMessageCount(1);
template.sendBody("direct:send-topic", expectedBody);
- resultEndpoint.assertIsSatisfied();
+ }
+
+ @Test
+ public void testTopicWithoutPrefix() throws Exception {
+ resultEndpoint.assertIsSatisfied(10, TimeUnit.SECONDS);
}
@Override