You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/06/11 22:16:03 UTC
[camel] 03/16: [CAMEL-11807] Upgrade camel-undertow to junit5
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 8da62ff037d1f4e0781dc0d1f0ba5e6868afe0ad
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jun 11 14:24:55 2020 +0200
[CAMEL-11807] Upgrade camel-undertow to junit5
---
components/camel-undertow/pom.xml | 8 +--
.../camel/component/undertow/BaseUndertowTest.java | 8 ++-
.../undertow/DefaultUndertowHttpBindingTest.java | 19 +++---
.../component/undertow/MultiPartFormTest.java | 21 ++++---
.../PreservePostFormUrlEncodedBodyTest.java | 5 +-
.../component/undertow/UndertowComponentTest.java | 5 +-
.../UndertowComponentVerifierExtensionTest.java | 28 +++++----
.../undertow/UndertowComponentVerifierTest.java | 28 +++++----
.../undertow/UndertowConsumerUnregisterTest.java | 23 ++++---
.../component/undertow/UndertowEndpointTest.java | 10 +--
.../component/undertow/UndertowError500Test.java | 4 +-
.../undertow/UndertowHandlersSpringTest.java | 22 ++++---
.../component/undertow/UndertowHeaderTest.java | 4 +-
.../undertow/UndertowHttpProducerSessionTest.java | 8 +--
.../undertow/UndertowHttpProducerTest.java | 4 +-
.../UndertowHttpProxyPreserveHostTest.java | 5 +-
.../undertow/UndertowHttpStreamCachingTest.java | 4 +-
.../undertow/UndertowHttpStreamingTest.java | 4 +-
.../undertow/UndertowHttpsSpringTest.java | 20 +++---
.../undertow/UndertowMethodRestricTest.java | 10 +--
.../undertow/UndertowMuteExceptionTest.java | 18 +++---
.../undertow/UndertowNoAutoStartupTest.java | 2 +-
.../undertow/UndertowPrefixMatchingTest.java | 6 +-
.../undertow/UndertowProducerLeakTest.java | 2 +-
.../component/undertow/UndertowProducerTest.java | 4 +-
...ndertowProducerThrowExceptionOnFailureTest.java | 6 +-
.../undertow/UndertowSendDynamicAwareTest.java | 7 ++-
.../component/undertow/UndertowSharedPortTest.java | 5 +-
.../undertow/UndertowSuspendResumeTest.java | 7 ++-
.../undertow/UndertowSwitchingStatus204Test.java | 6 +-
.../undertow/UndertowTransferExceptionTest.java | 12 ++--
.../cloud/UndertowServiceCallRouteTest.java | 14 +++--
.../undertow/handlers/CamelRootHandlerTest.java | 27 ++++----
.../undertow/rest/RestApiUndertowTest.java | 9 ++-
.../camel/component/undertow/rest/RestGetTest.java | 4 +-
.../rest/RestUndertowComponentVerifierTest.java | 30 ++++-----
...estUndertowHttpBindingModeAutoWithJsonTest.java | 5 +-
...RestUndertowHttpBindingModeAutoWithXmlTest.java | 5 +-
.../rest/RestUndertowHttpBindingModeJsonTest.java | 6 +-
...ndertowHttpBindingModeJsonWithContractTest.java | 8 ++-
...UndertowHttpBindingModeOffWithContractTest.java | 8 ++-
.../rest/RestUndertowHttpBindingModeXmlTest.java | 6 +-
...stUndertowHttpContextPathConfigurationTest.java | 4 +-
.../RestUndertowHttpContextPathMatchGetTest.java | 4 +-
.../undertow/rest/RestUndertowHttpGetCorsTest.java | 4 +-
.../rest/RestUndertowHttpGetOrderingIssueTest.java | 4 +-
.../undertow/rest/RestUndertowHttpGetTest.java | 4 +-
.../rest/RestUndertowHttpGetWildcardsTest.java | 4 +-
.../rest/RestUndertowHttpMultipleVerbsTest.java | 2 +-
.../undertow/rest/RestUndertowHttpOptionsTest.java | 4 +-
.../rest/RestUndertowHttpPojoInOutTest.java | 5 +-
.../rest/RestUndertowHttpPojoTypeTest.java | 6 +-
.../rest/RestUndertowHttpPostJsonJaxbPojoTest.java | 5 +-
.../rest/RestUndertowHttpPostJsonPojoListTest.java | 5 +-
.../rest/RestUndertowHttpPostJsonPojoTest.java | 5 +-
.../rest/RestUndertowHttpPostXmlJaxbPojoTest.java | 5 +-
.../rest/RestUndertowMethodNotAllowedTest.java | 6 +-
.../rest/RestUndertowProducerGetPojoTest.java | 6 +-
.../undertow/rest/RestUndertowProducerGetTest.java | 4 +-
.../RestUndertowProducerGetUriParameterTest.java | 4 +-
.../rest/RestUndertowProducerPatchTest.java | 2 +-
.../undertow/rest/RestUndertowProducerPutTest.java | 2 +-
...estUndertowProducerThrowExceptionErrorTest.java | 8 ++-
.../RestUndertowProducerVerbUpperCaseTest.java | 4 +-
.../rest/RestUndertowVerbEnableCorsTest.java | 4 +-
.../undertow/rest/RestUndertowVerbTest.java | 4 +-
.../rest/UndertowHttpEmptyQueryParameterTest.java | 4 +-
.../undertow/spi/AbstractSecurityProviderTest.java | 4 +-
.../undertow/spi/ProviderWithServletTest.java | 14 +++--
.../undertow/spi/ProviderWithoutServletTest.java | 14 +++--
.../spi/SecurityProviderHttpHandlerTest.java | 6 +-
.../spi/SecurityProviderNoAcceptanceTest.java | 6 +-
.../SecurityProviderRolesFromComponentTest.java | 9 ++-
.../undertow/spi/SecurityProviderTest.java | 9 ++-
.../spi/SecurityProviderWithoutProviderTest.java | 10 ++-
.../undertow/ws/UndertowWsConsumerRouteTest.java | 73 +++++++++++-----------
.../ws/UndertowWsProducerRouteRestartTest.java | 11 +++-
.../undertow/ws/UndertowWsProducerRouteTest.java | 11 +++-
.../undertow/ws/UndertowWsTwoRoutesTest.java | 13 +++-
...TwoRoutesToSameEndpointSendToAllHeaderTest.java | 10 ++-
.../ws/UndertowWsTwoRoutesToSameEndpointTest.java | 10 ++-
.../undertow/ws/UndertowWssRouteTest.java | 19 ++++--
82 files changed, 494 insertions(+), 271 deletions(-)
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 9014505..9aa72e3 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -64,12 +64,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -109,8 +109,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
index 17c2c63..b2a6440 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
@@ -22,8 +22,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class of tests which allocates ports
@@ -34,7 +36,7 @@ public class BaseUndertowTest extends CamelTestSupport {
private static volatile int port2;
private final AtomicInteger counter = new AtomicInteger(1);
- @BeforeClass
+ @BeforeAll
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
port2 = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/DefaultUndertowHttpBindingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/DefaultUndertowHttpBindingTest.java
index a1b1116..24b6292 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/DefaultUndertowHttpBindingTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/DefaultUndertowHttpBindingTest.java
@@ -24,18 +24,19 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.xnio.XnioIoThread;
import org.xnio.channels.EmptyStreamSourceChannel;
import org.xnio.channels.StreamSourceChannel;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class DefaultUndertowHttpBindingTest {
- @Test(timeout = 1000)
+ @Test
+ @Timeout(1)
public void readEntireDelayedPayload() throws Exception {
String[] delayedPayloads = new String[] {
"",
@@ -50,7 +51,7 @@ public class DefaultUndertowHttpBindingTest {
checkResult(result, delayedPayloads);
}
- @Test(timeout = 1000)
+ @Timeout(1)
public void readEntireMultiDelayedPayload() throws Exception {
String[] delayedPayloads = new String[] {
"",
@@ -67,12 +68,10 @@ public class DefaultUndertowHttpBindingTest {
}
private void checkResult(String result, String[] delayedPayloads) {
- assertThat(result, is(
- Stream.of(delayedPayloads)
- .collect(Collectors.joining())));
+ assertEquals(Stream.of(delayedPayloads).collect(Collectors.joining()), result);
}
- @Test(timeout = 1000)
+ @Timeout(1)
public void readEntireMultiDelayedWithPausePayload() throws Exception {
String[] delayedPayloads = new String[] {
"",
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java
index 5458e99..42a46fd 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/MultiPartFormTest.java
@@ -29,7 +29,11 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.impl.client.HttpClientBuilder;
-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 MultiPartFormTest extends BaseUndertowTest {
@@ -49,16 +53,16 @@ public class MultiPartFormTest extends BaseUndertowTest {
HttpResponse response = client.execute(post);
int status = response.getStatusLine().getStatusCode();
- assertEquals("Get a wrong response status", 200, status);
+ assertEquals(200, status, "Get a wrong response status");
String result = IOHelper.loadText(response.getEntity().getContent()).trim();
- assertEquals("Get a wrong result", "A binary file of some kind", result);
+ assertEquals("A binary file of some kind", result, "Get a wrong result");
}
@Test
public void testSendMultiPartFormFromCamelHttpComponnent() throws Exception {
String result = template.requestBody("http://localhost:" + getPort() + "/test", createMultipartRequestEntity(), String.class);
- assertEquals("Get a wrong result", "A binary file of some kind", result);
+ assertEquals("A binary file of some kind", result, "Get a wrong result");
}
@Override
@@ -67,15 +71,14 @@ public class MultiPartFormTest extends BaseUndertowTest {
public void configure() throws Exception {
from("undertow://http://localhost:{{port}}/test").process(exchange -> {
AttachmentMessage in = exchange.getIn(AttachmentMessage.class);
- assertEquals("Get a wrong attachement size", 1, in.getAttachments().size());
+ assertEquals(1, in.getAttachments().size(), "Get a wrong attachement size");
// The file name is attachment id
DataHandler data = in.getAttachment("log4j2.properties");
- assertNotNull("Should get the DataHandler log4j2.properties", data);
- assertEquals("Got the wrong name", "log4j2.properties", data.getName());
+ assertNotNull(data, "Should get the DataHandler log4j2.properties");
+ assertEquals("log4j2.properties", data.getName(), "Got the wrong name");
- assertTrue("We should get the data from the DataHandler", data.getDataSource()
- .getInputStream().available() > 0);
+ assertTrue(data.getDataSource().getInputStream().available() > 0, "We should get the data from the DataHandler");
// form data should also be available as a body
Map body = in.getBody(Map.class);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java
index cbd61c3..0b86c90 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java
@@ -21,7 +21,10 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpMethods;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class PreservePostFormUrlEncodedBodyTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java
index 63594b5..a6d667d 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java
@@ -19,10 +19,13 @@ package org.apache.camel.component.undertow;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class UndertowComponentTest extends BaseUndertowTest {
private static final Logger LOG = LoggerFactory.getLogger(UndertowComponentTest.class);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java
index 606f0a6..74554f1 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierExtensionTest.java
@@ -23,8 +23,10 @@ import java.util.Map;
import org.apache.camel.Component;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UndertowComponentVerifierExtensionTest extends BaseUndertowTest {
@Test
@@ -38,7 +40,7 @@ public class UndertowComponentVerifierExtensionTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -51,11 +53,11 @@ public class UndertowComponentVerifierExtensionTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.MISSING_PARAMETER, result.getErrors().get(0).getCode());
- Assert.assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
- Assert.assertTrue(result.getErrors().get(0).getParameterKeys().contains("httpURI"));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.MISSING_PARAMETER, result.getErrors().get(0).getCode());
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertTrue(result.getErrors().get(0).getParameterKeys().contains("httpURI"));
}
@Test
@@ -69,7 +71,7 @@ public class UndertowComponentVerifierExtensionTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -82,13 +84,13 @@ public class UndertowComponentVerifierExtensionTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
ComponentVerifierExtension.VerificationError error = result.getErrors().get(0);
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, error.getCode());
- Assert.assertTrue(error.getDetail(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof UnknownHostException);
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, error.getCode());
+ assertTrue(error.getDetail(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof UnknownHostException);
}
@Override
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java
index 9ef541b..a549fcd 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentVerifierTest.java
@@ -22,8 +22,10 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UndertowComponentVerifierTest extends BaseUndertowTest {
@Test
@@ -37,7 +39,7 @@ public class UndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -50,11 +52,11 @@ public class UndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.MISSING_PARAMETER, result.getErrors().get(0).getCode());
- Assert.assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
- Assert.assertTrue(result.getErrors().get(0).getParameterKeys().contains("httpURI"));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.MISSING_PARAMETER, result.getErrors().get(0).getCode());
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertTrue(result.getErrors().get(0).getParameterKeys().contains("httpURI"));
}
@Test
@@ -68,7 +70,7 @@ public class UndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -81,13 +83,13 @@ public class UndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
ComponentVerifierExtension.VerificationError error = result.getErrors().get(0);
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, error.getCode());
- Assert.assertTrue(error.getDetail(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof UnknownHostException);
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.EXCEPTION, error.getCode());
+ assertTrue(error.getDetail(ComponentVerifierExtension.VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE) instanceof UnknownHostException);
}
@Override
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowConsumerUnregisterTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowConsumerUnregisterTest.java
index 10e6a2c..d44fffe 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowConsumerUnregisterTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowConsumerUnregisterTest.java
@@ -23,8 +23,11 @@ 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.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class UndertowConsumerUnregisterTest extends BaseUndertowTest {
@@ -59,24 +62,24 @@ public class UndertowConsumerUnregisterTest extends BaseUndertowTest {
}
};
Exchange ret = template.request("undertow:http://localhost:{{port}}/foo", sender);
- Assert.assertEquals(200, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
- Assert.assertEquals("test", ret.getMessage().getBody(String.class));
+ assertEquals(200, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
+ assertEquals("test", ret.getMessage().getBody(String.class));
ret = template.request("undertow:http://localhost:{{port}}/bar", sender);
- Assert.assertEquals(200, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
- Assert.assertEquals("test", ret.getMessage().getBody(String.class));
+ assertEquals(200, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
+ assertEquals("test", ret.getMessage().getBody(String.class));
UndertowComponent component = context.getComponent("undertow", UndertowComponent.class);
UndertowConsumer consumerFoo = (UndertowConsumer) context.getRoute("route-foo").getConsumer();
component.unregisterEndpoint(consumerFoo, consumerFoo.getEndpoint().getHttpHandlerRegistrationInfo(), consumerFoo.getEndpoint().getSslContext());
ret = template.request("undertow:http://localhost:{{port}}/foo", sender);
- Assert.assertEquals(404, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
- Assert.assertEquals("No matching path found", ret.getMessage().getBody(String.class));
+ assertEquals(404, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
+ assertEquals("No matching path found", ret.getMessage().getBody(String.class));
ret = template.request("undertow:http://localhost:{{port}}/bar", sender);
- Assert.assertEquals(200, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
- Assert.assertEquals("test", ret.getMessage().getBody(String.class));
+ assertEquals(200, ret.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
+ assertEquals("test", ret.getMessage().getBody(String.class));
mockFoo.assertIsSatisfied();
mockBar.assertIsSatisfied();
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowEndpointTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowEndpointTest.java
index 945a3af..8f96829 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowEndpointTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowEndpointTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.undertow;
import java.net.URI;
import java.net.URISyntaxException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class UndertowEndpointTest {
@@ -32,7 +34,7 @@ public class UndertowEndpointTest {
final URI withoutSlash = URI.create("http://0.0.0.0:8080");
- @Before
+ @BeforeEach
public void createEndpoint() throws URISyntaxException {
endpoint = new UndertowEndpoint(null, null);
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowError500Test.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowError500Test.java
index acfa5e0..21eeb9e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowError500Test.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowError500Test.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.undertow;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
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 UndertowError500Test extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHandlersSpringTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHandlersSpringTest.java
index 4958b46..b119125 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHandlersSpringTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHandlersSpringTest.java
@@ -26,17 +26,19 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
-@RunWith(SpringJUnit4ClassRunner.class)
+
+
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(locations = {"/HandlersSpringTest.xml"})
public class UndertowHandlersSpringTest {
@@ -48,13 +50,13 @@ public class UndertowHandlersSpringTest {
@EndpointInject("mock:input")
private MockEndpoint mockEndpoint;
- @BeforeClass
+ @BeforeAll
public static void setUpJaas() throws Exception {
URL trustStoreUrl = UndertowHttpsSpringTest.class.getClassLoader().getResource("ssl/keystore.jks");
System.setProperty("javax.net.ssl.trustStore", trustStoreUrl.toURI().getPath());
}
- @AfterClass
+ @AfterAll
public static void tearDownJaas() throws Exception {
System.clearProperty("java.security.auth.login.config");
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHeaderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHeaderTest.java
index 3bdce7c..dd0b03b 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHeaderTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow;
import org.apache.camel.Exchange;
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 UndertowHeaderTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
index 2d61e9e..664e775 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
@@ -24,9 +24,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.cookie.ExchangeCookieHandler;
import org.apache.camel.http.base.cookie.InstanceCookieHandler;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class UndertowHttpProducerSessionTest extends CamelTestSupport {
private static volatile int port;
@@ -37,7 +37,7 @@ public class UndertowHttpProducerSessionTest extends CamelTestSupport {
@BindToRegistry("exchangeCookieHandler")
private ExchangeCookieHandler exchangeCookieHandler = new ExchangeCookieHandler();
- @BeforeClass
+ @BeforeAll
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerTest.java
index 082b906..ed3bd10 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow;
import org.apache.camel.Exchange;
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 UndertowHttpProducerTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProxyPreserveHostTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProxyPreserveHostTest.java
index ae504fc..6b9b246 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProxyPreserveHostTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProxyPreserveHostTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.undertow;
import io.undertow.util.Headers;
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.assertNotEquals;
public class UndertowHttpProxyPreserveHostTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamCachingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamCachingTest.java
index f064504..e880b41 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamCachingTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamCachingTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.undertow;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpMethods;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UndertowHttpStreamCachingTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
index 685b4b0..39038ff 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpStreamingTest.java
@@ -31,7 +31,9 @@ import java.util.stream.LongStream;
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 UndertowHttpStreamingTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java
index 4ea5732..2041cf8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpsSpringTest.java
@@ -24,16 +24,18 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(SpringJUnit4ClassRunner.class)
+
+
+@ExtendWith(SpringExtension.class)
@ContextConfiguration(locations = {"/SpringTest.xml"})
public class UndertowHttpsSpringTest {
@@ -45,13 +47,13 @@ public class UndertowHttpsSpringTest {
@EndpointInject("mock:input")
private MockEndpoint mockEndpoint;
- @BeforeClass
+ @BeforeAll
public static void setUpJaas() throws Exception {
URL trustStoreUrl = UndertowHttpsSpringTest.class.getClassLoader().getResource("ssl/keystore.jks");
System.setProperty("javax.net.ssl.trustStore", trustStoreUrl.toURI().getPath());
}
- @AfterClass
+ @AfterAll
public static void tearDownJaas() throws Exception {
System.clearProperty("java.security.auth.login.config");
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMethodRestricTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMethodRestricTest.java
index 905177e..bbd754e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMethodRestricTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMethodRestricTest.java
@@ -25,14 +25,16 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UndertowMethodRestricTest extends BaseUndertowTest {
private static String url;
- @BeforeClass
+ @BeforeAll
public static void init() {
url = "http://localhost:" + getPort() + "/methodRestrict";
}
@@ -61,7 +63,7 @@ public class UndertowMethodRestricTest extends BaseUndertowTest {
HttpResponse response = client.execute(httpGet);
int status = response.getStatusLine().getStatusCode();
- assertEquals("Get a wrong response status", 405, status);
+ assertEquals(405, status, "Get a wrong response status");
client.close();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java
index 4c45d18..7d638ea 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowMuteExceptionTest.java
@@ -22,8 +22,10 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class UndertowMuteExceptionTest extends BaseUndertowTest {
@@ -36,9 +38,9 @@ public class UndertowMuteExceptionTest extends BaseUndertowTest {
HttpResponse response = client.execute(get);
String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
- Assert.assertNotNull(responseString);
- Assert.assertEquals("Exception", responseString);
- Assert.assertEquals(500, response.getStatusLine().getStatusCode());
+ assertNotNull(responseString);
+ assertEquals("Exception", responseString);
+ assertEquals(500, response.getStatusLine().getStatusCode());
client.close();
}
@@ -53,10 +55,10 @@ public class UndertowMuteExceptionTest extends BaseUndertowTest {
HttpResponse response = client.execute(get);
String responseString = EntityUtils.toString(response.getEntity(), "UTF-8");
- Assert.assertNotNull(responseString);
- Assert.assertEquals("Exception", responseString);
+ assertNotNull(responseString);
+ assertEquals("Exception", responseString);
- Assert.assertEquals(500, response.getStatusLine().getStatusCode());
+ assertEquals(500, response.getStatusLine().getStatusCode());
client.close();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowNoAutoStartupTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowNoAutoStartupTest.java
index 2ab3b0b..4a736e7 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowNoAutoStartupTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowNoAutoStartupTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.undertow;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class UndertowNoAutoStartupTest extends BaseUndertowTest {
@Test
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java
index 2c3708b..583a5e5 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowPrefixMatchingTest.java
@@ -20,7 +20,11 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.common.HttpOperationFailedException;
-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;
public class UndertowPrefixMatchingTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java
index d2cd919..2023334 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerLeakTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.undertow;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class UndertowProducerLeakTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerTest.java
index e086559..292fe7d 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerTest.java
@@ -21,7 +21,9 @@ import java.io.InputStream;
import org.apache.camel.Exchange;
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 UndertowProducerTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
index 1e7fb3f..58aed6e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowProducerThrowExceptionOnFailureTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.model.rest.RestBindingMode;
-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;
public class UndertowProducerThrowExceptionOnFailureTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSendDynamicAwareTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSendDynamicAwareTest.java
index 6cf7a12..d369aad 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSendDynamicAwareTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSendDynamicAwareTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.undertow;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UndertowSendDynamicAwareTest extends BaseUndertowTest {
@@ -32,7 +35,7 @@ public class UndertowSendDynamicAwareTest extends BaseUndertowTest {
// and there should only be one http endpoint as they are both on same host
boolean found = context.getEndpointMap().containsKey("undertow://http://localhost:" + getPort() + "?throwExceptionOnFailure=false");
- assertTrue("Should find static uri", found);
+ assertTrue(found, "Should find static uri");
// we only have 2xdirect and 2xundertow
assertEquals(4, context.getEndpointMap().size());
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java
index 5dc7743..7ad6df4 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java
@@ -19,10 +19,13 @@ package org.apache.camel.component.undertow;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class UndertowSharedPortTest extends BaseUndertowTest {
private static final Logger LOG = LoggerFactory.getLogger(UndertowSharedPortTest.class);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java
index b06e9ba..d7131a7 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSuspendResumeTest.java
@@ -18,7 +18,12 @@ package org.apache.camel.component.undertow;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class UndertowSuspendResumeTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSwitchingStatus204Test.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSwitchingStatus204Test.java
index a6f20e9..856d5d3 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSwitchingStatus204Test.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSwitchingStatus204Test.java
@@ -25,7 +25,11 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
-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;
public class UndertowSwitchingStatus204Test extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
index f52e5c4..cf14bba 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowTransferExceptionTest.java
@@ -24,8 +24,10 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class UndertowTransferExceptionTest extends BaseUndertowTest {
@@ -39,9 +41,9 @@ public class UndertowTransferExceptionTest extends BaseUndertowTest {
ObjectInputStream in = new ObjectInputStream(response.getEntity().getContent());
IllegalArgumentException e = (IllegalArgumentException)in.readObject();
- Assert.assertNotNull(e);
- Assert.assertEquals(500, response.getStatusLine().getStatusCode());
- Assert.assertEquals("Camel cannot do this", e.getMessage());
+ assertNotNull(e);
+ assertEquals(500, response.getStatusLine().getStatusCode());
+ assertEquals("Camel cannot do this", e.getMessage());
client.close();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java
index 1fc9089..142ce8e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java
@@ -20,22 +20,24 @@ import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-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;
public class UndertowServiceCallRouteTest extends CamelTestSupport {
@Test
public void testCustomCall() throws Exception {
- Assert.assertEquals("8081", template.requestBody("direct:custom", "hello", String.class));
- Assert.assertEquals("8082", template.requestBody("direct:custom", "hello", String.class));
+ assertEquals("8081", template.requestBody("direct:custom", "hello", String.class));
+ assertEquals("8082", template.requestBody("direct:custom", "hello", String.class));
}
@Test
public void testDefaultSchema() throws Exception {
try {
- Assert.assertEquals("8081", template.requestBody("direct:default", "hello", String.class));
+ assertEquals("8081", template.requestBody("direct:default", "hello", String.class));
} catch (RuntimeCamelException e) {
assertTrue(e.getCause() instanceof ResolveEndpointFailedException);
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/handlers/CamelRootHandlerTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/handlers/CamelRootHandlerTest.java
index c653eed..1bf07f1 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/handlers/CamelRootHandlerTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/handlers/CamelRootHandlerTest.java
@@ -18,8 +18,11 @@ package org.apache.camel.component.undertow.handlers;
import io.undertow.server.HttpHandler;
import io.undertow.server.handlers.RedirectHandler;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class CamelRootHandlerTest {
@@ -32,25 +35,25 @@ public class CamelRootHandlerTest {
final RedirectHandler httpHandler = new RedirectHandler("http://whereever");
- Assert.assertTrue(root.isEmpty());
+ assertTrue(root.isEmpty());
root.add("/app1", null, false, httpHandler);
- Assert.assertFalse(root.isEmpty());
+ assertFalse(root.isEmpty());
try {
root.add("/app1", null, false, new CamelWebSocketHandler());
- Assert.fail(IllegalArgumentException.class.getName() + " expected");
+ fail(IllegalArgumentException.class.getName() + " expected");
} catch (IllegalArgumentException expected) {
}
root.remove("/app1", null, false);
- Assert.assertTrue(root.isEmpty());
+ assertTrue(root.isEmpty());
/* now the other way round: register wsHandler and try to register httpHandler for the same path */
root.add("/app2", null, false, new CamelWebSocketHandler());
try {
root.add("/app2", null, false, httpHandler);
- Assert.fail(IllegalArgumentException.class.getName() + " expected");
+ fail(IllegalArgumentException.class.getName() + " expected");
} catch (IllegalArgumentException expected) {
}
@@ -60,20 +63,20 @@ public class CamelRootHandlerTest {
public void countWsHandlerInstances() {
final CamelRootHandler root = new CamelRootHandler(DEFAULT_HANDLER);
- Assert.assertTrue(root.isEmpty());
+ assertTrue(root.isEmpty());
root.add("/app1", null, false, new CamelWebSocketHandler());
- Assert.assertFalse(root.isEmpty());
+ assertFalse(root.isEmpty());
/* registering twice must work */
root.add("/app1", null, false, new CamelWebSocketHandler());
- Assert.assertFalse(root.isEmpty());
+ assertFalse(root.isEmpty());
/* we have to remove twice for the root to become empty */
root.remove("/app1", null, false);
- Assert.assertFalse(root.isEmpty());
+ assertFalse(root.isEmpty());
root.remove("/app1", null, false);
- Assert.assertTrue(root.isEmpty());
+ assertTrue(root.isEmpty());
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestApiUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestApiUndertowTest.java
index 2908a0e..e1d2c2a 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestApiUndertowTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestApiUndertowTest.java
@@ -19,10 +19,13 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestParamType;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Does not run well on CI due test uses JMX mbeans")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Disabled("Does not run well on CI due test uses JMX mbeans")
public class RestApiUndertowTest extends BaseUndertowTest {
@Override
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
index 24d2f77..3671cb5 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestGetTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java
index dae7d6b..63201c2 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java
@@ -23,8 +23,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.component.rest.RestComponent;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RestUndertowComponentVerifierTest extends BaseUndertowTest {
@Test
@@ -40,7 +42,7 @@ public class RestUndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Test
@@ -59,11 +61,11 @@ public class RestUndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.MISSING_PARAMETER, result.getErrors().get(0).getCode());
- Assert.assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
- Assert.assertTrue(result.getErrors().get(0).getParameterKeys().contains("method"));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.MISSING_PARAMETER, result.getErrors().get(0).getCode());
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertTrue(result.getErrors().get(0).getParameterKeys().contains("method"));
}
@Test
@@ -83,11 +85,11 @@ public class RestUndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
- Assert.assertEquals(1, result.getErrors().size());
- Assert.assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.UNKNOWN_PARAMETER, result.getErrors().get(0).getCode());
- Assert.assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
- Assert.assertTrue(result.getErrors().get(0).getParameterKeys().contains("nonExistingOption"));
+ assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+ assertEquals(1, result.getErrors().size());
+ assertEquals(ComponentVerifierExtension.VerificationError.StandardCode.UNKNOWN_PARAMETER, result.getErrors().get(0).getCode());
+ assertEquals(1, result.getErrors().get(0).getParameterKeys().size());
+ assertTrue(result.getErrors().get(0).getParameterKeys().contains("nonExistingOption"));
}
@Test
@@ -103,7 +105,7 @@ public class RestUndertowComponentVerifierTest extends BaseUndertowTest {
ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
- Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+ assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
@Override
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithJsonTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithJsonTest.java
index 77c2ef0..59cb636 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithJsonTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithJsonTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpBindingModeAutoWithJsonTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithXmlTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithXmlTest.java
index 645428d..cfe0d79 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithXmlTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeAutoWithXmlTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpBindingModeAutoWithXmlTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonTest.java
index f8f212a..25c8696 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonTest.java
@@ -21,7 +21,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-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.fail;
public class RestUndertowHttpBindingModeJsonTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java
index 5da43e2..48e6856 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-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 RestUndertowHttpBindingModeJsonWithContractTest extends BaseUndertowTest {
@@ -36,7 +40,7 @@ public class RestUndertowHttpBindingModeJsonWithContractTest extends BaseUnderto
Object answer = template.requestBody("undertow:http://localhost:{{port}}/users/new", body);
assertNotNull(answer);
String answerString = new String((byte[])answer);
- assertTrue("Unexpected response: " + answerString, answerString.contains("\"active\":true"));
+ assertTrue(answerString.contains("\"active\":true"), "Unexpected response: " + answerString);
assertMockEndpointsSatisfied();
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java
index 514ba89..0762de4 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java
@@ -23,7 +23,11 @@ import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.dataformat.JsonDataFormat;
import org.apache.camel.model.dataformat.JsonLibrary;
import org.apache.camel.model.rest.RestBindingMode;
-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 RestUndertowHttpBindingModeOffWithContractTest extends BaseUndertowTest {
@@ -37,7 +41,7 @@ public class RestUndertowHttpBindingModeOffWithContractTest extends BaseUndertow
Object answer = template.requestBodyAndHeader("undertow:http://localhost:{{port}}/users/new", body, Exchange.CONTENT_TYPE, "application/json");
assertNotNull(answer);
String answerString = new String((byte[])answer);
- assertTrue("Unexpected response: " + answerString, answerString.contains("\"active\":true"));
+ assertTrue(answerString.contains("\"active\":true"), "Unexpected response: " + answerString);
assertMockEndpointsSatisfied();
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeXmlTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeXmlTest.java
index 9772cf2..b19f097 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeXmlTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeXmlTest.java
@@ -20,7 +20,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-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.fail;
public class RestUndertowHttpBindingModeXmlTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java
index e9ba184..939263e 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpContextPathConfigurationTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java
index 805cafd..59b66bd 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpContextPathMatchGetTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
index 27c03c2..79f03ab 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.spi.RestConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpGetCorsTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
index 9f1f916..588cdcb 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpGetOrderingIssueTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
index 2992f48..5a8fe0ae 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpGetTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
index 9fba51b..faaae22 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java
@@ -21,7 +21,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.component.undertow.DefaultUndertowHttpBinding;
import org.apache.camel.component.undertow.UndertowHttpBinding;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpGetWildcardsTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
index 3633cbf..2641e51 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RestUndertowHttpMultipleVerbsTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpOptionsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpOptionsTest.java
index 93a16d2..666da57 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpOptionsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpOptionsTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowHttpOptionsTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java
index 54dc729..43a0b1d 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java
@@ -19,7 +19,10 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpPojoInOutTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
index a160e39..da8d930 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java
@@ -29,7 +29,11 @@ import org.apache.camel.model.Model;
import org.apache.camel.model.rest.RestBindingMode;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.VerbDefinition;
-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 RestUndertowHttpPojoTypeTest extends BaseUndertowTest {
private final ObjectMapper mapper = new ObjectMapper();
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonJaxbPojoTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonJaxbPojoTest.java
index e1c15ff..c2ef079 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonJaxbPojoTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonJaxbPojoTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpPostJsonJaxbPojoTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoListTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoListTest.java
index 5b32b5d..4b3a446 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoListTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoListTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpPostJsonPojoListTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoTest.java
index 3e76bf9..a8117b2 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostJsonPojoTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpPostJsonPojoTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostXmlJaxbPojoTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostXmlJaxbPojoTest.java
index 8221024..15c9a92 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostXmlJaxbPojoTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPostXmlJaxbPojoTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowHttpPostXmlJaxbPojoTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java
index 5905340..2b30baf 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java
@@ -20,7 +20,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.http.common.HttpOperationFailedException;
-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;
public class RestUndertowMethodNotAllowedTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java
index dfb41a0..86b4289 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetPojoTest.java
@@ -22,7 +22,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.model.rest.RestBindingMode;
import org.apache.camel.spi.BeanIntrospection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RestUndertowProducerGetPojoTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java
index faac8bb..bd09b80 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowProducerGetTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java
index 2ccb862..f03c51d 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowProducerGetUriParameterTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPatchTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPatchTest.java
index 4c03fe8..02f4cdc 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPatchTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPatchTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RestUndertowProducerPatchTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPutTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPutTest.java
index b70a035..48385f3 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPutTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerPutTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RestUndertowProducerPutTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java
index dc716aa..cfe61d7 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-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;
public class RestUndertowProducerThrowExceptionErrorTest extends BaseUndertowTest {
@@ -33,7 +37,7 @@ public class RestUndertowProducerThrowExceptionErrorTest extends BaseUndertowTes
public void testUndertowProducerFail() throws Exception {
Exchange out = fluentTemplate.withHeader("id", "777").to("direct:start").request(Exchange.class);
assertNotNull(out);
- assertFalse("Should not have thrown exception", out.isFailed());
+ assertFalse(out.isFailed(), "Should not have thrown exception");
assertEquals(500, out.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE));
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java
index a63c76a..4dc576c 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowProducerVerbUpperCaseTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java
index 6788c4a..52ba515 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowVerbEnableCorsTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java
index b696597..585ed56 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestUndertowVerbTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
index 635c2db..93d9fbc 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/UndertowHttpEmptyQueryParameterTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.undertow.rest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UndertowHttpEmptyQueryParameterTest extends BaseUndertowTest {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java
index 030a374..fe0b4a0 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/AbstractSecurityProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.BaseUndertowTest;
import org.apache.camel.component.undertow.UndertowComponent;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
/**
* Abstract parent for test involving securityProvider.
@@ -127,7 +127,7 @@ public abstract class AbstractSecurityProviderTest extends BaseUndertowTest {
return camelContext;
}
- @BeforeClass
+ @BeforeAll
public static void createSecurtyProviderConfigurationFile() throws Exception {
URL location = MockSecurityProvider.class.getProtectionDomain().getCodeSource().getLocation();
File file = new File(location.getPath() + "META-INF/services/" + UndertowSecurityProvider.class.getName());
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java
index e04638d..306d55c 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithServletTest.java
@@ -18,9 +18,11 @@ package org.apache.camel.component.undertow.spi;
import io.undertow.servlet.handlers.ServletRequestContext;
import org.apache.camel.Exchange;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test for case that UndertowSecurityProvider.requireServletContext returns true.
@@ -37,11 +39,11 @@ public class ProviderWithServletTest extends AbstractProviderServletTest {
@Override
void assertServletContext(ServletRequestContext servletRequestContext) {
- Assert.assertNotNull(servletRequestContext);
+ assertNotNull(servletRequestContext);
}
}
- @BeforeClass
+ @BeforeAll
public static void initProvider() throws Exception {
createSecurtyProviderConfigurationFile(org.apache.camel.component.undertow.spi.ProviderWithServletTest.MockSecurityProvider.class);
}
@@ -52,7 +54,7 @@ public class ProviderWithServletTest extends AbstractProviderServletTest {
String out = template.requestBody("undertow:http://localhost:{{port}}/foo", null, String.class);
- Assert.assertEquals("user", out);
+ assertEquals("user", out);
assertMockEndpointsSatisfied();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithoutServletTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithoutServletTest.java
index 782a871..b5f8d07 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithoutServletTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/ProviderWithoutServletTest.java
@@ -18,9 +18,11 @@ package org.apache.camel.component.undertow.spi;
import io.undertow.servlet.handlers.ServletRequestContext;
import org.apache.camel.Exchange;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test for case that UndertowSecurityProvider.requireServletContext returns false.
@@ -37,11 +39,11 @@ public class ProviderWithoutServletTest extends AbstractProviderServletTest {
@Override
void assertServletContext(ServletRequestContext servletRequestContext) {
- Assert.assertNull(servletRequestContext);
+ assertNull(servletRequestContext);
}
}
- @BeforeClass
+ @BeforeAll
public static void initProvider() throws Exception {
createSecurtyProviderConfigurationFile(MockSecurityProvider.class);
}
@@ -52,7 +54,7 @@ public class ProviderWithoutServletTest extends AbstractProviderServletTest {
String out = template.requestBody("undertow:http://localhost:{{port}}/foo", null, String.class);
- Assert.assertEquals("user", out);
+ assertEquals("user", out);
assertMockEndpointsSatisfied();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java
index 53ec272..27f079f 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderHttpHandlerTest.java
@@ -20,7 +20,11 @@ import io.undertow.util.StatusCodes;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.http.base.HttpOperationFailedException;
-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;
/**
* Basic tests with securityProvider, tests whether securityProvider allows or denies access.
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java
index 45d0d96..324fa0d 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderNoAcceptanceTest.java
@@ -21,7 +21,11 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.http.base.HttpOperationFailedException;
-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;
/**
* Test of basic securityProvider scenario, when provider does not accepts security configuration.
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java
index 028ab1d..d2a9821 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderRolesFromComponentTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.undertow.UndertowComponent;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.Assert;
-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;
/**
* Tests whether security provider parameters defined in component are used.
@@ -47,7 +50,7 @@ public class SecurityProviderRolesFromComponentTest extends AbstractSecurityProv
String out = template.requestBody("undertow:http://localhost:{{port}}/foo", null, String.class);
- Assert.assertEquals("user", out);
+ assertEquals("user", out);
assertMockEndpointsSatisfied();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java
index 71b87ab..668f2e1 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderTest.java
@@ -20,8 +20,11 @@ import io.undertow.util.StatusCodes;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.Assert;
-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;
/**
* Basic tests with securityProvider, tests whether securityProvider allows or denies access.
@@ -37,7 +40,7 @@ public class SecurityProviderTest extends AbstractSecurityProviderTest {
String out = template.requestBody("undertow:http://localhost:{{port}}/foo", null, String.class);
- Assert.assertEquals("user", out);
+ assertEquals("user", out);
assertMockEndpointsSatisfied();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java
index 849806a..50222e4 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/spi/SecurityProviderWithoutProviderTest.java
@@ -23,15 +23,19 @@ import io.undertow.util.StatusCodes;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.http.base.HttpOperationFailedException;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+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;
/**
* Test of basic securityProvider scenario, when provider does not accepts security configuration.
*/
public class SecurityProviderWithoutProviderTest extends AbstractSecurityProviderTest {
- @BeforeClass
+ @BeforeAll
public static void createSecurtyProviderConfigurationFile() throws Exception {
URL location = MockSecurityProvider.class.getProtectionDomain().getCodeSource().getLocation();
File file = new File(location.getPath() + "META-INF/services/" + UndertowSecurityProvider.class.getName());
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
index 8b2bb5c..9861aca 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsConsumerRouteTest.java
@@ -45,8 +45,12 @@ import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+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 UndertowWsConsumerRouteTest extends BaseUndertowTest {
@@ -126,13 +130,13 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
result.await(60, TimeUnit.SECONDS);
List<Exchange> exchanges = result.getReceivedExchanges();
- Assert.assertEquals(1, exchanges.size());
+ assertEquals(1, exchanges.size());
Exchange exchange = result.getReceivedExchanges().get(0);
assertNotNull(exchange.getIn().getHeader(UndertowConstants.CHANNEL));
Object body = exchange.getIn().getBody();
- Assert.assertTrue("body is " + body.getClass().getName(), body instanceof Reader);
+ assertTrue(body instanceof Reader, "body is " + body.getClass().getName());
Reader r = (Reader) body;
- Assert.assertEquals("Test", IOConverter.toString(r));
+ assertEquals("Test", IOConverter.toString(r));
websocket.sendCloseFrame();
c.close();
@@ -211,13 +215,13 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
result.await(60, TimeUnit.SECONDS);
List<Exchange> exchanges = result.getReceivedExchanges();
- Assert.assertEquals(1, exchanges.size());
+ assertEquals(1, exchanges.size());
Exchange exchange = result.getReceivedExchanges().get(0);
assertNotNull(exchange.getIn().getHeader(UndertowConstants.CHANNEL));
Object body = exchange.getIn().getBody();
- Assert.assertTrue("body is " + body.getClass().getName(), body instanceof InputStream);
+ assertTrue(body instanceof InputStream, "body is " + body.getClass().getName());
InputStream in = (InputStream) body;
- Assert.assertArrayEquals(testmessage, IOConverter.toBytes(in));
+ assertArrayEquals(testmessage, IOConverter.toBytes(in));
websocket.sendCloseFrame();
c.close();
@@ -286,7 +290,7 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
Set<String> actual = new HashSet<>();
actual.add(exchanges.get(0).getIn().getBody(String.class));
actual.add(exchanges.get(1).getIn().getBody(String.class));
- Assert.assertEquals(new HashSet<>(Arrays.asList("Test1", "Test2")), actual);
+ assertEquals(new HashSet<>(Arrays.asList("Test1", "Test2")), actual);
websocket1.sendCloseFrame();
websocket2.sendCloseFrame();
@@ -302,9 +306,9 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
wsclient1.sendTextMessage("Test1");
wsclient1.sendTextMessage("Test2");
- Assert.assertTrue(wsclient1.await(10));
+ assertTrue(wsclient1.await(10));
- Assert.assertEquals(Arrays.asList("Test1", "Test2"), wsclient1.getReceived(String.class));
+ assertEquals(Arrays.asList("Test1", "Test2"), wsclient1.getReceived(String.class));
wsclient1.close();
}
@@ -319,11 +323,11 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
wsclient1.sendTextMessage("Gambas");
wsclient2.sendTextMessage("Calamares");
- Assert.assertTrue(wsclient1.await(10));
- Assert.assertTrue(wsclient2.await(10));
+ assertTrue(wsclient1.await(10));
+ assertTrue(wsclient2.await(10));
- Assert.assertEquals(Arrays.asList("Gambas"), wsclient1.getReceived(String.class));
- Assert.assertEquals(Arrays.asList("Calamares"), wsclient2.getReceived(String.class));
+ assertEquals(Arrays.asList("Gambas"), wsclient1.getReceived(String.class));
+ assertEquals(Arrays.asList("Calamares"), wsclient2.getReceived(String.class));
wsclient1.close();
wsclient2.close();
@@ -339,19 +343,19 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
wsclient1.sendTextMessage("Gambas");
wsclient2.sendTextMessage("Calamares");
- Assert.assertTrue(wsclient1.await(10));
- Assert.assertTrue(wsclient2.await(10));
+ assertTrue(wsclient1.await(10));
+ assertTrue(wsclient2.await(10));
List<String> received1 = wsclient1.getReceived(String.class);
- Assert.assertEquals(2, received1.size());
+ assertEquals(2, received1.size());
- Assert.assertTrue(received1.contains("Gambas"));
- Assert.assertTrue(received1.contains("Calamares"));
+ assertTrue(received1.contains("Gambas"));
+ assertTrue(received1.contains("Calamares"));
List<String> received2 = wsclient2.getReceived(String.class);
- Assert.assertEquals(2, received2.size());
- Assert.assertTrue(received2.contains("Gambas"));
- Assert.assertTrue(received2.contains("Calamares"));
+ assertEquals(2, received2.size());
+ assertTrue(received2.contains("Gambas"));
+ assertTrue(received2.contains("Calamares"));
wsclient1.close();
wsclient2.close();
@@ -381,12 +385,12 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
for (Exchange exchange : exchanges) {
final Message in = exchange.getIn();
final String key = (String) in.getHeader(UndertowConstants.CONNECTION_KEY);
- Assert.assertNotNull(key);
+ assertNotNull(key);
final WebSocketChannel channel = in.getHeader(UndertowConstants.CHANNEL, WebSocketChannel.class);
- Assert.assertNotNull(channel);
+ assertNotNull(channel);
if (in.getHeader(UndertowConstants.EVENT_TYPE_ENUM, EventType.class) == EventType.ONOPEN) {
final WebSocketHttpExchange transportExchange = in.getHeader(UndertowConstants.EXCHANGE, WebSocketHttpExchange.class);
- Assert.assertNotNull(transportExchange);
+ assertNotNull(transportExchange);
}
List<String> messages = connections.get(key);
if (messages == null) {
@@ -404,12 +408,12 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
final List<String> expected1 = Arrays.asList(EventType.ONOPEN.name(), "Gambas", EventType.ONCLOSE.name());
final List<String> expected2 = Arrays.asList(EventType.ONOPEN.name(), "Calamares", EventType.ONCLOSE.name());
- Assert.assertEquals(2, connections.size());
+ assertEquals(2, connections.size());
final Iterator<List<String>> it = connections.values().iterator();
final List<String> actual1 = it.next();
- Assert.assertTrue("actual " + actual1, actual1.equals(expected1) || actual1.equals(expected2));
+ assertTrue(actual1.equals(expected1) || actual1.equals(expected2), "actual " + actual1);
final List<String> actual2 = it.next();
- Assert.assertTrue("actual " + actual2, actual2.equals(expected1) || actual2.equals(expected2));
+ assertTrue(actual2.equals(expected1) || actual2.equals(expected2), "actual " + actual2);
}
@@ -425,7 +429,7 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
wsclient1.await(10);
final String connectionKey1 = assertConnected(wsclient1);
- Assert.assertNotNull(connectionKey1);
+ assertNotNull(connectionKey1);
wsclient2.await(10);
final String connectionKey2 = assertConnected(wsclient2);
wsclient3.await(10);
@@ -439,11 +443,11 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
wsclient1.sendTextMessage("private"); // this one should go to wsclient1 only
wsclient2.await(10);
- Assert.assertEquals(broadcastMsg, wsclient2.getReceived(String.class).get(0));
+ assertEquals(broadcastMsg, wsclient2.getReceived(String.class).get(0));
wsclient3.await(10);
- Assert.assertEquals(broadcastMsg, wsclient3.getReceived(String.class).get(0));
+ assertEquals(broadcastMsg, wsclient3.getReceived(String.class).get(0));
wsclient1.await(10);
- Assert.assertEquals("private", wsclient1.getReceived(String.class).get(0));
+ assertEquals("private", wsclient1.getReceived(String.class).get(0));
wsclient1.close();
wsclient2.close();
@@ -453,8 +457,7 @@ public class UndertowWsConsumerRouteTest extends BaseUndertowTest {
private String assertConnected(TestClient wsclient1) {
final String msg0 = wsclient1.getReceived(String.class).get(0);
- Assert.assertTrue("'" + msg0 + "' should start with '" + CONNECTED_PREFIX + "'",
- msg0.startsWith(CONNECTED_PREFIX));
+ assertTrue(msg0.startsWith(CONNECTED_PREFIX), "'" + msg0 + "' should start with '" + CONNECTED_PREFIX + "'");
return msg0.substring(CONNECTED_PREFIX.length());
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
index ffd10a1..c4b04b6 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteRestartTest.java
@@ -31,10 +31,17 @@ import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.assertTrue;
public class UndertowWsProducerRouteRestartTest extends BaseUndertowTest {
+ private static final Logger LOG = LoggerFactory.getLogger(UndertowWsProducerRouteRestartTest.class);
+
private static final String ROUTE_ID = UndertowWsProducerRouteRestartTest.class.getSimpleName();
@Produce("direct:shop")
@@ -73,7 +80,7 @@ public class UndertowWsProducerRouteRestartTest extends BaseUndertowTest {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
index 7fa9a54..971d24c 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsProducerRouteTest.java
@@ -32,10 +32,17 @@ import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.assertTrue;
public class UndertowWsProducerRouteTest extends BaseUndertowTest {
+ private static final Logger LOG = LoggerFactory.getLogger(UndertowWsProducerRouteTest.class);
+
@Produce("direct:shop")
private ProducerTemplate producer;
@@ -52,7 +59,7 @@ public class UndertowWsProducerRouteTest extends BaseUndertowTest {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
index fc97e99..51915c4 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesTest.java
@@ -28,10 +28,17 @@ import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.assertTrue;
public class UndertowWsTwoRoutesTest extends BaseUndertowTest {
+ private static final Logger LOG = LoggerFactory.getLogger(UndertowWsTwoRoutesTest.class);
+
@Test
public void testWSHttpCallEcho() throws Exception {
@@ -46,7 +53,7 @@ public class UndertowWsTwoRoutesTest extends BaseUndertowTest {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}
@@ -86,7 +93,7 @@ public class UndertowWsTwoRoutesTest extends BaseUndertowTest {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
index bb241aa..dd36db0 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.java
@@ -28,10 +28,16 @@ import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.assertTrue;
public class UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest extends BaseUndertowTest {
+ private static final Logger LOG = LoggerFactory.getLogger(UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest.class);
@Test
public void testWSHttpCallEcho() throws Exception {
@@ -48,7 +54,7 @@ public class UndertowWsTwoRoutesToSameEndpointSendToAllHeaderTest extends BaseUn
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
index 706d6f9..8aa200b 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWsTwoRoutesToSameEndpointTest.java
@@ -27,10 +27,16 @@ import org.asynchttpclient.DefaultAsyncHttpClient;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-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.assertTrue;
public class UndertowWsTwoRoutesToSameEndpointTest extends BaseUndertowTest {
+ private static final Logger LOG = LoggerFactory.getLogger(UndertowWsTwoRoutesToSameEndpointTest.class);
@Test
public void testWSHttpCallEcho() throws Exception {
@@ -47,7 +53,7 @@ public class UndertowWsTwoRoutesToSameEndpointTest extends BaseUndertowTest {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
index a3aa405..632d5b4 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/ws/UndertowWssRouteTest.java
@@ -45,19 +45,26 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+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 UndertowWssRouteTest extends BaseUndertowTest {
- @BeforeClass
+ private static final Logger LOG = LoggerFactory.getLogger(UndertowWssRouteTest.class);
+
+ @BeforeAll
public static void setUpJaas() throws Exception {
URL trustStoreUrl = UndertowHttpsSpringTest.class.getClassLoader().getResource("ssl/keystore.jks");
System.setProperty("javax.net.ssl.trustStore", trustStoreUrl.toURI().getPath());
}
- @AfterClass
+ @AfterAll
public static void tearDownJaas() throws Exception {
System.clearProperty("java.security.auth.login.config");
}
@@ -123,7 +130,7 @@ public class UndertowWssRouteTest extends BaseUndertowTest {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
received.add(message);
- log.info("received --> " + message);
+ LOG.info("received --> " + message);
latch.countDown();
}