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 4a849b9e01631045b671c4ac8f3b9c2dc4cf8daf Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jul 24 15:35:47 2020 +0200 [CAMEL-11807] Upgrade camel-websocket-jsr356 to junit5 --- components/camel-websocket-jsr356/pom.xml | 6 +-- .../camel/websocket/jsr356/JSR356ConsumerTest.java | 45 ++++++++++++---------- .../camel/websocket/jsr356/JSR356ProducerTest.java | 35 +++++++++-------- .../ServerEndpointDeploymentStrategyTest.java | 21 +++++----- 4 files changed, 55 insertions(+), 52 deletions(-) diff --git a/components/camel-websocket-jsr356/pom.xml b/components/camel-websocket-jsr356/pom.xml index b813621..374eeb1 100644 --- a/components/camel-websocket-jsr356/pom.xml +++ b/components/camel-websocket-jsr356/pom.xml @@ -61,12 +61,12 @@ <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> diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java index 018143f..14c9111 100644 --- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java +++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ConsumerTest.java @@ -32,29 +32,31 @@ import javax.websocket.server.ServerEndpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.meecrowave.Meecrowave; -import org.apache.meecrowave.junit.MeecrowaveRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.apache.meecrowave.junit5.MeecrowaveConfig; +import org.apache.meecrowave.testing.ConfigurationInject; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtensionContext; +@MeecrowaveConfig(scanningPackageIncludes = "org.apache.camel.websocket.jsr356.JSR356ConsumerTest$") public class JSR356ConsumerTest extends CamelTestSupport { - @Rule - public final MeecrowaveRule servlet = new MeecrowaveRule(new Meecrowave.Builder() { - { - randomHttpPort(); - setScanningPackageIncludes("org.apache.camel.websocket.jsr356.JSR356ConsumerTest$"); - } - }, ""); - @Rule - public final TestName testName = new TestName(); + @ConfigurationInject + protected Meecrowave.Builder configuration; + + protected String testMethodName; + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + super.beforeEach(context); + testMethodName = context.getRequiredTestMethod().getName(); + } @Test public void ensureClientModeReceiveProperlyExchanges() throws Exception { - final String message = ExistingServerEndpoint.class.getName() + "#" + testName.getMethodName(); - final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testName.getMethodName()); + final String message = ExistingServerEndpoint.class.getName() + "#" + testMethodName; + final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testMethodName); mockEndpoint.expectedBodiesReceived(message); ExistingServerEndpoint.doSend(); // to avoid lifecycle issue during // startup we send the message @@ -65,8 +67,8 @@ public class JSR356ConsumerTest extends CamelTestSupport { @Test public void ensureServerModeReceiveProperlyExchanges() throws Exception { - final String message = getClass().getName() + "#" + testName.getMethodName(); - final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testName.getMethodName()); + final String message = getClass().getName() + "#" + testMethodName; + final MockEndpoint mockEndpoint = getMockEndpoint("mock:" + testMethodName); mockEndpoint.expectedBodiesReceived(message); final WebSocketContainer container = ContainerProvider.getWebSocketContainer(); @@ -75,7 +77,7 @@ public class JSR356ConsumerTest extends CamelTestSupport { public void onOpen(final Session session, final EndpointConfig config) { // no-op } - }, ClientEndpointConfig.Builder.create().build(), URI.create("ws://localhost:" + servlet.getConfiguration().getHttpPort() + "/test")); + }, ClientEndpointConfig.Builder.create().build(), URI.create("ws://localhost:" + configuration.getHttpPort() + "/test")); session.getBasicRemote().sendText(message); session.close(new CloseReason(CloseReason.CloseCodes.GOING_AWAY, "bye")); @@ -86,9 +88,10 @@ public class JSR356ConsumerTest extends CamelTestSupport { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - from("websocket-jsr356:///test?sessionCount=5").id("camel_consumer_acts_as_server").convertBodyTo(String.class).to("mock:ensureServerModeReceiveProperlyExchanges"); + from("websocket-jsr356:///test?sessionCount=5").id("camel_consumer_acts_as_server").convertBodyTo(String.class) + .to("mock:ensureServerModeReceiveProperlyExchanges"); - from("websocket-jsr356://ws://localhost:" + servlet.getConfiguration().getHttpPort() + "/existingserver?sessionCount=5").id("camel_consumer_acts_as_client") + from("websocket-jsr356://ws://localhost:" + configuration.getHttpPort() + "/existingserver?sessionCount=5").id("camel_consumer_acts_as_client") .convertBodyTo(String.class).to("mock:ensureClientModeReceiveProperlyExchanges"); } }; diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java index c370e8e..35a4f40 100644 --- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java +++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/JSR356ProducerTest.java @@ -26,34 +26,37 @@ import javax.websocket.server.ServerEndpoint; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.meecrowave.Meecrowave; -import org.apache.meecrowave.junit.MeecrowaveRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.apache.meecrowave.junit5.MeecrowaveConfig; +import org.apache.meecrowave.testing.ConfigurationInject; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtensionContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + +@MeecrowaveConfig(scanningPackageIncludes = "org.apache.camel.websocket.jsr356.JSR356ProducerTest$") public class JSR356ProducerTest extends CamelTestSupport { private static LinkedBlockingQueue<String> messages = new LinkedBlockingQueue<>(); - @Rule - public final MeecrowaveRule servlet = new MeecrowaveRule(new Meecrowave.Builder() { - { - randomHttpPort(); - setScanningPackageIncludes("org.apache.camel.websocket.jsr356.JSR356ProducerTest$"); - } - }, ""); + @ConfigurationInject + protected Meecrowave.Builder configuration; - @Rule - public final TestName testName = new TestName(); + protected String testMethodName; @Produce("direct:ensureServerModeSendsProperly") private ProducerTemplate serverProducer; + @Override + public void beforeEach(ExtensionContext context) throws Exception { + super.beforeEach(context); + testMethodName = context.getRequiredTestMethod().getName(); + } + @Test public void ensureServerModeSendsProperly() throws Exception { - final String body = getClass().getName() + "#" + testName.getMethodName(); + final String body = getClass().getName() + "#" + testMethodName; serverProducer.sendBody(body); assertEquals(body, messages.poll(10, TimeUnit.SECONDS)); } @@ -63,7 +66,7 @@ public class JSR356ProducerTest extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:ensureServerModeSendsProperly").id("camel_consumer_acts_as_client").convertBodyTo(String.class) - .to("websocket-jsr356://ws://localhost:" + servlet.getConfiguration().getHttpPort() + "/existingserver?sessionCount=5"); + .to("websocket-jsr356://ws://localhost:" + configuration.getHttpPort() + "/existingserver?sessionCount=5"); } }; } diff --git a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java index cd0ca46..5ca6301 100644 --- a/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java +++ b/components/camel-websocket-jsr356/src/test/java/org/apache/camel/websocket/jsr356/ServerEndpointDeploymentStrategyTest.java @@ -36,21 +36,19 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.meecrowave.Meecrowave; -import org.apache.meecrowave.junit.MeecrowaveRule; -import org.junit.Rule; -import org.junit.Test; +import org.apache.meecrowave.junit5.MeecrowaveConfig; +import org.apache.meecrowave.testing.ConfigurationInject; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +@MeecrowaveConfig(scanningPackageIncludes = "org.apache.camel.websocket.jsr356.ServerEndpointDeploymentStrategyTest$") public class ServerEndpointDeploymentStrategyTest extends CamelTestSupport { - @Rule - public final MeecrowaveRule servlet = new MeecrowaveRule(new Meecrowave.Builder() { - { - randomHttpPort(); - setScanningPackageIncludes("org.apache.camel.websocket.jsr356.ServerEndpointDeploymentStrategyTest$"); - } - }, ""); + @ConfigurationInject + Meecrowave.Builder configuration; @Test public void customDeploymentStrategyTest() throws Exception { @@ -111,7 +109,6 @@ public class ServerEndpointDeploymentStrategyTest extends CamelTestSupport { } private URI getEndpointURI(String path) throws URISyntaxException { - Meecrowave.Builder configuration = servlet.getConfiguration(); return new URI(String.format("ws://%s:%d/%s", configuration.getHost(), configuration.getHttpPort(), path)); }
