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/07/09 20:01:56 UTC
[camel] 05/19: [CAMEL-11807] Upgrade camel-sjms2 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 c27d7c8bad02292c9014aa30d341872d828d4047
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 8 08:41:03 2020 +0200
[CAMEL-11807] Upgrade camel-sjms2 to junit5
---
components/camel-sjms2/pom.xml | 2 +-
.../camel/component/sjms2/SimpleJms2ComponentTest.java | 6 ++++--
.../camel/component/sjms2/Sjms2ComponentRestartTest.java | 4 ++--
.../sjms2/Sjms2EndpointConnectionSettingsTest.java | 8 ++++++--
.../component/sjms2/Sjms2EndpointNameOverrideTest.java | 8 ++++++--
.../apache/camel/component/sjms2/Sjms2EndpointTest.java | 16 ++++++++++++----
.../sjms2/consumer/InOnlyTopicDurableConsumerTest.java | 6 +++---
.../sjms2/consumer/InOnlyTopicSharedConsumerTest.java | 4 ++--
.../sjms2/producer/InOnlyQueueProducerTest.java | 7 +++++--
.../sjms2/producer/InOnlyTopicProducerTest.java | 7 +++++--
.../camel/component/sjms2/support/Jms2TestSupport.java | 10 ++++++++--
11 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index 8a25d2d..bbd89f7 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -73,7 +73,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java
index 688950c..c9825e0 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/SimpleJms2ComponentTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.sjms2;
import org.apache.activemq.ActiveMQConnectionFactory;
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.junit.jupiter.api.Assertions.assertNotNull;
public class SimpleJms2ComponentTest extends CamelTestSupport {
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
index 60a1b11..b88397a 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2ComponentRestartTest.java
@@ -21,8 +21,8 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
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;
public class Sjms2ComponentRestartTest extends CamelTestSupport {
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java
index ca63468..9bd21ee 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointConnectionSettingsTest.java
@@ -25,8 +25,12 @@ import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
import org.apache.camel.component.sjms.jms.ConnectionResource;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class Sjms2EndpointConnectionSettingsTest extends CamelTestSupport {
private final ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java
index 66ec28b..5fe2fd0 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointNameOverrideTest.java
@@ -20,8 +20,12 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class Sjms2EndpointNameOverrideTest extends CamelTestSupport {
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
index 4edc559..e7c0e6c 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/Sjms2EndpointTest.java
@@ -20,8 +20,15 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class Sjms2EndpointTest extends CamelTestSupport {
@@ -130,9 +137,10 @@ public class Sjms2EndpointTest extends CamelTestSupport {
assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut);
}
- @Test(expected = Exception.class)
+ @Test
public void testNamedReplyToAndMEPMismatch() throws Exception {
- context.getEndpoint("sjms2:queue:test?namedReplyTo=reply.to.queue&exchangePattern=" + ExchangePattern.InOnly);
+ assertThrows(Exception.class,
+ () -> context.getEndpoint("sjms2:queue:test?namedReplyTo=reply.to.queue&exchangePattern=" + ExchangePattern.InOnly));
}
@Test
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
index dffdc94..5cee8d0 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicDurableConsumerTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
import org.apache.camel.component.sjms2.Sjms2Component;
-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 InOnlyTopicDurableConsumerTest extends CamelTestSupport {
@@ -53,7 +53,7 @@ public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java
index ab3927a..88859bb 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/consumer/InOnlyTopicSharedConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms2.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms2.support.Jms2TestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyTopicSharedConsumerTest extends Jms2TestSupport {
@@ -48,7 +48,7 @@ public class InOnlyTopicSharedConsumerTest extends Jms2TestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java
index 5e2e90f..0b2d617 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyQueueProducerTest.java
@@ -23,7 +23,10 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms2.support.Jms2TestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOnlyQueueProducerTest extends Jms2TestSupport {
@@ -64,7 +67,7 @@ public class InOnlyQueueProducerTest extends Jms2TestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java
index 6d209ae..f4df378 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/producer/InOnlyTopicProducerTest.java
@@ -23,7 +23,10 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms2.support.Jms2TestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOnlyTopicProducerTest extends Jms2TestSupport {
@@ -64,7 +67,7 @@ public class InOnlyTopicProducerTest extends Jms2TestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
index 79ee497..a88531d 100644
--- a/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
+++ b/components/camel-sjms2/src/test/java/org/apache/camel/component/sjms2/support/Jms2TestSupport.java
@@ -47,7 +47,11 @@ import org.apache.camel.component.sjms2.Sjms2Component;
import org.apache.camel.component.sjms2.jms.Jms2ObjectFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* A support class that builds up and tears down an ActiveMQ Artemis instance to be used
@@ -55,6 +59,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
*/
public class Jms2TestSupport extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Produce
protected ProducerTemplate template;
protected String brokerUri;
@@ -132,7 +138,7 @@ public class Jms2TestSupport extends CamelTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
* @return
* @throws Exception
*/