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 c8b283dff1a6deea50c5ddeb4e2a3e4aef7c9d64
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 09:32:08 2020 +0200
[CAMEL-11807] Upgrade camel-ironmq to junit5
---
components/camel-ironmq/pom.xml | 7 ++++++-
.../component/ironmq/FromQueueToQueueTest.java | 6 ++++--
.../component/ironmq/IronMQBatchConsumerTest.java | 4 ++--
.../ironmq/IronMQBatchDeleteConsumerTest.java | 4 ++--
.../component/ironmq/IronMQBatchProducerTest.java | 12 ++++++++----
.../ironmq/IronMQComponentConfigurationTest.java | 19 +++++++++++++------
.../component/ironmq/IronMQComponentSpringTest.java | 7 +++++--
.../camel/component/ironmq/IronMQComponentTest.java | 14 ++++++++------
.../component/ironmq/IronMQPreserveHeadersTest.java | 9 +++++----
.../integrationtest/ConcurrentConsumerLoadTest.java | 21 ++++++++++++---------
.../ironmq/integrationtest/FileCopyExample.java | 15 +++++++++------
.../ironmq/integrationtest/IronMQComponentTest.java | 13 +++++++------
.../ironmq/integrationtest/IronMQFIFOTest.java | 14 ++++++++------
.../IronMQRackspaceComponentTest.java | 13 +++++++------
.../component/ironmq/integrationtest/LoadTest.java | 12 ++++++------
.../ironmq/integrationtest/Queue2QueueExample.java | 12 ++++++------
16 files changed, 108 insertions(+), 74 deletions(-)
diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml
index 5bdd45b..95fa51e 100644
--- a/components/camel-ironmq/pom.xml
+++ b/components/camel-ironmq/pom.xml
@@ -66,7 +66,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -74,6 +74,11 @@
<artifactId>camel-dataset</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
index 2c28fb7..27ab3bd 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/FromQueueToQueueTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.ExchangePattern;
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.junit.jupiter.api.Assertions.fail;
public class FromQueueToQueueTest extends CamelTestSupport {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
index 27cbc28..573d750 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchConsumerTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
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;
public class IronMQBatchConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
index 4be3621..25e96e0 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchDeleteConsumerTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
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;
public class IronMQBatchDeleteConsumerTest extends CamelTestSupport {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java
index 00deb32..9085bd8 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQBatchProducerTest.java
@@ -25,10 +25,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
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.test.junit5.TestSupport.assertIsInstanceOf;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class IronMQBatchProducerTest extends CamelTestSupport {
@@ -47,9 +50,10 @@ public class IronMQBatchProducerTest extends
CamelTestSupport {
assertThat(((Ids)header).getSize(), equalTo(2));
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void testProduceBatchWithIllegalPayload() throws Exception {
- template.sendBody("direct:start", Arrays.asList("foo", "bar"));
+ assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:start", Arrays.asList("foo",
"bar")));
}
@Override
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java
index 1797891..9489ee2 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentConfigurationTest.java
@@ -16,8 +16,13 @@
*/
package org.apache.camel.component.ironmq;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class IronMQComponentConfigurationTest extends CamelTestSupport {
@@ -85,17 +90,19 @@ public class IronMQComponentConfigurationTest extends
CamelTestSupport {
assertEquals(20, consumer.getMaxMessagesPerPoll());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutTokenConfiguration() throws Exception {
IronMQComponent component = new IronMQComponent(context);
component.init();
- component.createEndpoint("ironmq://testqueue?projectId=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () ->
component.createEndpoint("ironmq://testqueue?projectId=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutProjectIdConfiguration() throws Exception
{
IronMQComponent component = new IronMQComponent(context);
component.init();
- component.createEndpoint("ironmq://MyQueue?token=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("ironmq://MyQueue?token=xxx"));
}
}
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
index da53097..db554b6 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentSpringTest.java
@@ -22,10 +22,13 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-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.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class IronMQComponentSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
index 939622d..2a0283f 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQComponentTest.java
@@ -27,9 +27,11 @@ import org.apache.camel.Message;
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.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class IronMQComponentTest extends CamelTestSupport {
@@ -46,9 +48,9 @@ public class IronMQComponentTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
Message in = mock.getExchanges().get(0).getIn();
- Assert.assertNotNull(in.getHeader(IronMQConstants.MESSAGE_ID));
-
Assert.assertNotNull(in.getHeader(IronMQConstants.MESSAGE_RESERVATION_ID));
-
Assert.assertNotNull(in.getHeader(IronMQConstants.MESSAGE_RESERVED_COUNT));
+ assertNotNull(in.getHeader(IronMQConstants.MESSAGE_ID));
+ assertNotNull(in.getHeader(IronMQConstants.MESSAGE_RESERVATION_ID));
+ assertNotNull(in.getHeader(IronMQConstants.MESSAGE_RESERVED_COUNT));
}
@Test
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java
index 1102200..f834bff 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/IronMQPreserveHeadersTest.java
@@ -20,9 +20,10 @@ import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class IronMQPreserveHeadersTest extends CamelTestSupport {
@@ -41,7 +42,7 @@ public class IronMQPreserveHeadersTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String id =
mock.getExchanges().get(0).getIn().getHeader(IronMQConstants.MESSAGE_ID,
String.class);
- Assert.assertNotNull(id);
+ assertNotNull(id);
}
@Override
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java
index d218720..364af06 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/ConcurrentConsumerLoadTest.java
@@ -22,18 +22,21 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.ironmq.IronMQConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-@Ignore("Must be manually tested. Provide your own projectId and token!")
+@Disabled("Must be manually tested. Provide your own projectId and token!")
public class ConcurrentConsumerLoadTest extends CamelTestSupport {
private static final String IRONMQCLOUD =
"https://mq-aws-eu-west-1-1.iron.io";;
private static final int NO_OF_MESSAGES = 50000;
private static final String BATCH_DELETE = "true";
private static final int CONCURRENT_CONSUMERS = 20;
private static final String PAYLOAD = "{some:text, number:#}";
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ConcurrentConsumerLoadTest.class);
// replace with your project id
private final String projectId = "myIronMQproject";
@@ -46,7 +49,7 @@ public class ConcurrentConsumerLoadTest extends
CamelTestSupport {
+ "&concurrentConsumers=" +
CONCURRENT_CONSUMERS + "&batchDelete=" + BATCH_DELETE;
private final String sedaEndpoint = "seda:push?concurrentConsumers=" +
CONCURRENT_CONSUMERS;
- @Before
+ @BeforeEach
public void prepareQueue() throws InterruptedException {
// make sure the queue is empty before test
template.sendBodyAndHeader(ironMQEndpoint, null,
IronMQConstants.OPERATION, IronMQConstants.CLEARQUEUE);
@@ -65,13 +68,13 @@ public class ConcurrentConsumerLoadTest extends
CamelTestSupport {
}
MockEndpoint mockEndpoint = getMockEndpoint("mock:iron");
while (mockEndpoint.getReceivedCounter() != noOfBlocks) {
- log.info("Waiting for queue to fill up. Current size is " +
mockEndpoint.getReceivedCounter() * 100);
+ LOGGER.info("Waiting for queue to fill up. Current size is " +
mockEndpoint.getReceivedCounter() * 100);
Thread.sleep(1000);
}
long delta = System.currentTimeMillis() - start;
int seconds = (int)delta / 1000;
int msgPrSec = NO_OF_MESSAGES / seconds;
- log.info("IronMQPerformanceTest: Took: " + seconds + " seconds to
produce " + NO_OF_MESSAGES + " messages. Which is " + msgPrSec + " messages pr.
second");
+ LOGGER.info("IronMQPerformanceTest: Took: " + seconds + " seconds to
produce " + NO_OF_MESSAGES + " messages. Which is " + msgPrSec + " messages pr.
second");
}
@Test
@@ -84,7 +87,7 @@ public class ConcurrentConsumerLoadTest extends
CamelTestSupport {
long delta = System.currentTimeMillis() - start;
int seconds = (int)delta / 1000;
int msgPrSec = NO_OF_MESSAGES / seconds;
- log.info("IronmqPerformanceTest: Took: " + seconds + " seconds to
consume " + NO_OF_MESSAGES + " messages. Which is " + msgPrSec + " messages pr.
second");
+ LOGGER.info("IronmqPerformanceTest: Took: " + seconds + " seconds to
consume " + NO_OF_MESSAGES + " messages. Which is " + msgPrSec + " messages pr.
second");
}
@Override
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyExample.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyExample.java
index 74d74f6..6c5f72a 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyExample.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/FileCopyExample.java
@@ -18,12 +18,15 @@ package org.apache.camel.component.ironmq.integrationtest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.ironmq.IronMQConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Integration test that requires ironmq account.")
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
+@Disabled("Integration test that requires ironmq account.")
public class FileCopyExample extends CamelTestSupport {
// replace with your proejctid
private String projectId = "myIronMQproject";
@@ -32,7 +35,7 @@ public class FileCopyExample extends CamelTestSupport {
private final String ironMQEndpoint = "ironmq:testqueue?projectId=" +
projectId + "&token=" + token +
"&ironMQCloud=https://mq-aws-eu-west-1-1.iron.io&preserveHeaders=true";;
- @Before
+ @BeforeEach
public void clean() {
template.sendBodyAndHeader(ironMQEndpoint, "fo",
IronMQConstants.OPERATION, IronMQConstants.CLEARQUEUE);
deleteDirectory("target/out");
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java
index 0e8c11e..0ec5eb8 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQComponentTest.java
@@ -20,12 +20,13 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Must be manually tested. Provide your own projectId and token!")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own projectId and token!")
public class IronMQComponentTest extends CamelTestSupport {
private String projectId = "myIronMQproject";
private String token = "myIronMQToken";
@@ -44,7 +45,7 @@ public class IronMQComponentTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
String id =
result.getExchanges().get(0).getIn().getHeader("MESSAGE_ID", String.class);
- Assert.assertNotNull(id);
+ assertNotNull(id);
}
@Override
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
index 0284a61..660a82e 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQFIFOTest.java
@@ -25,12 +25,14 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.ironmq.IronMQConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Integration test that requires ironmq account.")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("Integration test that requires ironmq account.")
public class IronMQFIFOTest extends CamelTestSupport {
private String projectId = "replace-this";
private String token = "replace-this";
@@ -43,7 +45,7 @@ public class IronMQFIFOTest extends CamelTestSupport {
@EndpointInject("mock:result")
private MockEndpoint result;
- @Before
+ @BeforeEach
public void clearQueue() {
template.sendBodyAndHeader(ironMQEndpoint, "fo",
IronMQConstants.OPERATION, IronMQConstants.CLEARQUEUE);
for (int i = 1; i <= 50; i++) {
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java
index be92cad..9e5ea09 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/IronMQRackspaceComponentTest.java
@@ -20,12 +20,13 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Must be manually tested. Provide your own projectId and token!")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own projectId and token!")
public class IronMQRackspaceComponentTest extends CamelTestSupport {
private String projectId = "myIronMQproject";
private String token = "myIronMQToken";
@@ -44,7 +45,7 @@ public class IronMQRackspaceComponentTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
String id =
result.getExchanges().get(0).getIn().getHeader("MESSAGE_ID", String.class);
- Assert.assertNotNull(id);
+ assertNotNull(id);
}
@Override
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
index 2db6cbb..800408f 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/LoadTest.java
@@ -23,12 +23,12 @@ import org.apache.camel.component.dataset.DataSetSupport;
import org.apache.camel.component.ironmq.IronMQConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Integration test that requires ironmq account.")
+@Disabled("Integration test that requires ironmq account.")
public class LoadTest extends CamelTestSupport {
private static final String IRONMQCLOUD =
"http://mq-v3-aws-us-east-1.iron.io";;
@@ -42,7 +42,7 @@ public class LoadTest extends CamelTestSupport {
private final String datasetEndpoint = "dataset:foo?produceDelay=5";
private InputDataset dataSet = new InputDataset(1000);
- @Before
+ @BeforeEach
public void clearQueue() {
// make sure the queue is empty before test
template.sendBodyAndHeader(ironMQEndpoint, null,
IronMQConstants.OPERATION, IronMQConstants.CLEARQUEUE);
diff --git
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExample.java
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExample.java
index a24b5ce..ca3e77e 100644
---
a/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExample.java
+++
b/components/camel-ironmq/src/test/java/org/apache/camel/component/ironmq/integrationtest/Queue2QueueExample.java
@@ -20,12 +20,12 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.ironmq.IronMQConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Must be manually tested. Provide your own projectId and token!")
+@Disabled("Must be manually tested. Provide your own projectId and token!")
public class Queue2QueueExample extends CamelTestSupport {
private static final String PAYLOAD = "{some:text, number:#}";
@@ -37,7 +37,7 @@ public class Queue2QueueExample extends CamelTestSupport {
private final String ironQueue1 = "ironmq:queue1?projectId=" + projectId +
"&token=" + token + "&ironMQCloud=https://mq-aws-eu-west-1-1.iron.io";;
private final String ironQueue2 = "ironmq:queue2?projectId=" + projectId +
"&token=" + token + "&ironMQCloud=https://mq-aws-eu-west-1-1.iron.io";;
- @Before
+ @BeforeEach
public void clean() {
template.sendBodyAndHeader(ironQueue1, "fo",
IronMQConstants.OPERATION, IronMQConstants.CLEARQUEUE);
template.sendBodyAndHeader(ironQueue2, "fo",
IronMQConstants.OPERATION, IronMQConstants.CLEARQUEUE);
