You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/06/11 07:52:13 UTC
[camel] 03/11: [CAMEL-11807] Upgrade camel-activemq to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 11b9df0fa4c9da360d6d83b4c745f4662ed5c8d9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jun 11 08:38:36 2020 +0200
[CAMEL-11807] Upgrade camel-activemq to junit5
---
components/camel-activemq/pom.xml | 8 +-
.../camel/component/activemq/AMQ2240Test.java | 8 +-
.../camel/component/activemq/AMQ2611Test.java | 8 +-
...tiveMQComponentFactoryUserNamePasswordTest.java | 7 +-
.../ActiveMQComponentUserNamePasswordTest.java | 7 +-
.../component/activemq/ActiveMQConfigureTest.java | 25 ++--
.../activemq/ActiveMQJmsHeaderRouteForceTest.java | 2 +
.../activemq/ActiveMQJmsHeaderRouteTest.java | 8 +-
.../activemq/ActiveMQOriginalDestinationTest.java | 7 +-
.../ActiveMQReplyToHeaderUsingConverterTest.java | 9 +-
.../component/activemq/ActiveMQRouteTest.java | 8 +-
.../activemq/AdvisoryConsumerExample.java | 4 +-
.../CamelDestinationExclusiveConsumerTest.java | 8 +-
.../activemq/CamelEmbeddedBrokerTestSupport.java | 132 -------------------
.../activemq/CamelVMTransportRoutingTest.java | 21 +--
.../activemq/ComplexRequestReplyTest.java | 12 +-
.../apache/camel/component/activemq/DlqTest.java | 7 +-
...nvokeRequestReplyUsingJmsReplyToHeaderTest.java | 10 +-
.../apache/camel/component/activemq/JmsBridge.java | 8 +-
.../activemq/JmsConsumeSendTransacted.java | 4 +-
.../component/activemq/JmsJdbcXARollbackTest.java | 18 ++-
.../camel/component/activemq/JmsJdbcXATest.java | 24 ++--
.../activemq/JmsSimpleRequestReplyTest.java | 5 +-
.../component/activemq/ObjectMessageTest.java | 8 +-
.../component/activemq/PoisonJMSPayloadTest.java | 8 +-
.../camel/component/activemq/SetHeaderTest.java | 8 +-
.../component/activemq/TransactedConsumeTest.java | 7 +-
.../component/activemq/converter/ConsumerBean.java | 145 +++++++++++++++++++++
.../converter/InvokeJmsMessageListenerTest.java | 12 +-
.../converter/InvokeMessageListenerTest.java | 17 ++-
30 files changed, 315 insertions(+), 240 deletions(-)
diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index 4d98038..674e676 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -92,12 +92,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,8 +106,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
index 824544b..ac1a545 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
@@ -21,12 +21,12 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.activemq.AMQ2611Test.Consumer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
public class AMQ2240Test {
@@ -34,7 +34,7 @@ public class AMQ2240Test {
private CamelContext camelContext;
- @After
+ @AfterEach
public void destroyCamelContext() throws Exception {
if (camelContext != null) {
camelContext.stop();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
index d27080f..182b5fe 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
@@ -16,18 +16,19 @@
*/
package org.apache.camel.component.activemq;
-import junit.framework.TestCase;
-
import org.apache.activemq.broker.BrokerService;
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class AMQ2611Test extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AMQ2611Test {
private static final String BROKER_URL = "tcp://localhost:61616";
private static final String QUEUE_NAME = "test.queue";
@@ -69,6 +70,7 @@ public class AMQ2611Test extends TestCase {
camelContext = null;
}
+ @Test
public void testConnections() {
try {
createBroker();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
index 4f062ea..0967c0d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentFactoryUserNamePasswordTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.camel.component.activemq;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ActiveMQComponentFactoryUserNamePasswordTest extends CamelSpringTestSupport {
@Override
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
index f43d4af..eb7cd17 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQComponentUserNamePasswordTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.camel.component.activemq;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ActiveMQComponentUserNamePasswordTest extends CamelSpringTestSupport {
@Override
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
index 5b398e3..83c024b 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQConfigureTest.java
@@ -24,12 +24,17 @@ import org.apache.camel.component.jms.JmsConsumer;
import org.apache.camel.component.jms.JmsEndpoint;
import org.apache.camel.component.jms.JmsProducer;
import org.apache.camel.support.processor.CamelLogProcessor;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.jms.connection.SingleConnectionFactory;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.listener.AbstractMessageListenerContainer;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
*
*/
@@ -41,7 +46,7 @@ public class ActiveMQConfigureTest extends CamelTestSupport {
JmsProducer producer = (JmsProducer)endpoint.createProducer();
JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate());
- assertEquals("pubSubDomain", false, template.isPubSubDomain());
+ assertEquals(false, template.isPubSubDomain(), "pubSubDomain");
assertIsInstanceOf(PooledConnectionFactory.class, template.getConnectionFactory());
}
@@ -51,7 +56,7 @@ public class ActiveMQConfigureTest extends CamelTestSupport {
JmsProducer producer = (JmsProducer)endpoint.createProducer();
JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate());
- assertEquals("pubSubDomain", false, template.isPubSubDomain());
+ assertEquals(false, template.isPubSubDomain(), "pubSubDomain");
SingleConnectionFactory connectionFactory = assertIsInstanceOf(SingleConnectionFactory.class, template.getConnectionFactory());
assertIsInstanceOf(ActiveMQConnectionFactory.class, connectionFactory.getTargetConnectionFactory());
}
@@ -63,11 +68,11 @@ public class ActiveMQConfigureTest extends CamelTestSupport {
assertIsInstanceOf(ActiveMQConfiguration.class, configuration);
- assertTrue("The JMS sessions are not transacted!", endpoint.isTransacted());
- assertTrue("The JMS sessions are not transacted!", configuration.isTransacted());
+ assertTrue(endpoint.isTransacted(), "The JMS sessions are not transacted!");
+ assertTrue(configuration.isTransacted(), "The JMS sessions are not transacted!");
- assertNull("A transaction manager has been lazy-created!", endpoint.getTransactionManager());
- assertNull("A transaction manager has been lazy-created!", configuration.getTransactionManager());
+ assertNull(endpoint.getTransactionManager(), "A transaction manager has been lazy-created!");
+ assertNull(configuration.getTransactionManager(), "A transaction manager has been lazy-created!");
}
@Test
@@ -76,7 +81,7 @@ public class ActiveMQConfigureTest extends CamelTestSupport {
JmsProducer producer = (JmsProducer)endpoint.createProducer();
JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate());
- assertEquals("pubSubDomain", false, template.isPubSubDomain());
+ assertEquals(false, template.isPubSubDomain(), "pubSubDomain");
assertIsInstanceOf(ActiveMQConnectionFactory.class, template.getConnectionFactory());
}
@@ -86,7 +91,7 @@ public class ActiveMQConfigureTest extends CamelTestSupport {
JmsConsumer consumer = endpoint.createConsumer(new CamelLogProcessor());
AbstractMessageListenerContainer listenerContainer = consumer.getListenerContainer();
- assertEquals("pubSubDomain", true, listenerContainer.isPubSubDomain());
+ assertEquals(true, listenerContainer.isPubSubDomain(), "pubSubDomain");
assertIsInstanceOf(PooledConnectionFactory.class, listenerContainer.getConnectionFactory());
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
index e2df2e2..a606af9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteForceTest.java
@@ -21,6 +21,8 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsMessage;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+
/**
*
*/
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
index 1c66828..7dfe46c 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
@@ -28,12 +28,14 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
@@ -66,7 +68,7 @@ public class ActiveMQJmsHeaderRouteTest extends CamelTestSupport {
Object replyTo = exchange.getIn().getHeader("JMSReplyTo");
LOG.info("Reply to is: " + replyTo);
Destination destination = assertIsInstanceOf(Destination.class, replyTo);
- assertEquals("ReplyTo", replyQueue.toString(), destination.toString());
+ assertEquals(replyQueue.toString(), destination.toString(), "ReplyTo");
}
@Override
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index e23db5e..d060bad 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -25,10 +25,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ActiveMQOriginalDestinationTest extends CamelTestSupport {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
index 7f41688..cd8351a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
@@ -30,12 +30,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.activemq.converter.ActiveMQConverter;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertMessageHeader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
@@ -82,7 +85,7 @@ public class ActiveMQReplyToHeaderUsingConverterTest extends CamelTestSupport {
LOG.info("Reply to is: " + replyTo);
if (useReplyToHeader) {
Destination destination = assertIsInstanceOf(Destination.class, replyTo);
- assertEquals("ReplyTo", replyQueueName, destination.toString());
+ assertEquals(replyQueueName, destination.toString(), "ReplyTo");
}
assertMessageHeader(in, "cheese", 123);
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
index 4e4b37a..6aff94d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQRouteTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.jms.connection.JmsTransactionManager;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
@@ -50,7 +50,7 @@ public class ActiveMQRouteTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
index bba0a26..4ebc9f3 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
@@ -24,8 +24,8 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsMessage;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelDestinationExclusiveConsumerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelDestinationExclusiveConsumerTest.java
index e3bd9cf..c399ba4 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelDestinationExclusiveConsumerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelDestinationExclusiveConsumerTest.java
@@ -19,17 +19,17 @@ package org.apache.camel.component.activemq;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
*
*/
@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
public class CamelDestinationExclusiveConsumerTest {
@Autowired
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelEmbeddedBrokerTestSupport.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelEmbeddedBrokerTestSupport.java
deleted file mode 100644
index bd23d88..0000000
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelEmbeddedBrokerTestSupport.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.activemq;
-
-import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
-
-/**
- * A helper class for test cases which use an embedded broker and use Camel to
- * do the routing
- */
-public abstract class CamelEmbeddedBrokerTestSupport extends EmbeddedBrokerTestSupport {
- protected CamelContext camelContext;
- protected ProducerTemplate template;
-
- @Override
- protected void setUp() throws Exception {
- bindAddress = "tcp://localhost:61616";
- super.setUp();
- camelContext = createCamelContext();
- addCamelRoutes(camelContext);
- assertValidContext(camelContext);
- camelContext.start();
- template = camelContext.createProducerTemplate();
- template.start();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
-
- if (template != null) {
- template.stop();
- }
- if (camelContext != null) {
- camelContext.stop();
- }
- }
-
- protected CamelContext createCamelContext() throws Exception {
- return new DefaultCamelContext();
- }
-
- protected void addCamelRoutes(CamelContext camelContext) throws Exception {
- }
-
- /**
- * Resolves a mandatory endpoint for the given URI or an exception is thrown
- *
- * @param uri the Camel <a href="">URI</a> to use to create or resolve an
- * endpoint
- * @return the endpoint
- */
- protected Endpoint resolveMandatoryEndpoint(String uri) {
- return resolveMandatoryEndpoint(camelContext, uri);
- }
-
- /**
- * Resolves a mandatory endpoint for the given URI and expected type or an
- * exception is thrown
- *
- * @param uri the Camel <a href="">URI</a> to use to create or resolve an
- * endpoint
- * @return the endpoint
- */
- protected <T extends Endpoint> T resolveMandatoryEndpoint(String uri, Class<T> endpointType) {
- return resolveMandatoryEndpoint(camelContext, uri, endpointType);
- }
-
- /**
- * Resolves an endpoint and asserts that it is found
- */
- protected Endpoint resolveMandatoryEndpoint(CamelContext context, String uri) {
- Endpoint endpoint = context.getEndpoint(uri);
-
- assertNotNull("No endpoint found for URI: " + uri, endpoint);
-
- return endpoint;
- }
-
- /**
- * Resolves an endpoint and asserts that it is found
- */
- protected <T extends Endpoint> T resolveMandatoryEndpoint(CamelContext context, String uri, Class<T> endpointType) {
- T endpoint = context.getEndpoint(uri, endpointType);
-
- assertNotNull("No endpoint found for URI: " + uri, endpoint);
-
- return endpoint;
- }
-
- /**
- * Resolves the mandatory Mock endpoint using a URI of the form
- * <code>mock:someName</code>
- *
- * @param uri the URI which typically starts with "mock:" and has some name
- * @return the mandatory mock endpoint or an exception is thrown if it could
- * not be resolved
- */
- protected MockEndpoint getMockEndpoint(String uri) {
- return resolveMandatoryEndpoint(uri, MockEndpoint.class);
- }
-
- /**
- * Asserts that all the expectations of the Mock endpoints are valid
- */
- protected void assertMockEndpointsSatisifed() throws InterruptedException {
- MockEndpoint.assertIsSatisfied(camelContext);
- }
-
- protected void assertValidContext(CamelContext context) {
- assertNotNull("No context found!", context);
- }
-}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
index 14bedcd..71768b8 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
@@ -23,8 +23,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
-import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
@@ -32,12 +30,17 @@ import org.apache.activemq.util.ThreadTracker;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
// see: https://issues.apache.org/activemq/browse/AMQ-2966
-public class CamelVMTransportRoutingTest extends TestCase {
+public class CamelVMTransportRoutingTest {
private static final Logger LOG = LoggerFactory.getLogger(CamelVMTransportRoutingTest.class);
@@ -53,7 +56,7 @@ public class CamelVMTransportRoutingTest extends TestCase {
private final String senderTopic = "A";
private final String receiverTopic = "B";
- @SuppressWarnings("unused")
+ @Test
public void testSendReceiveWithCamelRouteIntercepting() throws Exception {
final int msgCount = 1000;
@@ -79,8 +82,8 @@ public class CamelVMTransportRoutingTest extends TestCase {
LOG.debug("Attempting Received for Message #" + i);
TextMessage received1 = (TextMessage)receiver1.receive(5000);
- Assert.assertNotNull(received1);
- Assert.assertEquals(msgString, received1.getText());
+ assertNotNull(received1);
+ assertEquals(msgString, received1.getText());
}
}
@@ -94,7 +97,7 @@ public class CamelVMTransportRoutingTest extends TestCase {
return service;
}
- @Override
+ @BeforeEach
public void setUp() throws Exception {
broker = createBroker();
@@ -114,7 +117,7 @@ public class CamelVMTransportRoutingTest extends TestCase {
receiverConnection2.start();
}
- @Override
+ @AfterEach
public void tearDown() throws Exception {
if (senderConnection != null) {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
index 9d8a14d..064cc22 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
@@ -25,13 +25,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ComplexRequestReplyTest {
@@ -52,7 +52,7 @@ public class ComplexRequestReplyTest {
private final String toEndpoint = "activemq:queue:send";
private final String brokerEndpoint = "activemq:send";
- @Before
+ @BeforeEach
public void setUp() throws Exception {
createBrokerA();
@@ -64,7 +64,7 @@ public class ComplexRequestReplyTest {
senderContext = createSenderContext();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
try {
shutdownBrokerA();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
index 0ae4b14..64af2b8 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
@@ -25,13 +25,16 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.Wait;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class DlqTest extends CamelSpringTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(DlqTest.class);
BrokerService broker;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
index 3b290d3..e60a23f 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
@@ -27,14 +27,18 @@ import org.apache.camel.Headers;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertMessageHeader;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasKey;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
@@ -82,7 +86,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
replyTo = receivedHeaders.get("JMSReplyTo");
LOG.info("Reply to is: " + replyTo);
Destination destination = assertIsInstanceOf(Destination.class, replyTo);
- assertEquals("ReplyTo", replyQueueName, destination.toString());
+ assertEquals(replyQueueName, destination.toString(), "ReplyTo");
}
@Override
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
index 268ecb2..b27b3ae 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
@@ -34,13 +34,15 @@ import org.apache.activemq.broker.ProducerBrokerExchange;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ConnectionInfo;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class JmsBridge extends CamelSpringTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsBridge.class);
@@ -61,7 +63,7 @@ public class JmsBridge extends CamelSpringTestSupport {
consumeMessages();
LOG.info("ConnectionCount: " + connectionCount.get());
- assertEquals("x connections", 5 + errorLimit, connectionCount.get());
+ assertEquals(5 + errorLimit, connectionCount.get(), "x connections");
}
private void consumeMessages() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
index 1e79f52..974dfdb 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
@@ -26,8 +26,8 @@ import javax.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
index cc25c11..21728f8 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
@@ -35,14 +35,18 @@ import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.Wait;
import org.apache.camel.Exchange;
import org.apache.camel.component.jms.JmsMessage;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.transaction.jta.JtaTransactionManager;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
/**
* shows rollback and redelivery dlq respected with external tm
*/
@@ -60,13 +64,13 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
try {
conn.createStatement().execute(createStatement);
} catch (SQLException alreadyExists) {
- log.info("ex on create tables", alreadyExists);
+ LOG.info("ex on create tables", alreadyExists);
}
try {
conn.createStatement().execute("DELETE FROM SCP_INPUT_MESSAGES");
} catch (SQLException ex) {
- log.info("ex on create delete all", ex);
+ LOG.info("ex on create delete all", ex);
}
return conn;
@@ -82,7 +86,7 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
ResultSet resultSet = jdbcConn.createStatement().executeQuery("SELECT * FROM SCP_INPUT_MESSAGES");
while (resultSet.next()) {
count++;
- log.info("message - seq:" + resultSet.getInt(1) + ", id: " + resultSet.getString(2) + ", corr: " + resultSet.getString(3) + ", content: " + resultSet.getString(4));
+ LOG.info("message - seq:" + resultSet.getInt(1) + ", id: " + resultSet.getString(2) + ", corr: " + resultSet.getString(3) + ", content: " + resultSet.getString(4));
}
return count;
}
@@ -101,8 +105,8 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
return consumedFrom(SharedDeadLetterStrategy.DEFAULT_DEAD_LETTER_QUEUE_NAME);
}
});
- assertEquals("message in db, commit to db worked", 0, dumpDb(jdbcConn));
- assertFalse("Nothing to to out q", consumedFrom("scp_transacted_out"));
+ assertEquals(0, dumpDb(jdbcConn), "message in db, commit to db worked");
+ assertFalse(consumedFrom("scp_transacted_out"), "Nothing to to out q");
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
index 943120e..e068204 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
@@ -34,13 +34,17 @@ import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.util.Wait;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
+
/**
* shows broker 'once only delivery' and recovery with XA
*/
@@ -57,13 +61,13 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
try {
conn.createStatement().execute(createStatement);
} catch (SQLException alreadyExists) {
- log.info("ex on create tables", alreadyExists);
+ LOG.info("ex on create tables", alreadyExists);
}
try {
conn.createStatement().execute("DELETE FROM SCP_INPUT_MESSAGES");
} catch (SQLException ex) {
- log.info("ex on create delete all", ex);
+ LOG.info("ex on create delete all", ex);
}
return conn;
@@ -79,7 +83,7 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
ResultSet resultSet = jdbcConn.createStatement().executeQuery("SELECT * FROM SCP_INPUT_MESSAGES");
while (resultSet.next()) {
count++;
- log.info("message - seq:" + resultSet.getInt(1) + ", id: " + resultSet.getString(2) + ", corr: " + resultSet.getString(3) + ", content: " + resultSet.getString(4));
+ LOG.info("message - seq:" + resultSet.getInt(1) + ", id: " + resultSet.getString(2) + ", corr: " + resultSet.getString(3) + ", content: " + resultSet.getString(4));
}
return count;
}
@@ -92,13 +96,13 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
LOG.info("waiting for route to kick in, it will kill the broker on first 2pc commit");
// will be stopped by the plugin on first 2pc commit
broker.waitUntilStopped();
- assertEquals("message in db, commit to db worked", 1, dumpDb(jdbcConn));
+ assertEquals(1, dumpDb(jdbcConn), "message in db, commit to db worked");
LOG.info("Broker stopped, restarting...");
broker = createBroker(false);
broker.start();
broker.waitUntilStarted();
- assertEquals("pending transactions", 1, broker.getBroker().getPreparedTransactions(null).length);
+ assertEquals(1, broker.getBroker().getPreparedTransactions(null).length, "pending transactions");
// TM stays actively committing first message ack which won't get
// redelivered - xa once only delivery
@@ -110,7 +114,7 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
}
}));
// verify recovery complete
- assertEquals("recovery complete", 0, broker.getBroker().getPreparedTransactions(null).length);
+ assertEquals(0, broker.getBroker().getPreparedTransactions(null).length, "recovery complete");
final java.sql.Connection freshConnection = getJDBCConnection();
assertTrue("did not get replay", Wait.waitFor(new Wait.Condition() {
@@ -119,7 +123,7 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
return 1 == dumpDb(freshConnection);
}
}));
- assertEquals("still one message in db", 1, dumpDb(freshConnection));
+ assertEquals(1, dumpDb(freshConnection), "still one message in db");
// let once complete ok
sendJMSMessageToKickOffRoute();
@@ -130,7 +134,7 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
return 2 == dumpDb(freshConnection);
}
}));
- assertEquals("two messages in db", 2, dumpDb(freshConnection));
+ assertEquals(2, dumpDb(freshConnection), "two messages in db");
}
private void sendJMSMessageToKickOffRoute() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
index 3e58395..eeca9cf 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
@@ -25,10 +25,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* A simple request / reply test
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
index 9b75833..55aea2a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
@@ -27,11 +27,15 @@ import org.apache.camel.component.jms.JmsBinding;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ObjectMessageTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
index 6840ca8c8..1330822 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
@@ -22,11 +22,13 @@ import javax.jms.ObjectMessage;
import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
public class PoisonJMSPayloadTest extends CamelSpringTestSupport {
@Test
@@ -51,7 +53,7 @@ public class PoisonJMSPayloadTest extends CamelSpringTestSupport {
// bean should not be invoked
boolean invoked = context.getRegistry().lookupByNameAndType("myBean", MyBean.class).isInvoked();
- assertFalse("Bean should not be invoked", invoked);
+ assertFalse(invoked, "Bean should not be invoked");
assertMockEndpointsSatisfied();
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
index e64c4ea..3b16d84 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
@@ -23,20 +23,20 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.ObjectHelper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
*
*/
@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
public class SetHeaderTest {
private static final transient Logger LOG = LoggerFactory.getLogger(SetHeaderTest.class);
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index 0c61b4b..8915b7c 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -34,13 +34,16 @@ import org.apache.activemq.util.Wait;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.jms.JmsMessage;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class TransactedConsumeTest extends CamelSpringTestSupport {
static AtomicLong firstConsumed = new AtomicLong();
static AtomicLong consumed = new AtomicLong();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
new file mode 100644
index 0000000..ee36171
--- /dev/null
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.activemq.converter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ConsumerBean implements MessageListener {
+ private static final Logger LOG = LoggerFactory.getLogger(ConsumerBean.class);
+ private final List<Message> messages = new ArrayList();
+ private boolean verbose;
+ private String id = null;
+
+ public ConsumerBean() {
+ }
+
+ public ConsumerBean(String id) {
+ this.id = id;
+ }
+
+ public List<Message> flushMessages() {
+ List<Message> answer = null;
+ synchronized(this.messages) {
+ answer = new ArrayList(this.messages);
+ this.messages.clear();
+ return answer;
+ }
+ }
+
+ public void onMessage(Message message) {
+ synchronized(this.messages) {
+ this.messages.add(message);
+ if (this.verbose) {
+ LOG.info("" + this.id + "Received: " + message);
+ }
+
+ this.messages.notifyAll();
+ }
+ }
+
+ public void waitForMessageToArrive() {
+ LOG.info("Waiting for message to arrive");
+ long start = System.currentTimeMillis();
+
+ try {
+ if (this.hasReceivedMessage()) {
+ synchronized(this.messages) {
+ this.messages.wait(4000L);
+ }
+ }
+ } catch (InterruptedException var6) {
+ LOG.info("Caught: " + var6);
+ }
+
+ long end = System.currentTimeMillis() - start;
+ LOG.info("End of wait for " + end + " millis");
+ }
+
+ public void waitForMessagesToArrive(int messageCount) {
+ this.waitForMessagesToArrive(messageCount, 120000L);
+ }
+
+ public void waitForMessagesToArrive(int messageCount, long maxWaitTime) {
+ long maxRemainingMessageCount = (long)Math.max(0, messageCount - this.messages.size());
+ LOG.info("Waiting for (" + maxRemainingMessageCount + ") message(s) to arrive");
+ long start = System.currentTimeMillis();
+
+ for(long endTime = start + maxWaitTime; maxRemainingMessageCount > 0L; maxRemainingMessageCount = (long)Math.max(0, messageCount - this.messages.size())) {
+ try {
+ synchronized(this.messages) {
+ this.messages.wait(1000L);
+ }
+
+ if (this.hasReceivedMessages(messageCount) || System.currentTimeMillis() > endTime) {
+ break;
+ }
+ } catch (InterruptedException var13) {
+ LOG.info("Caught: " + var13);
+ }
+ }
+
+ long end = System.currentTimeMillis() - start;
+ LOG.info("End of wait for " + end + " millis");
+ }
+
+ public void assertMessagesArrived(int total) {
+ this.waitForMessagesToArrive(total);
+ synchronized(this.messages) {
+ int count = this.messages.size();
+ assertEquals((long)total, (long)count, "Messages received");
+ }
+ }
+
+ public void assertMessagesArrived(int total, long maxWaitTime) {
+ this.waitForMessagesToArrive(total, maxWaitTime);
+ synchronized(this.messages) {
+ int count = this.messages.size();
+ assertEquals((long)total, (long)count, "Messages received");
+ }
+ }
+
+ public boolean isVerbose() {
+ return this.verbose;
+ }
+
+ public void setVerbose(boolean verbose) {
+ this.verbose = verbose;
+ }
+
+ public List<Message> getMessages() {
+ return this.messages;
+ }
+
+ protected boolean hasReceivedMessage() {
+ return this.messages.isEmpty();
+ }
+
+ protected boolean hasReceivedMessages(int messageCount) {
+ synchronized(this.messages) {
+ return this.messages.size() >= messageCount;
+ }
+ }
+}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
index 3c32760..6da8234 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
@@ -21,8 +21,12 @@ import javax.jms.MessageListener;
import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
*
@@ -36,9 +40,9 @@ public class InvokeJmsMessageListenerTest extends CamelTestSupport {
template.sendBody("direct:start", expectedBody);
Message message = messageListener.message;
- assertNotNull("Should have invoked the message listener!", message);
+ assertNotNull(message, "Should have invoked the message listener!");
TextMessage textMessage = assertIsInstanceOf(TextMessage.class, message);
- assertEquals("body", expectedBody, textMessage.getText());
+ assertEquals(expectedBody, textMessage.getText(), "body");
}
@Override
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index c4b2de3..974ecae 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -21,18 +21,23 @@ import java.util.List;
import javax.jms.Message;
import javax.jms.TextMessage;
-import org.apache.activemq.spring.ConsumerBean;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
public class InvokeMessageListenerTest extends CamelTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(InvokeMessageListenerTest.class);
protected String startEndpointUri = "activemq:queue:test.a";
protected ConsumerBean listener = new ConsumerBean();
@@ -45,13 +50,13 @@ public class InvokeMessageListenerTest extends CamelTestSupport {
listener.assertMessagesArrived(1, 5000);
List<Message> list = listener.flushMessages();
- assertTrue("Should have received some messages!", !list.isEmpty());
+ assertTrue(!list.isEmpty(), "Should have received some messages!");
Message message = list.get(0);
- log.debug("Received: " + message);
+ LOG.debug("Received: " + message);
TextMessage textMessage = assertIsInstanceOf(TextMessage.class, message);
- assertEquals("Text mesage body: " + textMessage, expectedBody, textMessage.getText());
+ assertEquals(expectedBody, textMessage.getText(), "Text mesage body: " + textMessage);
}
@Override