This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new b261fc6 CAMEL-11807: Migrated camel-jmh/jms2 itests to JUnit 5 b261fc6 is described below commit b261fc68c69bb492ef369041258da9a8cab10777 Author: aldettinger <aldettin...@gmail.com> AuthorDate: Fri Jun 19 17:37:45 2020 +0200 CAMEL-11807: Migrated camel-jmh/jms2 itests to JUnit 5 --- tests/camel-itest-jms2/pom.xml | 8 +------ .../camel/itest/jms2/BaseJms2TestSupport.java | 19 ++++++++++------ .../camel/itest/jms2/Jms1TopicDurableTest.java | 8 +++---- .../camel/itest/jms2/Jms2DeliveryDelayTest.java | 25 +++++++++++----------- .../itest/jms2/Jms2TopicDurableSharedTest.java | 6 +++--- .../camel/itest/jms2/Jms2TopicDurableTest.java | 8 +++---- .../camel/itest/jms2/Jms2TopicSharedTest.java | 6 +++--- tests/camel-jmh/pom.xml | 4 ++-- .../camel/itest/jmh/CaseInsensitiveMapTest.java | 2 +- .../camel/itest/jmh/ContainsIgnoreCaseTest.java | 2 +- .../camel/itest/jmh/DefaultUuidGeneratorTest.java | 2 +- .../camel/itest/jmh/FastTypeConverterTest.java | 2 +- .../camel/itest/jmh/LoadTypeConvertersTest.java | 2 +- .../apache/camel/itest/jmh/LogEndpointTest.java | 2 +- .../apache/camel/itest/jmh/NormalizeUriTest.java | 2 +- .../camel/itest/jmh/SimpleExpressionTest.java | 2 +- .../camel/itest/jmh/SimpleMockPlaceholderTest.java | 2 +- .../org/apache/camel/itest/jmh/SimpleMockTest.java | 2 +- .../camel/itest/jmh/SlowTypeConverterTest.java | 2 +- .../apache/camel/itest/jmh/TypeConverterTest.java | 2 +- 20 files changed, 55 insertions(+), 53 deletions(-) diff --git a/tests/camel-itest-jms2/pom.xml b/tests/camel-itest-jms2/pom.xml index 65a898f..a17acff 100644 --- a/tests/camel-itest-jms2/pom.xml +++ b/tests/camel-itest-jms2/pom.xml @@ -39,14 +39,8 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> diff --git a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/BaseJms2TestSupport.java b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/BaseJms2TestSupport.java index 03ab31b..2827661 100644 --- a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/BaseJms2TestSupport.java +++ b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/BaseJms2TestSupport.java @@ -25,6 +25,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.Topic; + import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; @@ -45,7 +46,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.jms.JmsComponent; 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 @@ -53,6 +58,8 @@ import org.apache.camel.test.junit4.CamelTestSupport; */ public class BaseJms2TestSupport extends CamelTestSupport { + private static final Logger LOG = LoggerFactory.getLogger(BaseJms2TestSupport.class); + @Produce protected ProducerTemplate template; protected String brokerUri; @@ -104,7 +111,7 @@ public class BaseJms2TestSupport extends CamelTestSupport { private void startBroker() throws Exception { broker.start(); - log.info("Started Embedded JMS Server"); + LOG.info("Started Embedded JMS Server"); } @Override @@ -112,19 +119,19 @@ public class BaseJms2TestSupport extends CamelTestSupport { super.tearDown(); DefaultCamelContext dcc = (DefaultCamelContext)context; while (!dcc.isStopped()) { - log.info("Waiting on the Camel Context to stop"); + LOG.info("Waiting on the Camel Context to stop"); } - log.info("Closing JMS Session"); + LOG.info("Closing JMS Session"); if (getSession() != null) { getSession().close(); setSession(null); } - log.info("Closing JMS Connection"); + LOG.info("Closing JMS Connection"); if (connection != null) { connection.stop(); connection = null; } - log.info("Stopping the ActiveMQ Broker"); + LOG.info("Stopping the ActiveMQ Broker"); if (broker != null) { broker.stop(); broker = null; diff --git a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms1TopicDurableTest.java b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms1TopicDurableTest.java index 47c7295..041692d 100644 --- a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms1TopicDurableTest.java +++ b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms1TopicDurableTest.java @@ -18,7 +18,7 @@ package org.apache.camel.itest.jms2; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Jms1TopicDurableTest extends BaseJms2TestSupport { @@ -27,7 +27,7 @@ public class Jms1TopicDurableTest extends BaseJms2TestSupport { // use any of the JMS 2.0 APIs but it works on a JMS 2.0 broker as well @Test - public void testJms11DurableTopic() throws Exception { + void testJms11DurableTopic() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); @@ -43,10 +43,10 @@ public class Jms1TopicDurableTest extends BaseJms2TestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("jms:topic:foo?clientId=123&durableSubscriptionName=bar") .to("mock:result"); diff --git a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2DeliveryDelayTest.java b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2DeliveryDelayTest.java index 0436b24..983bb05 100644 --- a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2DeliveryDelayTest.java +++ b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2DeliveryDelayTest.java @@ -18,52 +18,53 @@ package org.apache.camel.itest.jms2; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class Jms2DeliveryDelayTest extends BaseJms2TestSupport { @Test - public void testInOnlyWithDelay() throws Exception { + void testInOnlyWithDelay() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); long start = System.currentTimeMillis(); template.sendBody("jms:topic:foo?deliveryDelay=1000", "Hello World"); assertMockEndpointsSatisfied(); - Assert.assertTrue("Should take at least 1000 millis", System.currentTimeMillis() - start >= 1000); + assertTrue(System.currentTimeMillis() - start >= 1000, "Should take at least 1000 millis"); } @Test - public void testInOnlyWithoutDelay() throws Exception { + void testInOnlyWithoutDelay() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); long start = System.currentTimeMillis(); template.sendBody("jms:topic:foo", "Hello World"); assertMockEndpointsSatisfied(); - Assert.assertTrue("Should take less than 1000 millis", System.currentTimeMillis() - start < 1000); + assertTrue(System.currentTimeMillis() - start < 1000, "Should take less than 1000 millis"); } @Test - public void testInOutWithDelay() throws Exception { + void testInOutWithDelay() { long start = System.currentTimeMillis(); template.requestBody("jms:topic:foo?deliveryDelay=1000", "Hello World"); - Assert.assertTrue("Should take at least 1000 millis", System.currentTimeMillis() - start >= 1000); + assertTrue(System.currentTimeMillis() - start >= 1000, "Should take at least 1000 millis"); } @Test - public void testInOutWithoutDelay() throws Exception { + void testInOutWithoutDelay() { long start = System.currentTimeMillis(); template.requestBody("jms:topic:foo", "Hello World"); - Assert.assertTrue("Should take less than 1000 millis", System.currentTimeMillis() - start < 1000); + assertTrue(System.currentTimeMillis() - start < 1000, "Should take less than 1000 millis"); } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("jms:topic:foo") .to("mock:result"); } diff --git a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableSharedTest.java b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableSharedTest.java index 2a44b3b..3df0eb0 100644 --- a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableSharedTest.java +++ b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableSharedTest.java @@ -18,14 +18,14 @@ package org.apache.camel.itest.jms2; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Jms2TopicDurableSharedTest extends BaseJms2TestSupport { private static final String TEST_DESTINATION_NAME = "jms:topic:in.only.topic.consumer.test"; @Test - public void testDurableSharedTopic() throws Exception { + void testDurableSharedTopic() throws Exception { final String expectedBody = "Hello World"; MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); @@ -42,7 +42,7 @@ public class Jms2TopicDurableSharedTest extends BaseJms2TestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { from("direct:start") diff --git a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableTest.java b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableTest.java index 689f712..1de1906 100644 --- a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableTest.java +++ b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicDurableTest.java @@ -18,7 +18,7 @@ package org.apache.camel.itest.jms2; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Jms2TopicDurableTest extends BaseJms2TestSupport { @@ -27,7 +27,7 @@ public class Jms2TopicDurableTest extends BaseJms2TestSupport { // use any of the JMS 2.0 APIs but it works on a JMS 2.0 broker as well @Test - public void testDurableTopic() throws Exception { + void testDurableTopic() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); @@ -43,10 +43,10 @@ public class Jms2TopicDurableTest extends BaseJms2TestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("jms:topic:foo?clientId=123&durableSubscriptionName=one") .to("log:test.log.1?showBody=true") .to("mock:result"); diff --git a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicSharedTest.java b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicSharedTest.java index fb74c2d..96f4ef9 100644 --- a/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicSharedTest.java +++ b/tests/camel-itest-jms2/src/test/java/org/apache/camel/itest/jms2/Jms2TopicSharedTest.java @@ -18,14 +18,14 @@ package org.apache.camel.itest.jms2; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Jms2TopicSharedTest extends BaseJms2TestSupport { private static final String TEST_DESTINATION_NAME = "jms:topic:in.only.topic.consumer.test"; @Test - public void testSharedTopic() throws Exception { + void testSharedTopic() throws Exception { final String expectedBody = "Hello World"; MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); @@ -42,7 +42,7 @@ public class Jms2TopicSharedTest extends BaseJms2TestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { from("direct:start") diff --git a/tests/camel-jmh/pom.xml b/tests/camel-jmh/pom.xml index 97deed0..5cfcebc 100644 --- a/tests/camel-jmh/pom.xml +++ b/tests/camel-jmh/pom.xml @@ -63,8 +63,8 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java index f026823..989894f 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.camel.util.CaseInsensitiveMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Mode; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/ContainsIgnoreCaseTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/ContainsIgnoreCaseTest.java index d7f3fa7..a31f4d2 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/ContainsIgnoreCaseTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/ContainsIgnoreCaseTest.java @@ -19,7 +19,7 @@ package org.apache.camel.itest.jmh; import java.util.concurrent.TimeUnit; import org.apache.camel.util.StringHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/DefaultUuidGeneratorTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/DefaultUuidGeneratorTest.java index 729e42f..467057d 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/DefaultUuidGeneratorTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/DefaultUuidGeneratorTest.java @@ -19,7 +19,7 @@ package org.apache.camel.itest.jmh; import java.util.concurrent.TimeUnit; import org.apache.camel.impl.engine.DefaultUuidGenerator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/FastTypeConverterTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/FastTypeConverterTest.java index 7391c5e..3616a99 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/FastTypeConverterTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/FastTypeConverterTest.java @@ -23,7 +23,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Mode; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java index 3d006b5..5e7a41d 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LogEndpointTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LogEndpointTest.java index ddf8546..fd73dfb 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LogEndpointTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LogEndpointTest.java @@ -23,7 +23,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/NormalizeUriTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/NormalizeUriTest.java index f0ec54d..44b2ff9 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/NormalizeUriTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/NormalizeUriTest.java @@ -19,7 +19,7 @@ package org.apache.camel.itest.jmh; import java.util.concurrent.TimeUnit; import org.apache.camel.util.URISupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Mode; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleExpressionTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleExpressionTest.java index ace26ca..9de5d91 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleExpressionTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleExpressionTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Language; import org.apache.camel.support.DefaultExchange; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockPlaceholderTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockPlaceholderTest.java index fb43d65..74a8df2 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockPlaceholderTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockPlaceholderTest.java @@ -23,7 +23,7 @@ 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.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockTest.java index a6de7b5..f1196bc 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SimpleMockTest.java @@ -22,7 +22,7 @@ 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.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Measurement; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SlowTypeConverterTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SlowTypeConverterTest.java index bb2ccb9..e023293 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SlowTypeConverterTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/SlowTypeConverterTest.java @@ -23,7 +23,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Mode; diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java index eb3ba8e..c90ad02 100644 --- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java +++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java @@ -27,7 +27,7 @@ import org.w3c.dom.Document; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Mode;