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 574345e068ed9f49dc88d88c069c727ea797d362 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 14:35:42 2020 +0200 [CAMEL-11807] Upgrade camel-netty to junit5 --- components/camel-netty/pom.xml | 6 ++--- .../camel/component/netty/BaseNettyTest.java | 15 +++++------ .../netty/DatagramPacketByteArrayCodecTest.java | 29 ++++++++++++---------- .../camel/component/netty/LogCaptureTest.java | 7 +++--- .../component/netty/MultipleCodecsSpringTest.java | 4 +-- .../camel/component/netty/MultipleCodecsTest.java | 2 +- .../camel/component/netty/Netty2978IssueTest.java | 9 ++++--- .../netty/NettyComponentWithConfigurationTest.java | 8 ++++-- .../camel/component/netty/NettyConcurrentTest.java | 18 +++++++++----- .../NettyConsumerClientModeReconnectTest.java | 14 +++++++---- .../NettyConsumerClientModeReuseChannelTest.java | 7 ++++-- .../netty/NettyConsumerClientModeTest.java | 2 +- .../camel/component/netty/NettyConverterTest.java | 15 ++++++----- .../component/netty/NettyCustomCodecTest.java | 2 +- .../netty/NettyCustomCorrelationManagerTest.java | 2 +- .../NettyCustomPipelineFactoryAsynchTest.java | 4 ++- .../netty/NettyCustomPipelineFactorySynchTest.java | 4 ++- .../camel/component/netty/NettyDisconnectTest.java | 4 ++- .../camel/component/netty/NettyFileTcpTest.java | 2 +- .../netty/NettyGlobalSSLContextParametersTest.java | 10 +++++--- .../NettyInOutCloseChannelWhenCompleteTest.java | 4 ++- .../component/netty/NettyInOutFromSedaTest.java | 2 +- .../netty/NettyInOutWithForcedNoResponseTest.java | 6 ++++- .../component/netty/NettyManualEndpointTest.java | 5 +++- .../NettyMultipleSimultaneousClientsTest.java | 11 +++++--- .../netty/NettyProducerAsyncEndpointTest.java | 7 ++++-- .../component/netty/NettyProducerHangTest.java | 20 +++++++++------ .../netty/NettyProducerPoolDisabledTest.java | 4 ++- .../camel/component/netty/NettyProxyTest.java | 4 ++- .../camel/component/netty/NettyRedeliveryTest.java | 10 +++++--- .../netty/NettyRequestTimeoutIssueTest.java | 19 ++++++++------ .../component/netty/NettyRequestTimeoutTest.java | 7 +++++- .../component/netty/NettyReuseChannelTest.java | 17 ++++++++----- .../component/netty/NettyReuseConnectionTest.java | 4 ++- .../component/netty/NettySSLClasspathTest.java | 10 +++++--- .../netty/NettySSLClientCertHeadersTest.java | 10 +++++--- .../netty/NettySSLConsumerClientModeTest.java | 2 +- .../netty/NettySSLContextParametersTest.java | 10 +++++--- .../component/netty/NettySSLPassphaseBeanTest.java | 10 +++++--- .../apache/camel/component/netty/NettySSLTest.java | 10 +++++--- .../component/netty/NettySingleCodecTest.java | 2 +- .../component/netty/NettySuspendResumeTest.java | 5 +++- .../camel/component/netty/NettyTCPAsyncTest.java | 2 +- .../camel/component/netty/NettyTCPChainedTest.java | 7 +++--- .../netty/NettyTCPSyncNotLazyChannelTest.java | 4 ++- .../camel/component/netty/NettyTCPSyncTest.java | 4 ++- .../NettyTcpWithInOutUsingPlainSocketTest.java | 23 ++++++++++------- .../NettyTextlineInOnlyNullDelimiterTest.java | 2 +- .../component/netty/NettyTextlineInOnlyTest.java | 2 +- .../netty/NettyTextlineInOutNonBlockingTest.java | 9 ++++--- .../NettyTextlineInOutSynchronousFalseTest.java | 7 ++++-- .../netty/NettyTextlineInOutSynchronousTest.java | 7 ++++-- .../component/netty/NettyTextlineInOutTest.java | 4 ++- .../netty/NettyTransferExchangeOptionTest.java | 9 +++++-- .../camel/component/netty/NettyUDPAsyncTest.java | 2 +- .../netty/NettyUDPByteArrayConsumerTest.java | 8 +++--- .../netty/NettyUDPByteArrayProviderTest.java | 7 ++++-- .../netty/NettyUDPLargeMessageInOnlyTest.java | 4 ++- ...yUDPMessageLargerThanDefaultBufferSizeTest.java | 4 ++- .../netty/NettyUDPMulticastAsyncTest.java | 12 ++++----- .../camel/component/netty/NettyUDPSyncTest.java | 4 ++- .../component/netty/NettyUdpConnectedSendTest.java | 18 ++++++++------ .../netty/NettyUdpConnectionlessSendTest.java | 9 ++++--- .../NettyUdpWithInOutUsingPlainSocketTest.java | 7 ++++-- ...ttyUseSharedWorkerThreadPoolManyRoutesTest.java | 16 ++++++++---- .../netty/NettyUseSharedWorkerThreadPoolTest.java | 4 ++- .../component/netty/ObjectSerializationTest.java | 9 ++++--- .../SpringNettyUseSharedWorkerThreadPoolTest.java | 6 +++-- .../netty/UnsharableCodecsConflicts2Test.java | 10 +++++--- .../netty/UnsharableCodecsConflictsTest.java | 10 +++++--- 70 files changed, 356 insertions(+), 197 deletions(-) diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml index 3a08f63..dc99372 100644 --- a/components/camel-netty/pom.xml +++ b/components/camel-netty/pom.xml @@ -87,7 +87,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -96,8 +96,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> <!-- logging --> diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java index 9316712..283f9318 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/BaseNettyTest.java @@ -24,10 +24,10 @@ import io.netty.util.ResourceLeakDetector; import org.apache.camel.BindToRegistry; import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.logging.log4j.core.LogEvent; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,23 +35,24 @@ import org.slf4j.LoggerFactory; * */ public class BaseNettyTest extends CamelTestSupport { - protected static final Logger LOG = LoggerFactory.getLogger(BaseNettyTest.class); + + private static final Logger LOG = LoggerFactory.getLogger(BaseNettyTest.class); private static volatile int port; - @BeforeClass + @BeforeAll public static void initPort() throws Exception { port = AvailablePortFinder.getNextAvailable(); } - @BeforeClass + @BeforeAll public static void startLeakDetection() { System.setProperty("io.netty.leakDetection.maxRecords", "100"); System.setProperty("io.netty.leakDetection.acquireAndReleaseOnly", "true"); ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.PARANOID); } - @AfterClass + @AfterAll public static void verifyNoLeaks() throws Exception { // Force GC to bring up leaks System.gc(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/DatagramPacketByteArrayCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/DatagramPacketByteArrayCodecTest.java index 3359ae5..3233d0c 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/DatagramPacketByteArrayCodecTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/DatagramPacketByteArrayCodecTest.java @@ -23,8 +23,11 @@ import io.netty.buffer.Unpooled; import io.netty.channel.AddressedEnvelope; import io.netty.channel.DefaultAddressedEnvelope; import io.netty.channel.embedded.EmbeddedChannel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DatagramPacketByteArrayCodecTest { @@ -38,13 +41,13 @@ public class DatagramPacketByteArrayCodecTest { AddressedEnvelope<Object, InetSocketAddress> addressedEnvelop = new DefaultAddressedEnvelope<>(input, new InetSocketAddress(8888)); EmbeddedChannel channel = new EmbeddedChannel(ChannelHandlerFactories.newByteArrayDecoder("udp").newChannelHandler()); - Assert.assertTrue(channel.writeInbound(addressedEnvelop)); - Assert.assertTrue(channel.finish()); + assertTrue(channel.writeInbound(addressedEnvelop)); + assertTrue(channel.finish()); AddressedEnvelope<Object, InetSocketAddress> result = (AddressedEnvelope) channel.readInbound(); - Assert.assertEquals(result.recipient().getPort(), addressedEnvelop.recipient().getPort()); - Assert.assertTrue(result.content() instanceof byte[]); - Assert.assertEquals(VALUE, new String((byte[]) result.content())); - Assert.assertNull(channel.readInbound()); + assertEquals(result.recipient().getPort(), addressedEnvelop.recipient().getPort()); + assertTrue(result.content() instanceof byte[]); + assertEquals(VALUE, new String((byte[]) result.content())); + assertNull(channel.readInbound()); } @Test @@ -54,12 +57,12 @@ public class DatagramPacketByteArrayCodecTest { AddressedEnvelope<Object, InetSocketAddress> addressedEnvelop = new DefaultAddressedEnvelope<>(VALUE.getBytes(), new InetSocketAddress(8888)); EmbeddedChannel channel = new EmbeddedChannel(ChannelHandlerFactories.newByteArrayEncoder("udp").newChannelHandler()); - Assert.assertTrue(channel.writeOutbound(addressedEnvelop)); - Assert.assertTrue(channel.finish()); + assertTrue(channel.writeOutbound(addressedEnvelop)); + assertTrue(channel.finish()); AddressedEnvelope output = (AddressedEnvelope) channel.readOutbound(); - Assert.assertTrue(output.content() instanceof ByteBuf); + assertTrue(output.content() instanceof ByteBuf); ByteBuf resultContent = (ByteBuf) output.content(); - Assert.assertEquals(VALUE, new String(resultContent.array())); - Assert.assertNull(channel.readOutbound()); + assertEquals(VALUE, new String(resultContent.array())); + assertNull(channel.readOutbound()); } } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/LogCaptureTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/LogCaptureTest.java index b2ab4cc..8b76fa1 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/LogCaptureTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/LogCaptureTest.java @@ -18,8 +18,9 @@ package org.apache.camel.component.netty; import io.netty.util.ResourceLeakDetector; import io.netty.util.internal.logging.InternalLoggerFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; /** * This test ensures LogCaptureAppender is configured properly @@ -28,7 +29,7 @@ public class LogCaptureTest { @Test public void testCapture() { InternalLoggerFactory.getInstance(ResourceLeakDetector.class).error("testError"); - Assert.assertFalse(LogCaptureAppender.getEvents().isEmpty()); + assertFalse(LogCaptureAppender.getEvents().isEmpty()); LogCaptureAppender.reset(); } } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java index cbb1291..e6dd049 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsSpringTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.netty; 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.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java index 46f342b..5a7ade5 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MultipleCodecsTest.java @@ -27,7 +27,7 @@ import io.netty.handler.codec.string.StringEncoder; import org.apache.camel.BindToRegistry; 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 MultipleCodecsTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java index f2c5049..6d4b331 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java @@ -32,10 +32,13 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("This test can cause CI servers to hang") +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("This test can cause CI servers to hang") public class Netty2978IssueTest extends BaseNettyTest { @Test diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java index f321fcb..7d16468 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentWithConfigurationTest.java @@ -16,8 +16,12 @@ */ package org.apache.camel.component.netty; -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.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class NettyComponentWithConfigurationTest extends CamelTestSupport { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java index 72984b3..6b184e0 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java @@ -36,11 +36,17 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.codec.ObjectDecoder; import org.apache.camel.component.netty.codec.ObjectEncoder; import org.apache.camel.util.StopWatch; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyConcurrentTest extends BaseNettyTest { + private static final Logger LOG = LoggerFactory.getLogger(NettyConcurrentTest.class); + @Test public void testNoConcurrentProducers() throws Exception { doSendMessages(1, 1); @@ -57,7 +63,7 @@ public class NettyConcurrentTest extends BaseNettyTest { } @Test - @Ignore + @Disabled public void testLargeConcurrentProducers() throws Exception { doSendMessages(250000, 100); } @@ -75,7 +81,7 @@ public class NettyConcurrentTest extends BaseNettyTest { Future<String> out = executor.submit(new Callable<String>() { public String call() throws Exception { String reply = template.requestBody("netty:tcp://localhost:{{port}}?encoders=#encoder&decoders=#decoder", index, String.class); - log.debug("Sent {} received {}", index, reply); + LOG.debug("Sent {} received {}", index, reply); assertEquals("Bye " + index, reply); return reply; } @@ -84,7 +90,7 @@ public class NettyConcurrentTest extends BaseNettyTest { } notify.matches(60, TimeUnit.SECONDS); - log.info("Took " + watch.taken() + " millis to process " + files + " messages using " + poolSize + " client threads."); + LOG.info("Took " + watch.taken() + " millis to process " + files + " messages using " + poolSize + " client threads."); assertEquals(files, responses.size()); // get all responses @@ -94,7 +100,7 @@ public class NettyConcurrentTest extends BaseNettyTest { } // should be 'files' unique responses - assertEquals("Should be " + files + " unique responses", files, unique.size()); + assertEquals(files, unique.size(), "Should be " + files + " unique responses"); executor.shutdownNow(); } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java index 9651079..17974d0 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReconnectTest.java @@ -35,10 +35,14 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NettyConsumerClientModeReconnectTest extends BaseNettyTest { + private static final Logger LOG = LoggerFactory.getLogger(NettyConsumerClientModeReconnectTest.class); + private MyServer server; public void startNettyServer() throws Exception { @@ -58,20 +62,20 @@ public class NettyConsumerClientModeReconnectTest extends BaseNettyTest { MockEndpoint receive = context.getEndpoint("mock:receive", MockEndpoint.class); receive.expectedBodiesReceived("Bye Willem"); - log.info(">>> starting Camel route while Netty server is not ready"); + LOG.info(">>> starting Camel route while Netty server is not ready"); context.getRouteController().startRoute("client"); Thread.sleep(500); - log.info(">>> starting Netty server"); + LOG.info(">>> starting Netty server"); startNettyServer(); assertMockEndpointsSatisfied(); - log.info(">>> routing done"); + LOG.info(">>> routing done"); Thread.sleep(500); } finally { - log.info(">>> shutting down Netty server"); + LOG.info(">>> shutting down Netty server"); shutdownServer(); } } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReuseChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReuseChannelTest.java index b45ddf1..65a36e2 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReuseChannelTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeReuseChannelTest.java @@ -38,7 +38,10 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NettyConsumerClientModeReuseChannelTest extends BaseNettyTest { @@ -83,7 +86,7 @@ public class NettyConsumerClientModeReuseChannelTest extends BaseNettyTest { public void process(final Exchange exchange) { final Channel channel = exchange.getProperty(NettyConstants.NETTY_CHANNEL, Channel.class); channels.add(channel); - assertTrue("Should be active", channel.isActive()); + assertTrue(channel.isActive(), "Should be active"); String body = exchange.getIn().getBody(String.class); exchange.getOut().setBody("Bye " + body); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeTest.java index a7a8ca1..d0933b7 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConsumerClientModeTest.java @@ -35,7 +35,7 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; public class NettyConsumerClientModeTest extends BaseNettyTest { private MyServer server; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java index b538136..e626420 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java @@ -19,10 +19,13 @@ package org.apache.camel.component.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.PooledByteBufAllocator; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Utility test to verify netty type converter. @@ -36,7 +39,7 @@ public class NettyConverterTest extends CamelTestSupport { private ByteBuf buf; - @Before + @BeforeEach public void startUp() { byte[] bytes = PAYLOAD.getBytes(); buf = PooledByteBufAllocator.DEFAULT.buffer(bytes.length); @@ -44,7 +47,7 @@ public class NettyConverterTest extends CamelTestSupport { } @Override - @After + @AfterEach public void tearDown() { buf.release(); } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCodecTest.java index e20e07c..7d1f01b 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCodecTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCodecTest.java @@ -20,7 +20,7 @@ import io.netty.channel.ChannelHandler; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.ObjectHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NettyCustomCodecTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCorrelationManagerTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCorrelationManagerTest.java index fe19d6b..827c844 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCorrelationManagerTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomCorrelationManagerTest.java @@ -21,7 +21,7 @@ import io.netty.channel.ChannelHandlerContext; import org.apache.camel.BindToRegistry; 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 NettyCustomCorrelationManagerTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java index f68c206..31e1284 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java @@ -29,7 +29,9 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.handlers.ClientChannelHandler; import org.apache.camel.component.netty.handlers.ServerChannelHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java index e10611b..bdad662 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java @@ -29,7 +29,9 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.handlers.ClientChannelHandler; import org.apache.camel.component.netty.handlers.ServerChannelHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyDisconnectTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyDisconnectTest.java index 68f577b..e1c0c71 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyDisconnectTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyDisconnectTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyDisconnectTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyFileTcpTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyFileTcpTest.java index 5b5c8c9..a305da4 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyFileTcpTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyFileTcpTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.netty; 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 NettyFileTcpTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java index 0895d62..e34d075 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java @@ -27,7 +27,11 @@ import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.SSLContextServerParameters; import org.apache.camel.support.jsse.TrustManagersParameters; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class NettyGlobalSSLContextParametersTest extends BaseNettyTest { @@ -68,9 +72,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest { @Test public void testSSLInOutWithNettyConsumer() throws Exception { // ibm jdks dont have sun security algorithms - if (isJavaVendor("ibm")) { - return; - } + assumeFalse(isJavaVendor("ibm")); context.addRoutes(new RouteBuilder() { public void configure() { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutCloseChannelWhenCompleteTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutCloseChannelWhenCompleteTest.java index dfb603e..76c6eb5 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutCloseChannelWhenCompleteTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutCloseChannelWhenCompleteTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutFromSedaTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutFromSedaTest.java index 627bd01..592d819 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutFromSedaTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutFromSedaTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.netty; 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 NettyInOutFromSedaTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutWithForcedNoResponseTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutWithForcedNoResponseTest.java index 55aa72c..04bdc53 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutWithForcedNoResponseTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyInOutWithForcedNoResponseTest.java @@ -18,7 +18,11 @@ package org.apache.camel.component.netty; import org.apache.camel.RuntimeCamelException; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyManualEndpointTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyManualEndpointTest.java index 81cc0e8..3f68258 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyManualEndpointTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyManualEndpointTest.java @@ -23,7 +23,10 @@ import io.netty.channel.ChannelHandler; import io.netty.handler.codec.Delimiters; import io.netty.util.CharsetUtil; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class NettyManualEndpointTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyMultipleSimultaneousClientsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyMultipleSimultaneousClientsTest.java index ca52d4c..892313f 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyMultipleSimultaneousClientsTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyMultipleSimultaneousClientsTest.java @@ -25,13 +25,16 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ -@Ignore("TODO: investigate for Camel 3.0") +@Disabled("TODO: investigate for Camel 3.0") public class NettyMultipleSimultaneousClientsTest extends BaseNettyTest { private String uri = "netty:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false"; @@ -71,7 +74,7 @@ public class NettyMultipleSimultaneousClientsTest extends BaseNettyTest { startLatch.countDown(); // and wait long enough until they're all done - assertTrue("Waiting on the latch ended up with a timeout!", finishLatch.await(5, TimeUnit.SECONDS)); + assertTrue(finishLatch.await(5, TimeUnit.SECONDS), "Waiting on the latch ended up with a timeout!"); executorService.shutdown(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerAsyncEndpointTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerAsyncEndpointTest.java index 6d3f5a4..bbb3c53 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerAsyncEndpointTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerAsyncEndpointTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class NettyProducerAsyncEndpointTest extends BaseNettyTest { @@ -37,7 +40,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest { assertMockEndpointsSatisfied(); - assertFalse("Should use different threads", beforeThreadName.equalsIgnoreCase(afterThreadName)); + assertFalse(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should use different threads"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java index 2d5f9df..bdbb734 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerHangTest.java @@ -22,13 +22,19 @@ import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket; -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.test.junit5.TestSupport.assertStringContains; public class NettyProducerHangTest extends CamelTestSupport { private static final int PORT = 4093; + private static final Logger LOG = LoggerFactory.getLogger(NettyProducerHangTest.class); + @Test public void nettyProducerHangsOnTheSecondRequestToTheSocketWhichIsClosed() throws Exception { new Thread(new Runnable() { @@ -38,13 +44,13 @@ public class NettyProducerHangTest extends CamelTestSupport { acceptReplyAcceptClose(); acceptReplyAcceptClose(); } catch (IOException e) { - log.error("Exception occured: " + e.getMessage(), e); + LOG.error("Exception occured: " + e.getMessage(), e); } } }).start(); String response1 = template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request1", String.class); - log.info("Received first response <" + response1 + ">"); + LOG.info("Received first response <" + response1 + ">"); try { // our test server will close the socket now so we should get an error @@ -54,7 +60,7 @@ public class NettyProducerHangTest extends CamelTestSupport { } String response2 = template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request3", String.class); - log.info("Received 2nd response <" + response2 + ">"); + LOG.info("Received 2nd response <" + response2 + ">"); try { // our test server will close the socket now so we should get an error @@ -70,7 +76,7 @@ public class NettyProducerHangTest extends CamelTestSupport { ServerSocket serverSocket = new ServerSocket(PORT); Socket soc = serverSocket.accept(); - log.info("Open socket and accept data"); + LOG.info("Open socket and accept data"); try (InputStream is = soc.getInputStream(); OutputStream os = soc.getOutputStream()) { // read first message @@ -87,7 +93,7 @@ public class NettyProducerHangTest extends CamelTestSupport { soc.close(); serverSocket.close(); } - log.info("Close socket"); + LOG.info("Close socket"); } } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerPoolDisabledTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerPoolDisabledTest.java index 51565e2..e3337bb 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerPoolDisabledTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProducerPoolDisabledTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyProducerPoolDisabledTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProxyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProxyTest.java index 1033fb8..6cf7316 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProxyTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyProxyTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java index f3e0f66..badbbd1 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java @@ -35,9 +35,11 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.After; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test the effect of redelivery in association with netty component. @@ -97,7 +99,7 @@ public class NettyRedeliveryTest extends CamelTestSupport { } @Override - @After + @AfterEach public void tearDown() throws Exception { super.tearDown(); alive = false; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueTest.java index 2c796b10..bc393ad 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutIssueTest.java @@ -17,14 +17,19 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -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; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -@Ignore("This test can be run manually") +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Disabled("This test can be run manually") public class NettyRequestTimeoutIssueTest extends CamelTestSupport { + private static final Logger LOG = LoggerFactory.getLogger(NettyProducerHangTest.class); + @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { @@ -42,9 +47,9 @@ public class NettyRequestTimeoutIssueTest extends CamelTestSupport { @Test public void test() throws Exception { String result = template.requestBody("direct:out", "hello", String.class); - Assert.assertEquals("hello", result); + assertEquals("hello", result); - log.info("Sleeping for 20 seconds, and no Netty exception should occur"); + LOG.info("Sleeping for 20 seconds, and no Netty exception should occur"); Thread.sleep(20000); } } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java index 7040e48..f0c8f25 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRequestTimeoutTest.java @@ -22,7 +22,12 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +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; +import static org.junit.jupiter.api.Assertions.fail; public class NettyRequestTimeoutTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelTest.java index c8e1c69..8386775 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseChannelTest.java @@ -24,7 +24,12 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +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.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NettyReuseChannelTest extends BaseNettyTest { @@ -45,9 +50,9 @@ public class NettyReuseChannelTest extends BaseNettyTest { assertTrue(notify.matchesWaitTime()); assertEquals(2, channels.size()); - assertSame("Should reuse channel", channels.get(0), channels.get(1)); - assertFalse("And closed when routing done", channels.get(0).isOpen()); - assertFalse("And closed when routing done", channels.get(1).isOpen()); + assertSame(channels.get(0), channels.get(1), "Should reuse channel"); + assertFalse(channels.get(0).isOpen(), "And closed when routing done"); + assertFalse(channels.get(1).isOpen(), "And closed when routing done"); } @Override @@ -62,7 +67,7 @@ public class NettyReuseChannelTest extends BaseNettyTest { public void process(Exchange exchange) throws Exception { Channel channel = exchange.getProperty(NettyConstants.NETTY_CHANNEL, Channel.class); channels.add(channel); - assertTrue("Should be active", channel.isActive()); + assertTrue(channel.isActive(), "Should be active"); } }) .to("mock:a") @@ -72,7 +77,7 @@ public class NettyReuseChannelTest extends BaseNettyTest { public void process(Exchange exchange) throws Exception { Channel channel = exchange.getProperty(NettyConstants.NETTY_CHANNEL, Channel.class); channels.add(channel); - assertTrue("Should be active", channel.isActive()); + assertTrue(channel.isActive(), "Should be active"); } }) .to("mock:b"); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseConnectionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseConnectionTest.java index e4eef57..0fbd475 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseConnectionTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyReuseConnectionTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java index 7913ded..291a521 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java @@ -19,7 +19,11 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class NettySSLClasspathTest extends BaseNettyTest { @@ -31,9 +35,7 @@ public class NettySSLClasspathTest extends BaseNettyTest { @Test public void testSSLInOutWithNettyConsumer() throws Exception { // ibm jdks dont have sun security algorithms - if (isJavaVendor("ibm")) { - return; - } + assumeFalse(isJavaVendor("ibm")); context.addRoutes(new RouteBuilder() { public void configure() { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java index 8d1fdc6..a38ac80 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java @@ -20,7 +20,11 @@ import java.io.File; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class NettySSLClientCertHeadersTest extends BaseNettyTest { @@ -42,9 +46,7 @@ public class NettySSLClientCertHeadersTest extends BaseNettyTest { @Test public void testSSLInOutWithNettyConsumer() throws Exception { // ibm jdks dont have sun security algorithms - if (isJavaVendor("ibm")) { - return; - } + assumeFalse(isJavaVendor("ibm")); getMockEndpoint("mock:input").expectedMessageCount(1); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLConsumerClientModeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLConsumerClientModeTest.java index 966bb7a..d7c033e 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLConsumerClientModeTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLConsumerClientModeTest.java @@ -53,7 +53,7 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; public class NettySSLConsumerClientModeTest extends BaseNettyTest { private MyServer server; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java index e94762d..4da7984 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java @@ -26,7 +26,11 @@ import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.SSLContextServerParameters; import org.apache.camel.support.jsse.TrustManagersParameters; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class NettySSLContextParametersTest extends BaseNettyTest { @@ -67,9 +71,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest { @Test public void testSSLInOutWithNettyConsumer() throws Exception { // ibm jdks dont have sun security algorithms - if (isJavaVendor("ibm")) { - return; - } + assumeFalse(isJavaVendor("ibm")); context.addRoutes(new RouteBuilder() { public void configure() { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java index 8d1f588..4aa97cc 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java @@ -20,7 +20,11 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class NettySSLPassphaseBeanTest extends BaseNettyTest { @@ -35,9 +39,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest { @Test public void testPassphaseBean() throws Exception { // ibm jdks dont have sun security algorithms - if (isJavaVendor("ibm")) { - return; - } + assumeFalse(isJavaVendor("ibm")); context.addRoutes(new RouteBuilder() { public void configure() { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java index d9cc1b8..d206e70 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java @@ -25,7 +25,11 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class NettySSLTest extends BaseNettyTest { @@ -47,9 +51,7 @@ public class NettySSLTest extends BaseNettyTest { @Test public void testSSLInOutWithNettyConsumer() throws Exception { // ibm jdks dont have sun security algorithms - if (isJavaVendor("ibm")) { - return; - } + assumeFalse(isJavaVendor("ibm")); context.addRoutes(new RouteBuilder() { public void configure() { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java index 106c7c7..d42e963 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java @@ -23,7 +23,7 @@ import io.netty.handler.codec.string.StringEncoder; import org.apache.camel.BindToRegistry; 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 NettySingleCodecTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySuspendResumeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySuspendResumeTest.java index ea8927f..38f0342 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySuspendResumeTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySuspendResumeTest.java @@ -17,7 +17,10 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class NettySuspendResumeTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java index b7565d5..f44f748 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java @@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NettyTCPAsyncTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java index 25fce4e..8dfeece 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java @@ -29,8 +29,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; import org.apache.camel.util.IOHelper; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; /** * In this test we are checking that same netty endpoint can be safely called twice @@ -60,7 +61,7 @@ public class NettyTCPChainedTest extends BaseNettyTest { if (exchange.getException() != null) { throw new AssertionError(exchange.getException()); } - Assert.assertFalse(exchange.isFailed()); + assertFalse(exchange.isFailed()); } @BindToRegistry("encoder") diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java index 3ec9d26..d84a86a 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncTest.java index ea7ce81..f5d4a4d 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyTCPSyncTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTcpWithInOutUsingPlainSocketTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTcpWithInOutUsingPlainSocketTest.java index 299b963..e744891 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTcpWithInOutUsingPlainSocketTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTcpWithInOutUsingPlainSocketTest.java @@ -25,7 +25,12 @@ import java.net.Socket; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +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.assertNull; public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest { @@ -33,7 +38,7 @@ public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest { public void testSendAndReceiveOnce() throws Exception { String response = sendAndReceive("World"); - assertNotNull("Nothing received from Mina", response); + assertNotNull(response, "Nothing received from Mina"); assertEquals("Hello World", response); } @@ -42,8 +47,8 @@ public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest { String london = sendAndReceive("London"); String paris = sendAndReceive("Paris"); - assertNotNull("Nothing received from Mina", london); - assertNotNull("Nothing received from Mina", paris); + assertNotNull(london, "Nothing received from Mina"); + assertNotNull(paris, "Nothing received from Mina"); assertEquals("Hello London", london); assertEquals("Hello Paris", paris); } @@ -51,23 +56,23 @@ public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest { @Test public void testReceiveNoResponseSinceOutBodyIsNull() throws Exception { String out = sendAndReceive("force-null-out-body"); - assertNull("no data should be received", out); + assertNull(out, "no data should be received"); } @Test public void testReceiveNoResponseSinceOutBodyIsNullTwice() throws Exception { String out = sendAndReceive("force-null-out-body"); - assertNull("no data should be received", out); + assertNull(out, "no data should be received"); out = sendAndReceive("force-null-out-body"); - assertNull("no data should be received", out); + assertNull(out, "no data should be received"); } @Test public void testExchangeFailedOutShouldBeNull() throws Exception { String out = sendAndReceive("force-exception"); - assertTrue("out should not be the same as in when the exchange has failed", !"force-exception".equals(out)); - assertEquals("should get the exception here", out, "java.lang.IllegalArgumentException: Forced exception"); + assertFalse("force-exception".equals(out), "out should not be the same as in when the exchange has failed"); + assertEquals(out, "java.lang.IllegalArgumentException: Forced exception", "should get the exception here"); } private String sendAndReceive(String input) throws IOException { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyNullDelimiterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyNullDelimiterTest.java index 0b8f82e..49d0c67 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyNullDelimiterTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyNullDelimiterTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyTest.java index 7b4d953..f5f9891 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOnlyTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NettyTextlineInOnlyTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutNonBlockingTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutNonBlockingTest.java index 0252df6..211f9da 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutNonBlockingTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutNonBlockingTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest { @@ -37,8 +40,8 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest { assertMockEndpointsSatisfied(); - assertFalse("Should not same threads", beforeThreadName.equalsIgnoreCase(afterThreadName)); - assertFalse("Should not same threads", beforeThreadName2.equalsIgnoreCase(afterThreadName2)); + assertFalse(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should not same threads"); + assertFalse(beforeThreadName2.equalsIgnoreCase(afterThreadName2), "Should not same threads"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousFalseTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousFalseTest.java index e774ecc..36fb1cc 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousFalseTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousFalseTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest { @@ -35,7 +38,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest { assertMockEndpointsSatisfied(); - assertFalse("Should not same threads", beforeThreadName.equalsIgnoreCase(afterThreadName)); + assertFalse(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should not same threads"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousTest.java index a8e43ee..9f4b69b 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutSynchronousTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NettyTextlineInOutSynchronousTest extends BaseNettyTest { @@ -35,7 +38,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest { assertMockEndpointsSatisfied(); - assertTrue("Should use same threads", beforeThreadName.equalsIgnoreCase(afterThreadName)); + assertTrue(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should use same threads"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutTest.java index 44f0f88..54c378c 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTextlineInOutTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyTextlineInOutTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java index 9807b5b..7651c33 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java @@ -30,7 +30,12 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.codec.ObjectDecoder; import org.apache.camel.component.netty.codec.ObjectEncoder; -import org.junit.Test; +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.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NettyTransferExchangeOptionTest extends BaseNettyTest { @@ -94,7 +99,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest { Message fault = exchange.getOut(); assertNotNull(fault); assertNotNull(fault.getBody()); - assertTrue("Should get the InterruptedException exception", fault.getBody() instanceof InterruptedException); + assertTrue(fault.getBody() instanceof InterruptedException, "Should get the InterruptedException exception"); assertEquals("nihao", fault.getHeader("hello")); } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java index 5aea806..d33f887 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java @@ -22,7 +22,7 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; public class NettyUDPAsyncTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayConsumerTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayConsumerTest.java index 49ecf98..21eb3f9 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayConsumerTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayConsumerTest.java @@ -21,7 +21,9 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyUDPByteArrayConsumerTest extends BaseNettyTest { @@ -51,9 +53,9 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest { byte[] out = list.get(0).getIn().getBody(byte[].class); for (int i = 0; i < in.length; i++) { - assertEquals("The bytes should be the same", in[i], out[i]); + assertEquals(in[i], out[i], "The bytes should be the same"); } - assertEquals("The strings should be the same", toSend, byteArrayToHex(out)); + assertEquals(toSend, byteArrayToHex(out), "The strings should be the same"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayProviderTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayProviderTest.java index 90a5e3a..5a5e5fb 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayProviderTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPByteArrayProviderTest.java @@ -31,7 +31,10 @@ import io.netty.channel.socket.nio.NioDatagramChannel; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.bytes.ByteArrayDecoder; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NettyUDPByteArrayProviderTest extends BaseNettyTest { private static final String SEND_STRING = "ef3e00559f5faf0262f5ff0962d9008daa91001cd46b0fa9330ef0f3030fff250e46f72444d1cc501678c351e04b8004c" @@ -73,7 +76,7 @@ public class NettyUDPByteArrayProviderTest extends BaseNettyTest { template.sendBody("direct:in", fromHexString(SEND_STRING)); } stop(); - assertTrue("We should have received some datagrams", receivedCount > 0); + assertTrue(receivedCount > 0, "We should have received some datagrams"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPLargeMessageInOnlyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPLargeMessageInOnlyTest.java index fa8ff25..d5bdf5d 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPLargeMessageInOnlyTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPLargeMessageInOnlyTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.netty; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMessageLargerThanDefaultBufferSizeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMessageLargerThanDefaultBufferSizeTest.java index d2a65b4..9512c24 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMessageLargerThanDefaultBufferSizeTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMessageLargerThanDefaultBufferSizeTest.java @@ -20,7 +20,9 @@ import io.netty.channel.ChannelOption; import io.netty.channel.FixedRecvByteBufAllocator; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyUDPMessageLargerThanDefaultBufferSizeTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMulticastAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMulticastAsyncTest.java index 930ed79..5576e95 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMulticastAsyncTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPMulticastAsyncTest.java @@ -22,12 +22,12 @@ 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.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** - * To run this test manually through Maven first remove the {@link Ignore} + * To run this test manually through Maven first remove the {@link Disabled} * annotation below, then make sure you've got a network interface with the name * <code>en0</code> as given by the route below. If this is not the case run * your OS specific command to find out which network interfaces you've got @@ -43,14 +43,14 @@ import org.junit.Test; * mvn test -Djava.net.preferIPv4Stack=true -Dtest=NettyUDPMulticastAsyncTest * </pre> * - * Please note that using the JUnit {@link BeforeClass} annotation together with + * Please note that using the JUnit {@link BeforeAll} annotation together with * the corresponding {@link System#setProperty(String, String) Java API} to set * the {@code java.net.preferIPv4Stack} system property would not work here as * at that moment it would be too <b>late</b> to set this system property. On * the other hand setting such a system property through the surefire-plugin * would cause side effect by the other tests of this component. */ -@Ignore("See the Javadoc") +@Disabled("See the Javadoc") public class NettyUDPMulticastAsyncTest extends BaseNettyTest { private void sendFile(String uri) throws Exception { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java index 4869aaa..eb6b3b7 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.netty; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyUDPSyncTest extends BaseNettyTest { private static final String RESPONSE = "Go tell the Spartans, thou that passest by, That faithful to their precepts here we lie."; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectedSendTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectedSendTest.java index 79fbdfe..b5a51da 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectedSendTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectedSendTest.java @@ -31,13 +31,15 @@ import io.netty.channel.socket.nio.NioDatagramChannel; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.util.CharsetUtil; import org.apache.camel.builder.RouteBuilder; -import org.junit.FixMethodOrder; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + +import static org.junit.jupiter.api.Assertions.assertTrue; //We need to run the tests with fix order -@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestMethodOrder(MethodOrderer.Alphanumeric.class) public class NettyUdpConnectedSendTest extends BaseNettyTest { private static final String SEND_STRING = "***<We all love camel>***"; private static final int SEND_COUNT = 10; @@ -79,11 +81,11 @@ public class NettyUdpConnectedSendTest extends BaseNettyTest { template.sendBody("direct:in", SEND_STRING); } stop(); - assertTrue("We should have received some datagrams", receivedCount > 0); + assertTrue(receivedCount > 0, "We should have received some datagrams"); } @Test - @Ignore("This test would be failed in JDK7 sometimes") + @Disabled("This test would be failed in JDK7 sometimes") public void sendBodyWithoutReceiver() throws Exception { int exceptionCount = 0; for (int i = 0; i < SEND_COUNT; ++i) { @@ -93,7 +95,7 @@ public class NettyUdpConnectedSendTest extends BaseNettyTest { ++exceptionCount; } } - assertTrue("There should at least one exception because port is unreachable", exceptionCount > 0); + assertTrue(exceptionCount > 0, "There should at least one exception because port is unreachable"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectionlessSendTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectionlessSendTest.java index 1a92570..6135da6 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectionlessSendTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpConnectionlessSendTest.java @@ -31,7 +31,10 @@ import io.netty.channel.socket.nio.NioDatagramChannel; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.util.CharsetUtil; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NettyUdpConnectionlessSendTest extends BaseNettyTest { private static final String SEND_STRING = "***<We all love camel>***"; @@ -71,7 +74,7 @@ public class NettyUdpConnectionlessSendTest extends BaseNettyTest { template.sendBody("direct:in", SEND_STRING); } stop(); - assertTrue("We should have received some datagrams", receivedCount > 0); + assertTrue(receivedCount > 0, "We should have received some datagrams"); } @@ -85,7 +88,7 @@ public class NettyUdpConnectionlessSendTest extends BaseNettyTest { ++exceptionCount; } } - assertEquals("No exception should occur", 0, exceptionCount); + assertEquals(0, exceptionCount, "No exception should occur"); } @Override diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java index 64cac7c..1e1b747 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUdpWithInOutUsingPlainSocketTest.java @@ -23,10 +23,13 @@ import java.net.InetAddress; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +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; + public class NettyUdpWithInOutUsingPlainSocketTest extends BaseNettyTest { private static final Logger LOG = LoggerFactory.getLogger(NettyUdpWithInOutUsingPlainSocketTest.class); @@ -70,7 +73,7 @@ public class NettyUdpWithInOutUsingPlainSocketTest extends BaseNettyTest { LOG.debug("Server got: " + s); exchange.getOut().setBody("Hello " + s); // just make the remote address is there - assertNotNull("The remote address header should not be Null", exchange.getIn().getHeader(NettyConstants.NETTY_REMOTE_ADDRESS)); + assertNotNull(exchange.getIn().getHeader(NettyConstants.NETTY_REMOTE_ADDRESS), "The remote address header should not be Null"); } }); } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java index 72c40c1..6d797d9 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolManyRoutesTest.java @@ -19,11 +19,17 @@ package org.apache.camel.component.netty; import io.netty.channel.EventLoopGroup; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Before; -import org.junit.Test; +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.assertTrue; public class NettyUseSharedWorkerThreadPoolManyRoutesTest extends BaseNettyTest { + private static final Logger LOG = LoggerFactory.getLogger(NettyUseSharedWorkerThreadPoolManyRoutesTest.class); + @BindToRegistry("sharedWorker") private EventLoopGroup sharedBoosGroup = new NettyWorkerPoolBuilder().withWorkerCount(10).build(); @BindToRegistry("sharedBoss") @@ -36,7 +42,7 @@ public class NettyUseSharedWorkerThreadPoolManyRoutesTest extends BaseNettyTest } @Override - @Before + @BeforeEach public void setUp() throws Exception { before = Thread.activeCount(); super.setUp(); @@ -46,8 +52,8 @@ public class NettyUseSharedWorkerThreadPoolManyRoutesTest extends BaseNettyTest public void testSharedThreadPool() throws Exception { int delta = Thread.activeCount() - before; - log.info("Created threads {}", delta); - assertTrue("There should not be created so many threads: " + delta, delta < 50); + LOG.info("Created threads {}", delta); + assertTrue(delta < 50, "There should not be created so many threads: " + delta); sharedBoosGroup.shutdownGracefully().awaitUninterruptibly(); sharedWorkerGroup.shutdownGracefully().awaitUninterruptibly(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java index 90d6426..af16804 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUseSharedWorkerThreadPoolTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.netty; import io.netty.channel.EventLoopGroup; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class NettyUseSharedWorkerThreadPoolTest extends BaseNettyTest { diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java index 2014745..ec6c207 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java @@ -29,8 +29,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.codec.ObjectDecoder; import org.apache.camel.component.netty.codec.ObjectEncoder; import org.apache.camel.test.AvailablePortFinder; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * Object Serialization is not allowed by default. However it can be enabled by adding specific encoders/decoders. @@ -39,7 +42,7 @@ public class ObjectSerializationTest extends BaseNettyTest { private static volatile int port2; - @BeforeClass + @BeforeAll public static void initPort2() throws Exception { port2 = AvailablePortFinder.getNextAvailable(); } diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java index 70bd747..9d399d6 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/SpringNettyUseSharedWorkerThreadPoolTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.component.netty; -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; + public class SpringNettyUseSharedWorkerThreadPoolTest extends CamelSpringTestSupport { @Test diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflicts2Test.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflicts2Test.java index 58ede3d..ba1ad43 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflicts2Test.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflicts2Test.java @@ -27,14 +27,18 @@ 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.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * */ public class UnsharableCodecsConflicts2Test extends BaseNettyTest { - static final byte[] LENGTH_HEADER = {0x00, 0x00, 0x40, 0x00}; // 16384 bytes + private static final Logger LOG = LoggerFactory.getLogger(NettyConsumerClientModeReconnectTest.class); + + private static final byte[] LENGTH_HEADER = {0x00, 0x00, 0x40, 0x00}; // 16384 bytes private Processor processor = new P(); private int port; @@ -63,7 +67,7 @@ public class UnsharableCodecsConflicts2Test extends BaseNettyTest { sendBuffer(body1, client1); sendBuffer(new String("9").getBytes(), client2); } catch (Exception e) { - log.error("", e); + LOG.error("", e); } finally { client1.close(); client2.close(); diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java index 0807eae..72cd6cc 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/UnsharableCodecsConflictsTest.java @@ -27,14 +27,18 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * */ public class UnsharableCodecsConflictsTest extends BaseNettyTest { - static final byte[] LENGTH_HEADER = {0x00, 0x00, 0x40, 0x00}; // 4096 bytes + private static final byte[] LENGTH_HEADER = {0x00, 0x00, 0x40, 0x00}; // 4096 bytes + + private static final Logger LOG = LoggerFactory.getLogger(UnsharableCodecsConflictsTest.class); private Processor processor = new P(); @@ -67,7 +71,7 @@ public class UnsharableCodecsConflictsTest extends BaseNettyTest { sendSopBuffer(bodyPort1, server1); sendSopBuffer(new String("9").getBytes(), server2); } catch (Exception e) { - log.error("", e); + LOG.error("", e); } finally { server1.close(); server2.close();
