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 125263cf60478ae57c211542e17a31a7a0307e57 Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jul 24 16:18:40 2020 +0200 [CAMEL-11807] Upgrade camel-websocket to junit5 --- components/camel-websocket/pom.xml | 8 ++-- .../component/websocket/DefaultWebsocketTest.java | 18 ++++----- .../websocket/MemoryWebsocketStoreTest.java | 31 +++++++------- .../websocket/NodeSynchronizationImplTest.java | 26 ++++++------ .../websocket/WebsocketClientCamelRouteTest.java | 16 +++++--- .../WebsocketComponentRouteExampleTest.java | 16 +++++--- .../websocket/WebsocketComponentServletTest.java | 18 ++++----- .../websocket/WebsocketComponentTest.java | 25 ++++++------ .../websocket/WebsocketConsumerRouteTest.java | 10 ++--- .../component/websocket/WebsocketConsumerTest.java | 11 +++-- .../WebsocketEndpointConfigurationTest.java | 47 +++++++++++----------- .../component/websocket/WebsocketEndpointTest.java | 17 ++++---- .../WebsocketProducerRouteExampleTest.java | 18 ++++++--- .../WebsocketProducerRouteRestartTest.java | 18 ++++++--- .../component/websocket/WebsocketProducerTest.java | 25 ++++++------ .../websocket/WebsocketRouteExampleTest.java | 17 +++++--- .../WebsocketSSLClientAuthRouteExampleTest.java | 21 ++++++---- .../WebsocketSSLContextGlobalRouteExampleTest.java | 15 +++++-- .../WebsocketSSLContextInUriRouteExampleTest.java | 15 +++++-- .../websocket/WebsocketSSLRouteExampleTest.java | 21 ++++++---- .../component/websocket/WebsocketStaticTest.java | 18 ++++++--- .../websocket/WebsocketTwoRoutesExampleTest.java | 15 +++++-- ...SIndividualAndBroadcastEndpointExampleTest.java | 15 +++++-- ...ebsocketTwoRoutesToSameEndpointExampleTest.java | 15 +++++-- 24 files changed, 275 insertions(+), 181 deletions(-) diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 5a5437e..31d9655 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -88,17 +88,17 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-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> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java index 5bea362..6b2ef15 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java @@ -19,21 +19,21 @@ package org.apache.camel.component.websocket; import java.net.InetSocketAddress; import org.eclipse.jetty.websocket.api.Session; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +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.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class DefaultWebsocketTest { private static final int CLOSE_CODE = -1; @@ -51,7 +51,7 @@ public class DefaultWebsocketTest { private DefaultWebsocket defaultWebsocket; - @Before + @BeforeEach public void setUp() throws Exception { defaultWebsocket = new DefaultWebsocket(sync, null, consumer); defaultWebsocket.setConnectionKey(CONNECTION_KEY); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java index b8b7e12..f979f98 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java @@ -18,20 +18,21 @@ package org.apache.camel.component.websocket; import java.util.Collection; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; + +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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class MemoryWebsocketStoreTest { private static final String KEY_1 = "one"; @@ -48,7 +49,7 @@ public class MemoryWebsocketStoreTest { private MemoryWebsocketStore store; - @Before + @BeforeEach public void setUp() throws Exception { store = new MemoryWebsocketStore(); when(websocket1.getConnectionKey()).thenReturn(KEY_1); @@ -66,9 +67,11 @@ public class MemoryWebsocketStoreTest { assertEquals(websocket2, store.get(KEY_2)); } - @Test(expected = NullPointerException.class) + @Test public void testAddNullValue() { - store.add(null); + assertThrows(NullPointerException.class, () -> { + store.add(null); + }); } @Test diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java index cb1df0a..329acd5 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java @@ -16,18 +16,18 @@ */ package org.apache.camel.component.websocket; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +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.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class NodeSynchronizationImplTest { private static final String KEY_1 = "one"; @@ -44,7 +44,7 @@ public class NodeSynchronizationImplTest { private MemoryWebsocketStore store1; - @Before + @BeforeEach public void setUp() throws Exception { store1 = new MemoryWebsocketStore(); @@ -84,9 +84,11 @@ public class NodeSynchronizationImplTest { /** * Test method for {@link org.apache.camel.component.websocket.NodeSynchronization#addSocket(org.apache.camel.component.websocket.DefaultWebsocket)} . */ - @Test(expected = NullPointerException.class) + @Test public void testAddNullValue() { - sync.addSocket(null); + assertThrows(NullPointerException.class, () -> { + sync.addSocket(null); + }); } /** diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java index 10c911a..c9bb936 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketClientCamelRouteTest.java @@ -23,24 +23,30 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketClientCamelRouteTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(10); - protected int port; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java index 76a1c57..9fd3723 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java @@ -23,24 +23,30 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketComponentRouteExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(1); - protected int port; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java index 15e5d01..8e41879 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java @@ -22,16 +22,16 @@ import java.util.Map; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +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.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; /** * */ -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class WebsocketComponentServletTest { private static final String PROTOCOL = "ws"; @@ -60,7 +60,7 @@ public class WebsocketComponentServletTest { private Map<String, WebSocketFactory> socketFactory; - @Before + @BeforeEach public void setUp() throws Exception { socketFactory = new HashMap<>(); socketFactory.put("default", new DefaultWebsocketFactory()); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java index dfc7206..16da430 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java @@ -25,26 +25,25 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.mockito.junit.jupiter.MockitoSettings; + +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.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class WebsocketComponentTest { private static final String PATH_ONE = "foo"; @@ -66,7 +65,7 @@ public class WebsocketComponentTest { private WebsocketProducer producer; private Server server; - @Before + @BeforeEach public void setUp() throws Exception { component = new WebsocketComponent(); component.setCamelContext(new DefaultCamelContext()); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java index 7a6476c..8022171 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java @@ -19,21 +19,21 @@ package org.apache.camel.component.websocket; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class WebsocketConsumerRouteTest extends CamelTestSupport { - protected int port; + private int port; @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java index 6b39791..9a703e1 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java @@ -22,12 +22,11 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.spi.ExceptionHandler; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -36,7 +35,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class WebsocketConsumerTest { private static final String CONNECTION_KEY = "random-connection-key"; @@ -57,7 +56,7 @@ public class WebsocketConsumerTest { private Exception exception = new Exception("BAD NEWS EVERYONE!"); private WebsocketConsumer websocketConsumer; - @Before + @BeforeEach public void setUp() throws Exception { websocketConsumer = new WebsocketConsumer(endpoint, processor); websocketConsumer.setExceptionHandler(exceptionHandler); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java index ad622e6..39dda06 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java @@ -20,18 +20,19 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.component.websocket.WebsocketComponent.ConnectorRef; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assumptions.assumeTrue; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class WebsocketEndpointConfigurationTest extends CamelTestSupport { private int port; @@ -58,28 +59,28 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport { ServletContextHandler context = (ServletContextHandler)conector.server.getHandler(); String buffersize = context.getInitParameter("bufferSize"); - assertEquals("Got a wrong buffersize", "25000", buffersize); + assertEquals("25000", buffersize, "Got a wrong buffersize"); String maxIdleTime = context.getInitParameter("maxIdleTime"); - assertEquals("Got a wrong maxIdleTime", "3000", maxIdleTime); + assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime"); String maxTextMessageSize = context.getInitParameter("maxTextMessageSize"); - assertEquals("Got a wrong maxTextMessageSize", "500", maxTextMessageSize); + assertEquals("500", maxTextMessageSize, "Got a wrong maxTextMessageSize"); String maxBinaryMessageSize = context.getInitParameter("maxBinaryMessageSize"); - assertEquals("Got a wrong maxBinaryMessageSize", "550", maxBinaryMessageSize); + assertEquals("550", maxBinaryMessageSize, "Got a wrong maxBinaryMessageSize"); WebSocketServletFactory factory = (WebSocketServletFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName()); int factoryBufferSize = factory.getPolicy().getInputBufferSize(); - assertEquals("Got a wrong buffersize", 25000, factoryBufferSize); + assertEquals(25000, factoryBufferSize, "Got a wrong buffersize"); long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout(); - assertEquals("Got a wrong maxIdleTime", 3000, factoryMaxIdleTime); + assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime"); int factoryMaxTextMessageSize = factory.getPolicy().getMaxTextMessageSize(); - assertEquals("Got a wrong maxTextMessageSize", 500, factoryMaxTextMessageSize); + assertEquals(500, factoryMaxTextMessageSize, "Got a wrong maxTextMessageSize"); int factoryMaxBinaryMessageSize = factory.getPolicy().getMaxBinaryMessageSize(); - assertEquals("Got a wrong maxBinaryMessageSize", 550, factoryMaxBinaryMessageSize); + assertEquals(550, factoryMaxBinaryMessageSize, "Got a wrong maxBinaryMessageSize"); } @Test public void testSetServletNoMinThreadsNoMaxThreadsNoThreadPool() throws Exception { - assumeTrue("At lease 18 CPUs available", 1 + Runtime.getRuntime().availableProcessors() * 2 >= 19); + assumeTrue(1 + Runtime.getRuntime().availableProcessors() * 2 >= 19, "At lease 18 CPUs available"); port = AvailablePortFinder.getNextAvailable(); String uri = "websocket://localhost:" + port + "/bar?bufferSize=25000&maxIdleTime=3000"; WebsocketEndpoint websocketEndpoint = (WebsocketEndpoint)context.getEndpoint(uri); @@ -94,15 +95,15 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport { ServletContextHandler context = (ServletContextHandler)conector.server.getHandler(); String buffersize = context.getInitParameter("bufferSize"); - assertEquals("Got a wrong buffersize", "25000", buffersize); + assertEquals("25000", buffersize, "Got a wrong buffersize"); String maxIdleTime = context.getInitParameter("maxIdleTime"); - assertEquals("Got a wrong maxIdleTime", "3000", maxIdleTime); + assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime"); WebSocketServletFactory factory = (WebSocketServletFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName()); int factoryBufferSize = factory.getPolicy().getInputBufferSize(); - assertEquals("Got a wrong buffersize", 25000, factoryBufferSize); + assertEquals(25000, factoryBufferSize, "Got a wrong buffersize"); long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout(); - assertEquals("Got a wrong maxIdleTime", 3000, factoryMaxIdleTime); + assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime"); } @Test @@ -123,15 +124,15 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport { ServletContextHandler context = (ServletContextHandler)conector.server.getHandler(); String buffersize = context.getInitParameter("bufferSize"); - assertEquals("Got a wrong buffersize", "25000", buffersize); + assertEquals("25000", buffersize, "Got a wrong buffersize"); String maxIdleTime = context.getInitParameter("maxIdleTime"); - assertEquals("Got a wrong maxIdleTime", "3000", maxIdleTime); + assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime"); WebSocketServletFactory factory = (WebSocketServletFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName()); int factoryBufferSize = factory.getPolicy().getInputBufferSize(); - assertEquals("Got a wrong buffersize", 25000, factoryBufferSize); + assertEquals(25000, factoryBufferSize, "Got a wrong buffersize"); long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout(); - assertEquals("Got a wrong maxIdleTime", 3000, factoryMaxIdleTime); + assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime"); } } diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java index 7f3135d..82ab730 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java @@ -19,23 +19,22 @@ package org.apache.camel.component.websocket; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class WebsocketEndpointTest { private static final String REMAINING = "foo/bar"; @@ -49,7 +48,7 @@ public class WebsocketEndpointTest { private WebsocketEndpoint websocketEndpoint; - @Before + @BeforeEach public void setUp() throws Exception { websocketEndpoint = new WebsocketEndpoint(component, URI, REMAINING, null); component = new WebsocketComponent(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java index 4c93506..631cc36 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java @@ -26,26 +26,34 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketProducerRouteExampleTest extends CamelTestSupport { private static List<Object> received = new ArrayList<>(); private static CountDownLatch latch; - protected int port; + + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Produce("direct:shop") private ProducerTemplate producer; @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java index 37603b8..60155dd 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteRestartTest.java @@ -25,27 +25,35 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketProducerRouteRestartTest extends CamelTestSupport { private static final String ROUTE_ID = WebsocketProducerRouteRestartTest.class.getSimpleName(); + private static List<Object> received = new ArrayList<>(); private static CountDownLatch latch; - protected int port; + + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Produce("direct:shop") private ProducerTemplate producer; @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java index 4c84888..b4b8005 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java @@ -24,24 +24,23 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.eclipse.jetty.websocket.api.RemoteEndpoint; import org.eclipse.jetty.websocket.api.Session; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.mockito.junit.jupiter.MockitoSettings; + +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; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class WebsocketProducerTest { private static final String MESSAGE = "MESSAGE"; @@ -69,7 +68,7 @@ public class WebsocketProducerTest { private WebsocketProducer websocketProducer; private Collection<DefaultWebsocket> sockets; - @Before + @BeforeEach public void setUp() throws Exception { websocketProducer = new WebsocketProducer(endpoint); websocketProducer.setStore(store); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java index f62e56f..606aa19 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketRouteExampleTest.java @@ -23,23 +23,30 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketRouteExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(1); - protected int port; + + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java index 7400063..810c917 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java @@ -35,7 +35,7 @@ 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.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.AsyncHttpClientConfig; import org.asynchttpclient.DefaultAsyncHttpClient; @@ -43,19 +43,26 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketSSLClientAuthRouteExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(10); - protected Properties originalValues = new Properties(); - protected String pwd = "changeit"; - protected int port; + + private Properties originalValues = new Properties(); + private String pwd = "changeit"; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java index 6ae1db3..c70eeb1 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java @@ -36,7 +36,7 @@ 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.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.AsyncHttpClientConfig; import org.asynchttpclient.DefaultAsyncHttpClient; @@ -44,20 +44,27 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketSSLContextGlobalRouteExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(10); + private String pwd = "changeit"; private String uri; private String server = "127.0.0.1"; private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java index 6d41887..f1af5a8 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java @@ -36,7 +36,7 @@ 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.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.AsyncHttpClientConfig; import org.asynchttpclient.DefaultAsyncHttpClient; @@ -44,20 +44,27 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(10); + private String pwd = "changeit"; private String uri; private String server = "127.0.0.1"; private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java index 15108b7..966a75f 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java @@ -35,7 +35,7 @@ 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.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.AsyncHttpClientConfig; import org.asynchttpclient.DefaultAsyncHttpClient; @@ -43,19 +43,26 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketSSLRouteExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(10); - protected Properties originalValues = new Properties(); - protected String pwd = "changeit"; - protected int port; + + private Properties originalValues = new Properties(); + private String pwd = "changeit"; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java index 70d3bab..577f069 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketStaticTest.java @@ -23,24 +23,32 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.Response; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketStaticTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch = new CountDownLatch(1); - protected int port; + + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java index 7f57434..f2f93be 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java @@ -23,23 +23,30 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketTwoRoutesExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java index 31baf3e..5c43bab 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest.java @@ -23,23 +23,30 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketTwoRoutesToSIndividualAndBroadcastEndpointExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp(); diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java index 4ee02ef..8f659ba 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesToSameEndpointExampleTest.java @@ -23,22 +23,29 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.ws.WebSocket; import org.asynchttpclient.ws.WebSocketListener; import org.asynchttpclient.ws.WebSocketUpgradeHandler; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WebsocketTwoRoutesToSameEndpointExampleTest extends CamelTestSupport { private static List<String> received = new ArrayList<>(); private static CountDownLatch latch; + private int port; + private Logger log = LoggerFactory.getLogger(getClass()); @Override - @Before + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); super.setUp();
