This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit c197fbc53422e69006ddfa9397c8a28eea0d0cd6 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Sat Jan 24 19:46:24 2026 +0000 CAMEL-21196: modernize exception-based assertions in camel-undertow Replace try-catch-fail patterns with assertThrows in all test files. Modernizes exception handling assertions to use JUnit 5 best practices. Files changed: - SecurityProviderHttpHandlerTest.java - SecurityProviderNoAcceptanceTest.java - SecurityProviderRolesFromComponentTest.java - SecurityProviderTest.java - SecurityProviderWithoutProviderTest.java - RestUndertowMethodNotAllowedTest.java - RestUndertowHttpBindingModeXmlTest.java - UndertowSuspendResumeTest.java - UndertowError500Test.java - UndertowHandlersSpringTest.java - UndertowHttp2Test.java - UndertowPrefixMatchingTest.java - DefaultUndertowHttpBindingTest.java - UndertowConsumerUnregisterTest.java --- .../undertow/DefaultUndertowHttpBindingTest.java | 3 +-- .../undertow/UndertowConsumerUnregisterTest.java | 13 +++++------- .../component/undertow/UndertowError500Test.java | 10 +++------ .../undertow/UndertowHandlersSpringTest.java | 17 +++++---------- .../component/undertow/UndertowHttp2Test.java | 14 ++++--------- .../undertow/UndertowPrefixMatchingTest.java | 13 +++++------- .../undertow/UndertowSuspendResumeTest.java | 12 ++++------- .../rest/RestUndertowHttpBindingModeXmlTest.java | 9 ++------ .../rest/RestUndertowMethodNotAllowedTest.java | 24 ++++++++-------------- .../spi/SecurityProviderHttpHandlerTest.java | 15 +++++--------- .../spi/SecurityProviderNoAcceptanceTest.java | 15 +++++--------- .../SecurityProviderRolesFromComponentTest.java | 15 +++++--------- .../undertow/spi/SecurityProviderTest.java | 15 +++++--------- .../spi/SecurityProviderWithoutProviderTest.java | 15 +++++--------- 14 files changed, 63 insertions(+), 127 deletions(-) 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 3e19e1a13087..5171562f576b 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 @@ -31,7 +31,6 @@ import org.xnio.channels.EmptyStreamSourceChannel; import org.xnio.channels.StreamSourceChannel; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; public class DefaultUndertowHttpBindingTest { @@ -100,7 +99,7 @@ public class DefaultUndertowHttpBindingTest { @Override public int read(ByteBuffer dst) { if (mustWait) { - fail("must wait before reading"); + throw new AssertionError("must wait before reading"); } if (chunk < delayedPayloads.length) { byte[] delayedPayload = delayedPayloads[chunk].getBytes(); 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 d36f66353f58..2033d7b27225 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 @@ -26,8 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; public class UndertowConsumerUnregisterTest extends BaseUndertowTest { @@ -42,13 +42,10 @@ public class UndertowConsumerUnregisterTest extends BaseUndertowTest { component.unregisterEndpoint(consumerBar, consumerBar.getEndpoint().getHttpHandlerRegistrationInfo(), consumerBar.getEndpoint().getSslContext()); - try { - template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class); - fail("Expected exception when connecting to undertow endpoint"); - } catch (CamelExecutionException e) { - // Expected because unregistering all consumers should shut down the Undertow server - assertTrue(e.getExchange().getException() instanceof ConnectException); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class)); + // Expected because unregistering all consumers should shut down the Undertow server + assertTrue(e.getExchange().getException() instanceof ConnectException); } @Test 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 5f9d20ac870d..3333e52b1812 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 @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; public class UndertowError500Test extends BaseUndertowTest { @@ -30,12 +30,8 @@ public class UndertowError500Test extends BaseUndertowTest { public void testHttp500Error() throws Exception { getMockEndpoint("mock:input").expectedBodiesReceived("Hello World"); - try { - template.requestBody("http://localhost:{{port}}/foo";, "Hello World", String.class); - fail("Should have failed"); - } catch (CamelExecutionException e) { - - } + assertThrows(CamelExecutionException.class, + () -> template.requestBody("http://localhost:{{port}}/foo";, "Hello World", String.class)); MockEndpoint.assertIsSatisfied(context); } 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 10327cc5ca4c..e49a2fcab0e4 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 @@ -34,7 +34,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; @ExtendWith(SpringExtension.class) @ContextConfiguration(locations = { "/HandlersSpringTest.xml" }) @@ -76,19 +76,12 @@ public class UndertowHandlersSpringTest { mockEndpoint.expectedBodiesReceived("Hello World"); // username:password is guest:secret String auth = "Basic Z3Vlc3Q6c2Vjc"; - try { + CamelExecutionException e = assertThrows(CamelExecutionException.class, () -> { String out = template.requestBodyAndHeader("undertow:http://localhost:"; + port + "/spring", "Hello World", "Authorization", auth, String.class); - fail("Should send back 401"); - assertEquals("Bye World", out); - - mockEndpoint.assertIsSatisfied(); - - } catch (CamelExecutionException e) { - HttpOperationFailedException cause = (HttpOperationFailedException) e.getCause(); - assertEquals(401, cause.getStatusCode()); - } - + }); + HttpOperationFailedException cause = (HttpOperationFailedException) e.getCause(); + assertEquals(401, cause.getStatusCode()); } public Integer getPort() { diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttp2Test.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttp2Test.java index e3ed785b985e..cb2127104d46 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttp2Test.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttp2Test.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; public class UndertowHttp2Test extends BaseUndertowTest { private static final Logger LOG = LoggerFactory.getLogger(UndertowHttp2Test.class); @@ -41,16 +40,11 @@ public class UndertowHttp2Test extends BaseUndertowTest { final HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP2(http2Client)); httpClient.start(); - try { - final ContentResponse resp = httpClient.GET("http://localhost:"; + getPort() + "/myapp"); + final ContentResponse resp = httpClient.GET("http://localhost:"; + getPort() + "/myapp"); - assertEquals(200, resp.getStatus()); - assertEquals(HttpVersion.HTTP_2, resp.getVersion()); - assertEquals(RESPONSE, new String(resp.getContent())); - } catch (Exception ex) { - LOG.error(ex.getMessage(), ex); - fail("HTTP2 endpoint not exposed!, maybe it's not supported?"); - } + assertEquals(200, resp.getStatus()); + assertEquals(HttpVersion.HTTP_2, resp.getVersion()); + assertEquals(RESPONSE, new String(resp.getContent())); } @Override 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 5d9bd49e7191..bc27dc676dd0 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 @@ -24,7 +24,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; public class UndertowPrefixMatchingTest extends BaseUndertowTest { @@ -36,13 +36,10 @@ public class UndertowPrefixMatchingTest extends BaseUndertowTest { @Test public void failsOnPrefixPath() { - try { - template.requestBody("http://localhost:{{port}}/myapp";, "Hello Camel!"); - fail("Should fail, something is wrong"); - } catch (CamelExecutionException ex) { - HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause()); - assertEquals(404, cause.getStatusCode()); - } + CamelExecutionException ex = assertThrows(CamelExecutionException.class, + () -> template.requestBody("http://localhost:{{port}}/myapp";, "Hello Camel!")); + HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause()); + assertEquals(404, cause.getStatusCode()); } @Test 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 fd39bde0c78c..1321a2e8f907 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 @@ -23,7 +23,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; public class UndertowSuspendResumeTest extends BaseUndertowTest { @@ -43,13 +43,9 @@ public class UndertowSuspendResumeTest extends BaseUndertowTest { // suspend consumer.suspend(); - try { - template.requestBody(serverUri, "Moon", String.class); - fail("Should throw exception"); - } catch (Exception e) { - HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(503, cause.getStatusCode()); - } + Exception e = assertThrows(Exception.class, () -> template.requestBody(serverUri, "Moon", String.class)); + HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(503, cause.getStatusCode()); // resume consumer.resume(); 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 b450283b0e97..086e93492d66 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 @@ -24,7 +24,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; public class RestUndertowHttpBindingModeXmlTest extends BaseUndertowTest { @@ -52,12 +52,7 @@ public class RestUndertowHttpBindingModeXmlTest extends BaseUndertowTest { // we bind to xml, but send in json, which is not possible String body = "{\"id\": 123, \"name\": \"Donald Duck\"}"; - try { - template.sendBody("http://localhost:"; + getPort() + "/users/new", body); - fail("Should have thrown exception"); - } catch (Exception e) { - // expected - } + assertThrows(Exception.class, () -> template.sendBody("http://localhost:"; + getPort() + "/users/new", body)); MockEndpoint.assertIsSatisfied(context); } 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 2ad8527c12fa..e1da3f17df74 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 @@ -24,30 +24,24 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; public class RestUndertowMethodNotAllowedTest extends BaseUndertowTest { @Test public void testPostMethodNotAllowed() { - try { - template.sendBodyAndHeader("http://localhost:"; + getPort() + "/users/123/basic", "body", Exchange.HTTP_METHOD, - "POST"); - fail("Shall not pass!"); - } catch (Exception e) { - HttpOperationFailedException hofe = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(405, hofe.getStatusCode()); - } + Exception e = assertThrows(Exception.class, + () -> template.sendBodyAndHeader("http://localhost:"; + getPort() + "/users/123/basic", "body", + Exchange.HTTP_METHOD, + "POST")); + HttpOperationFailedException hofe = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(405, hofe.getStatusCode()); } @Test public void testGetMethodAllowed() { - try { - template.sendBodyAndHeader("http://localhost:"; + getPort() + "/users/123/basic", "body", Exchange.HTTP_METHOD, - "GET"); - } catch (Exception e) { - fail("Shall pass with GET http method!"); - } + template.sendBodyAndHeader("http://localhost:"; + getPort() + "/users/123/basic", "body", Exchange.HTTP_METHOD, + "GET"); } @Override 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 ae96a6ab4f92..58a9994adeb4 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 @@ -24,7 +24,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Basic tests with securityProvider, tests whether securityProvider allows or denies access. @@ -42,14 +42,9 @@ public class SecurityProviderHttpHandlerTest extends AbstractSecurityProviderTes public void testNullHttpHandler() { securityConfiguration.setRoleToAssign("user"); - try { - template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class); - - fail("Should throw exception"); - - } catch (CamelExecutionException e) { - HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(StatusCodes.METHOD_NOT_ALLOWED, he.getStatusCode()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class)); + HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(StatusCodes.METHOD_NOT_ALLOWED, he.getStatusCode()); } } 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 c81eb154bd11..c5669be6798c 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 @@ -25,7 +25,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Test of basic securityProvider scenario, when provider does not accepts security configuration. @@ -45,14 +45,9 @@ public class SecurityProviderNoAcceptanceTest extends AbstractSecurityProviderTe getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET"); - try { - template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class); - - fail("Should throw exception"); - - } catch (CamelExecutionException e) { - HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class)); + HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); } } 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 41813e4aa6a5..fab257909369 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 @@ -28,7 +28,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests whether security provider parameters defined in component are used. @@ -62,15 +62,10 @@ public class SecurityProviderRolesFromComponentTest extends AbstractSecurityProv getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET"); - try { - template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class); - - fail("Should throw exception"); - - } catch (CamelExecutionException e) { - HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class)); + HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); } @Override 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 95dcf632cb5f..e10d9c0fefc1 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 @@ -25,7 +25,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Basic tests with securityProvider, tests whether securityProvider allows or denies access. @@ -51,15 +51,10 @@ public class SecurityProviderTest extends AbstractSecurityProviderTest { getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET"); - try { - template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class); - - fail("Should throw exception"); - - } catch (CamelExecutionException e) { - HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class)); + HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); } } 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 a986c8169b1e..6009a971a47e 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 @@ -28,7 +28,7 @@ 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; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Test of basic securityProvider scenario, when provider does not accepts security configuration. @@ -50,14 +50,9 @@ public class SecurityProviderWithoutProviderTest extends AbstractSecurityProvide getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET"); - try { - template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class); - - fail("Should throw exception"); - - } catch (CamelExecutionException e) { - HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); - assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.requestBody("undertow:http://localhost:{{port}}/foo";, null, String.class)); + HttpOperationFailedException he = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause()); + assertEquals(StatusCodes.FORBIDDEN, he.getStatusCode()); } }
