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 81cfc882b07ef95bb5a04e3a531cb0f7412030c3 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 14:23:06 2020 +0200 [CAMEL-11807] Upgrade camel-mina to junit5 --- components/camel-mina/pom.xml | 8 +++---- .../apache/camel/component/mina/BaseMinaTest.java | 6 ++--- .../camel/component/mina/MessageIOSessionTest.java | 4 +++- .../MinaClientModeTcpTextlineDelimiterTest.java | 6 ++--- .../camel/component/mina/MinaClientServerTest.java | 4 +++- .../camel/component/mina/MinaComponentTest.java | 12 ++++++---- .../mina/MinaComponentWithConfigurationTest.java | 7 ++++-- .../camel/component/mina/MinaConsumerTest.java | 4 +++- .../camel/component/mina/MinaConverterTest.java | 8 ++++--- .../camel/component/mina/MinaCustomCodecTest.java | 7 +++++- .../mina/MinaDisconnectRaceConditionTest.java | 5 +++- .../camel/component/mina/MinaDisconnectTest.java | 4 +++- .../camel/component/mina/MinaEncodingTest.java | 6 ++++- .../mina/MinaExchangeDefaultTimeOutTest.java | 5 +++- .../component/mina/MinaExchangeTimeOutTest.java | 13 +++++----- .../camel/component/mina/MinaFileTcpTest.java | 2 +- .../camel/component/mina/MinaFileUdpTest.java | 2 +- .../camel/component/mina/MinaFiltersTest.java | 10 ++++---- .../camel/component/mina/MinaInOnlyRouteTest.java | 2 +- .../MinaInOutCloseSessionWhenCompleteTest.java | 4 +++- .../camel/component/mina/MinaInOutRouteTest.java | 4 +++- .../mina/MinaInOutRouteTextLineDelimiterTest.java | 4 +++- .../mina/MinaInOutWithForcedNoResponseTest.java | 6 ++++- .../component/mina/MinaMaxLineLengthTest.java | 4 +++- .../component/mina/MinaNoDefaultCodecTest.java | 4 +++- .../mina/MinaNoResponseFromServerTest.java | 5 +++- .../mina/MinaProducerAnotherConcurrentTest.java | 8 ++++--- .../component/mina/MinaProducerConcurrentTest.java | 6 +++-- .../mina/MinaProducerShutdownMockTest.java | 2 +- .../component/mina/MinaProducerShutdownTest.java | 14 ++++++----- .../component/mina/MinaReverseProtocolHandler.java | 5 ++-- .../component/mina/MinaSendToProcessorTest.java | 4 +++- .../component/mina/MinaSpringMinaEndpointTest.java | 6 +++-- .../mina/MinaSpringMinaEndpointUDPTest.java | 6 +++-- .../component/mina/MinaSpringMultipleUDPTest.java | 6 +++-- .../mina/MinaSslContextParametersTcpTest.java | 2 +- .../mina/MinaSslContextParametersUdpTest.java | 2 +- .../mina/MinaSslContextParametersVmTest.java | 2 +- .../MinaSslGlobalContextParametersTcpTest.java | 2 +- .../MinaTcpLineDelimiterUsingPlainSocketTest.java | 23 +++++++++++------- .../apache/camel/component/mina/MinaTcpTest.java | 2 +- .../mina/MinaTcpTextlineDelimiterTest.java | 2 +- .../mina/MinaTcpTextlineProtocolTest.java | 2 +- .../camel/component/mina/MinaTcpWithInOutTest.java | 6 ++++- .../mina/MinaTcpWithInOutUsingPlainSocketTest.java | 28 ++++++++++++++-------- .../MinaTcpWithIoOutProcessorExceptionTest.java | 9 ++++--- .../mina/MinaTransferExchangeOptionTest.java | 9 +++++-- .../component/mina/MinaUdpConcurrentTest.java | 2 +- .../camel/component/mina/MinaUdpNoCamelTest.java | 12 +++++----- .../apache/camel/component/mina/MinaUdpTest.java | 2 +- .../component/mina/MinaUdpUsingTemplateTest.java | 10 ++++---- .../mina/MinaUdpWithInOutUsingPlainSocketTest.java | 5 +++- .../component/mina/MinaVMCustomCodecTest.java | 5 +++- .../camel/component/mina/MinaVMFileTcpTest.java | 2 +- .../component/mina/MinaVMTextlineProtocolTest.java | 2 +- .../mina/MinaVMTransferExchangeOptionTest.java | 9 +++++-- .../apache/camel/component/mina/MinaVmTest.java | 2 +- 57 files changed, 223 insertions(+), 120 deletions(-) diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index 35a7f41..d262f35 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -56,12 +56,12 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java index b500e25..aec6457 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java @@ -24,8 +24,8 @@ import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.SSLContextServerParameters; import org.apache.camel.support.jsse.TrustManagersParameters; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.BeforeClass; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeAll; public class BaseMinaTest extends CamelTestSupport { @@ -33,7 +33,7 @@ public class BaseMinaTest extends CamelTestSupport { private static volatile int port; - @BeforeClass + @BeforeAll public static void initPort() throws Exception { port = AvailablePortFinder.getNextAvailable(); } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java index 249f904..567b5e4 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java @@ -22,7 +22,9 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; 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.assertNotNull; /** * Unit test to check if the message of an exchange send from the MinaConsumer diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java index 92eb0f2..7ae0e53 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientModeTcpTextlineDelimiterTest.java @@ -27,10 +27,10 @@ import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.textline.LineDelimiter; import org.apache.mina.transport.socket.nio.NioSocketAcceptor; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("fix me") +@Disabled("fix me") public class MinaClientModeTcpTextlineDelimiterTest extends BaseMinaTest { @Test diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java index 2cc9136..e875ee1 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaClientServerTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.mina; 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 MinaClientServerTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java index 0290e0d..91d77e9 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentTest.java @@ -17,8 +17,12 @@ package org.apache.camel.component.mina; import org.apache.camel.ResolveEndpointFailedException; -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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * For testing various minor holes that hasn't been covered by other unit tests. @@ -31,7 +35,7 @@ public class MinaComponentTest extends CamelTestSupport { template.sendBody("mina:xxx://localhost:8080", "mina:xxx://localhost:8080"); fail("Should have thrown a ResolveEndpointFailedException"); } catch (ResolveEndpointFailedException e) { - assertTrue("Should be an IAE exception", e.getCause() instanceof IllegalArgumentException); + assertTrue(e.getCause() instanceof IllegalArgumentException, "Should be an IAE exception"); assertEquals("Unrecognised MINA protocol: xxx for uri: mina://xxx://localhost:8080", e.getCause().getMessage()); } } @@ -43,7 +47,7 @@ public class MinaComponentTest extends CamelTestSupport { template.sendBody("mina:tcp//localhost:8080", "mina:tcp//localhost:8080"); fail("Should have thrown a ResolveEndpointFailedException"); } catch (ResolveEndpointFailedException e) { - assertTrue("Should be an IAE exception", e.getCause() instanceof IllegalArgumentException); + assertTrue(e.getCause() instanceof IllegalArgumentException, "Should be an IAE exception"); assertEquals("Unrecognised MINA protocol: null for uri: mina://tcp//localhost:8080", e.getCause().getMessage()); } } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java index 8190c3a..e3a3711 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaComponentWithConfigurationTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.mina; -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; public class MinaComponentWithConfigurationTest extends CamelTestSupport { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java index 815599f..56c9911 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java @@ -20,7 +20,9 @@ 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; /** * Unit test for wiki documentation diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java index 97fde40..9c66a46 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConverterTest.java @@ -23,10 +23,12 @@ import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; import org.apache.mina.core.buffer.IoBuffer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class MinaConverterTest extends Assert { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class MinaConverterTest { @Test public void testToByteArray() { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java index d6d9b98..dc7517a 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaCustomCodecTest.java @@ -29,7 +29,12 @@ import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; -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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Unit test with custom codec. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java index f76fc0b..929c9cb 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectRaceConditionTest.java @@ -23,7 +23,10 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.DefaultExchange; import org.apache.mina.core.session.IoSession; -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 MinaDisconnectRaceConditionTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java index d448dc9..7f9a7b8 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaDisconnectTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.mina; 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; /** * Unit test for close session when complete test. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java index dfcaf6a..981bfd8 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaEncodingTest.java @@ -21,7 +21,11 @@ import org.apache.camel.Exchange; import org.apache.camel.Producer; 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.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * Unit testing using different encodings with the TCP protocol. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java index 18a8f49..040265e 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeDefaultTimeOutTest.java @@ -18,7 +18,10 @@ package org.apache.camel.component.mina; 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.fail; /** * To test timeout. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java index bc2a273..3490710 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTimeOutTest.java @@ -21,7 +21,10 @@ import org.apache.camel.Exchange; import org.apache.camel.ExchangeTimedOutException; import org.apache.camel.Producer; 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.assertThrows; /** * To test timeout. @@ -36,12 +39,8 @@ public class MinaExchangeTimeOutTest extends BaseMinaTest { producer.start(); Exchange exchange = endpoint.createExchange(); exchange.getIn().setBody("Hello World"); - try { - producer.process(exchange); - fail("Should have thrown an ExchangeTimedOutException wrapped in a RuntimeCamelException"); - } catch (Exception e) { - assertTrue("Should have thrown an ExchangeTimedOutException", e instanceof ExchangeTimedOutException); - } + assertThrows(ExchangeTimedOutException.class, + () -> producer.process(exchange)); producer.stop(); } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java index 2d4d2d8..406242e 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaFileTcpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java index 8c9b1fe..c6496ce 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaFileUdpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java index db96faf..c203b5c 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java @@ -28,8 +28,10 @@ import org.apache.camel.spi.Registry; import org.apache.mina.core.filterchain.IoFilter; import org.apache.mina.core.filterchain.IoFilterAdapter; import org.apache.mina.core.session.IoSession; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * For unit testing the <tt>filters</tt> option. @@ -47,7 +49,7 @@ public class MinaFiltersTest extends BaseMinaTest { } @Override - @After + @AfterEach public void tearDown() throws Exception { TestFilter.called = 0; super.tearDown(); @@ -75,7 +77,7 @@ public class MinaFiltersTest extends BaseMinaTest { assertMockEndpointsSatisfied(); - assertEquals("The filter should have been called twice (producer and consumer)", 2, TestFilter.called); + assertEquals(2, TestFilter.called, "The filter should have been called twice (producer and consumer)"); producer.stop(); } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java index d518e71..0e14223 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit test to verify that MINA can be used with an InOnly MEP but still use sync to send and receive data diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java index b615a5e..4e4bfa5 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutCloseSessionWhenCompleteTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.mina; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for close session when complete test. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java index fec3256..3b4a628 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.mina; 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; /** * Unit test to verify that MINA can be used with an InOut MEP but still use sync to send and receive data diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java index 743cd72..b3f13c3 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTextLineDelimiterTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.mina; 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; /** * Unit test to verify that MINA can be used with an InOut MEP but still use sync to send and receive data diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java index 922ef10..c87d7a0 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java @@ -19,7 +19,11 @@ package org.apache.camel.component.mina; import org.apache.camel.ExchangeTimedOutException; import org.apache.camel.RuntimeCamelException; 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.fail; /** * Unit test with InOut however we want sometimes to not send a response. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java index ac14df3..27d1564 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaMaxLineLengthTest.java @@ -19,7 +19,9 @@ package org.apache.camel.component.mina; 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 MinaMaxLineLengthTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java index 87a7cf9..51503fb 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java @@ -20,7 +20,9 @@ import java.util.List; import org.apache.camel.builder.RouteBuilder; import org.apache.mina.core.filterchain.IoFilterChain.Entry; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * For unit testing the <tt>noDefaultCodec</tt> option. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java index f3b3a57..4cfedcb 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoResponseFromServerTest.java @@ -28,7 +28,10 @@ import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; -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.fail; /** * Unit test to test what happens if remote server closes session but doesn't diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java index 99c9a0a..2f82d8b 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java @@ -24,10 +24,12 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; 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("TODO: investigate for Camel 3.0") +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Disabled("TODO: investigate for Camel 3.0") public class MinaProducerAnotherConcurrentTest extends BaseMinaTest { @Test diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java index a14218a..bff16b7 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java @@ -26,7 +26,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; 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 MinaProducerConcurrentTest extends BaseMinaTest { @@ -67,7 +69,7 @@ public class MinaProducerConcurrentTest extends BaseMinaTest { } // 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-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java index a2a2cb2..43fcddd 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.mina.transport.socket.SocketConnector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java index d8876e0..4ace184 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownTest.java @@ -22,18 +22,20 @@ import org.apache.camel.Exchange; import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit4.TestSupport; -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; /** * Unit testing for using a MinaProducer that it can shutdown properly (CAMEL-395) * <p> * Run this test from maven: mvn exec:java and see the output if there is a error. */ -@Ignore -public class MinaProducerShutdownTest extends TestSupport { +@Disabled +public class MinaProducerShutdownTest { + private static final Logger LOG = LoggerFactory.getLogger(MinaProducerShutdownTest.class); private static final String URI = "mina:tcp://localhost:6321?textline=true&sync=false"; private long start; private CamelContext context; @@ -66,7 +68,7 @@ public class MinaProducerShutdownTest extends TestSupport { public void run() { long diff = System.currentTimeMillis() - start; if (diff > 5000) { - log.error("ERROR: MinaProducer should be able to shutdown within 5000 millis: time=" + diff); + LOG.error("ERROR: MinaProducer should be able to shutdown within 5000 millis: time=" + diff); } } } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java index 7fc6dbc..79ddec6 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaReverseProtocolHandler.java @@ -16,11 +16,12 @@ */ package org.apache.camel.component.mina; -import org.apache.camel.test.junit4.TestSupport; import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; +import static org.apache.camel.test.junit5.TestSupport.isPlatform; + /** * {@link IoHandler} implementation of reverser server protocol. * @@ -43,7 +44,7 @@ public class MinaReverseProtocolHandler extends IoHandlerAdapter { buf.append(str.charAt(i)); } - if (TestSupport.isPlatform("windows")) { + if (isPlatform("windows")) { // seems to be only required on windows to make it work! buf.append(System.lineSeparator()); } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java index c834d1e..aa355e7 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSendToProcessorTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.mina; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.fail; public class MinaSendToProcessorTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java index 50044d5..07f0879 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointTest.java @@ -17,10 +17,12 @@ package org.apache.camel.component.mina; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Unit test spring based mina endpoint configuration. */ diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java index afb6156..06a0f0a 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMinaEndpointUDPTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.mina; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -26,6 +26,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class MinaSpringMinaEndpointUDPTest extends CamelSpringTestSupport { + private static final String LS = System.lineSeparator(); + @Test public void testMinaSpringEndpoint() throws Exception { MockEndpoint result = getMockEndpoint("mock:result"); diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java index ac47219..064e6fa 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSpringMultipleUDPTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.mina; 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.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -27,6 +27,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; */ public class MinaSpringMultipleUDPTest extends CamelSpringTestSupport { + private static final String LS = System.lineSeparator(); + @Override protected AbstractApplicationContext createApplicationContext() { return new ClassPathXmlApplicationContext( diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java index 41a4aac..3948d77 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersTcpTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaSslContextParametersTcpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java index 1ec7bb5..68de033 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersUdpTest.java @@ -22,7 +22,7 @@ import java.net.InetAddress; 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 MinaSslContextParametersUdpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java index e575cc1..a8ed3ce 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslContextParametersVmTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaSslContextParametersVmTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java index 778175c..8daa9d6 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaSslGlobalContextParametersTcpTest.java @@ -20,7 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.SSLContextParametersAware; 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 MinaSslGlobalContextParametersTcpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java index 5218cca..6410ac6 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpLineDelimiterUsingPlainSocketTest.java @@ -24,7 +24,12 @@ import java.net.Socket; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.IOHelper; -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; /** * To test camel-mina component using a TCP client that communicates using TCP socket communication. @@ -35,7 +40,7 @@ public class MinaTcpLineDelimiterUsingPlainSocketTest extends BaseMinaTest { 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); } @@ -44,8 +49,8 @@ public class MinaTcpLineDelimiterUsingPlainSocketTest extends BaseMinaTest { 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); } @@ -53,23 +58,23 @@ public class MinaTcpLineDelimiterUsingPlainSocketTest extends BaseMinaTest { @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-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java index d30ed5f..46cb3f5 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaTcpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java index 10d12dc..ebda533 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineDelimiterTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaTcpTextlineDelimiterTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java index 80c094a..e2ebaa5 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpTextlineProtocolTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaTcpTextlineProtocolTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java index 08123c8..3c55dba 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutTest.java @@ -26,7 +26,11 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; 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; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MinaTcpWithInOutTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java index 79522a1..cba6ac7 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithInOutUsingPlainSocketTest.java @@ -24,18 +24,26 @@ import java.net.Socket; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.IOHelper; -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; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * To test camel-mina component using a TCP client that communicates using TCP socket communication. */ public class MinaTcpWithInOutUsingPlainSocketTest extends BaseMinaTest { + private static final String LS = System.lineSeparator(); + @Test 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); } @@ -44,8 +52,8 @@ public class MinaTcpWithInOutUsingPlainSocketTest extends BaseMinaTest { 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); } @@ -53,29 +61,29 @@ public class MinaTcpWithInOutUsingPlainSocketTest extends BaseMinaTest { @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"); } @Test public void testExchangeWithInOnly() throws IOException { String out = sendAndReceive("force-set-in-body"); - assertEquals("Get a wrong response message", "Update the in message!", out); + assertEquals("Update the in message!", out, "Get a wrong response message"); } private String sendAndReceive(String input) throws IOException { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java index b5a9561..55e566f 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTcpWithIoOutProcessorExceptionTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.mina; 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.assertNotNull; /** * To unit test CAMEL-364. @@ -31,8 +34,8 @@ public class MinaTcpWithIoOutProcessorExceptionTest extends BaseMinaTest { String body = "Hello World"; Object result = template.requestBody(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true", getPort()), body); // The exception should be passed to the client - assertNotNull("the result should not be null", result); - assertEquals("result is IllegalArgumentException", result, "java.lang.IllegalArgumentException: Forced exception"); + assertNotNull(result, "the result should not be null"); + assertEquals("java.lang.IllegalArgumentException: Forced exception", result, "result is IllegalArgumentException"); } @Override diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java index f459d97..76a27aa 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java @@ -25,10 +25,15 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; 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; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Unit test for the <tt>transferExchange=true</tt> option. */ @@ -76,7 +81,7 @@ public class MinaTransferExchangeOptionTest extends BaseMinaTest { Message fault = exchange.getMessage(); 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-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java index 0caa0db..4e9db53 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpConcurrentTest.java @@ -22,7 +22,7 @@ import java.net.InetAddress; 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 MinaUdpConcurrentTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java index 9291322..6170208 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpNoCamelTest.java @@ -34,13 +34,13 @@ import org.apache.mina.filter.logging.LoggingFilter; import org.apache.mina.transport.socket.DatagramSessionConfig; import org.apache.mina.transport.socket.nio.NioDatagramAcceptor; import org.apache.mina.transport.socket.nio.NioDatagramConnector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MinaUdpNoCamelTest { @@ -52,13 +52,13 @@ public class MinaUdpNoCamelTest { private int port = AvailablePortFinder.getNextAvailable(); // Create the UDPServer before the test is run - @Before + @BeforeEach public void setupUDPAcceptor() throws IOException { server = new UDPServer("127.0.0.1", port); server.listen(); } - @After + @AfterEach public void closeUDPAcceptor() throws IOException { server.close(); } diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java index 71e51c3..9a198291 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java @@ -22,7 +22,7 @@ import java.net.InetAddress; 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 MinaUdpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java index e92eaac..ee4e15f 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.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 MinaUdpUsingTemplateTest extends BaseMinaTest { @@ -57,7 +59,7 @@ public class MinaUdpUsingTemplateTest extends BaseMinaTest { byte[] out = list.get(0).getIn().getBody(byte[].class); for (int i = 0; i < in.length; i++) { - assertEquals("Thew bytes should be the same", in[i], out[i]); + assertEquals(in[i], out[i], "Thew bytes should be the same"); } } @@ -76,9 +78,9 @@ public class MinaUdpUsingTemplateTest extends BaseMinaTest { 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"); } private String byteArrayToHex(byte[] bytes) { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java index 9d3ba75..8ced2c2 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java @@ -21,10 +21,13 @@ import java.net.DatagramSocket; import java.net.InetAddress; 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; + /** * To test InOut exchange for the UDP protocol. */ diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java index 568c777..16b7300 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java @@ -28,7 +28,10 @@ import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; -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; /** * Unit test with custom codec using the VM protocol. diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java index 1931fe9..2c3b255 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaVMFileTcpTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java index f42feef..bf90362 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaVMTextlineProtocolTest extends BaseMinaTest { diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java index 273c74e..eeb6b5e 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java @@ -24,7 +24,12 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Producer; 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; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for the <tt>transferExchange=true</tt> option. @@ -70,7 +75,7 @@ public class MinaVMTransferExchangeOptionTest extends BaseMinaTest { Message fault = exchange.getMessage(); 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-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java index a1ac148..31ae3ea 100644 --- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java +++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.mina; 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 MinaVmTest extends BaseMinaTest {
