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 c3b284013ffddf5b30ad04d73dfba4b40a558dd9
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 10:48:08 2020 +0200
[CAMEL-11807] Upgrade camel-spring-integration to junit5
---
components/camel-spring-integration/pom.xml | 6 +++---
.../integration/SpringIntegrationMessageTest.java | 4 ++--
.../SpringIntegrationOneWayConsumerTest.java | 4 ++--
.../integration/SpringIntegrationProducerTest.java | 10 ++++++----
.../SpringIntegrationTwoWayConsumerTest.java | 9 ++++++---
.../integration/adapter/CamelSourceAdapterTest.java | 11 +++++++----
.../integration/adapter/CamelTargetAdapterTest.java | 11 +++++++----
.../spring/integration/adapter/ConfigurationTest.java | 19 ++++++++++---------
8 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/components/camel-spring-integration/pom.xml
b/components/camel-spring-integration/pom.xml
index a4c1b39..88f4091 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -77,8 +77,8 @@
<!-- testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
index c029852..ddc64fb 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationMessageTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.spring.integration;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.messaging.support.MessageBuilder;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SpringIntegrationMessageTest {
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
index 9230d3d..f2683cb 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.spring.integration;
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 org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.GenericMessage;
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
index bdcd823..bcc0119 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.spring.integration;
-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;
+
public class SpringIntegrationProducerTest extends CamelSpringTestSupport {
@Test
public void testSendingTwoWayMessage() throws Exception {
String result = template.requestBody("direct:twowayMessage", "Willem",
String.class);
- assertEquals("Can't get the right response", result, "Hello Willem");
+ assertEquals(result, "Hello Willem", "Can't get the right response");
}
@Test
@@ -34,7 +36,7 @@ public class SpringIntegrationProducerTest extends
CamelSpringTestSupport {
template.sendBody("direct:onewayMessage", "Greet");
HelloWorldService service = getMandatoryBean(HelloWorldService.class,
"helloService");
- assertEquals("We should call the service", service.getGreetName(),
"Greet");
+ assertEquals(service.getGreetName(), "Greet", "We should call the
service");
}
@Override
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
index 65c7f7c..354abf5 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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 org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.Message;
@@ -31,6 +31,9 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.GenericMessage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringIntegrationTwoWayConsumerTest extends
CamelSpringTestSupport {
private static final String MESSAGE_BODY = "Request message";
@@ -47,7 +50,7 @@ public class SpringIntegrationTwoWayConsumerTest extends
CamelSpringTestSupport
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is
processed", message.getPayload());
+ assertEquals(MESSAGE_BODY + " is processed",
message.getPayload(), "Get the wrong result");
assertEquals("Done", message.getHeaders().get("Status"));
}
});
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
index dc09fa0..445928b 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
@@ -19,13 +19,16 @@ package
org.apache.camel.component.spring.integration.adapter;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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 org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
@Test
@@ -35,7 +38,7 @@ public class CamelSourceAdapterTest extends
CamelSpringTestSupport {
channelA.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("We should get the message from channelA",
message.getPayload(), "Willem");
+ assertEquals("Willem", message.getPayload(), "We should get
the message from channelA");
}
});
@@ -48,7 +51,7 @@ public class CamelSourceAdapterTest extends
CamelSpringTestSupport {
public void testSendingTwoWayMessage() throws Exception {
String result = template.requestBody("direct:TwoWay", "Willem",
String.class);
- assertEquals("Can't get the right response", result, "Hello Willem");
+ assertEquals("Hello Willem", result, "Can't get the right response");
}
@Override
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
index bebacf5..e29402b 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
@@ -22,8 +22,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
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 org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.Message;
@@ -32,6 +32,9 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.GenericMessage;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class CamelTargetAdapterTest extends CamelSpringTestSupport {
private static final String MESSAGE_BODY = "hello world";
@@ -57,7 +60,7 @@ public class CamelTargetAdapterTest extends
CamelSpringTestSupport {
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is
processed", message.getPayload());
+ assertEquals(MESSAGE_BODY + " is processed",
message.getPayload(), "Get the wrong result");
}
});
@@ -77,7 +80,7 @@ public class CamelTargetAdapterTest extends
CamelSpringTestSupport {
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
latch.countDown();
- assertEquals("Get the wrong result", MESSAGE_BODY + " is
processed", message.getPayload());
+ assertEquals(MESSAGE_BODY + " is processed",
message.getPayload(), "Get the wrong result");
}
});
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
index bdd805f..7a09702 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
@@ -17,20 +17,21 @@
package org.apache.camel.component.spring.integration.adapter;
import org.apache.camel.util.IOHelper;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConfigurationTest {
private AbstractXmlApplicationContext context;
- @After
+ @AfterEach
public void tearDown() {
IOHelper.close(context);
}
@@ -44,11 +45,11 @@ public class ConfigurationTest {
assertNotNull(camelSourceA);
assertTrue(camelSourceA.getChannel().toString().contains("channelA"));
- assertEquals("ExpectReply should be false ",
camelSourceA.isExpectReply(), false);
+ assertFalse(camelSourceA.isExpectReply(), "ExpectReply should be
false");
CamelSourceAdapter camelSourceB = context.getBean("camelSourceB",
CamelSourceAdapter.class);
assertNotNull(camelSourceB);
assertTrue(camelSourceB.getChannel().toString().contains("channelB"));
- assertEquals("ExpectReply should be true ",
camelSourceB.isExpectReply(), true);
+ assertTrue(camelSourceB.isExpectReply(), "ExpectReply should be true");
}
@Test
@@ -59,7 +60,7 @@ public class ConfigurationTest {
CamelTargetAdapter camelTargetA = context.getBean("camelTargetA",
CamelTargetAdapter.class);
assertNotNull(camelTargetA);
- assertEquals("Subscript the wrong CamelEndpointUri",
camelTargetA.getCamelEndpointUri(), "direct:EndpointA");
+ assertEquals("direct:EndpointA", camelTargetA.getCamelEndpointUri(),
"Subscript the wrong CamelEndpointUri");
CamelTargetAdapter camelTargetB = context.getBean("camelTargetB",
CamelTargetAdapter.class);
assertNotNull(camelTargetB);
assertTrue(camelTargetB.getReplyChannel().toString().contains("channelC"));
