diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java index 6a50ea39f07d7..02610b2de2f35 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java @@ -24,7 +24,7 @@ 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 DavidSiefertTest extends ContextTestSupport { protected static final Object expectedBody = "Some Output"; @@ -40,16 +40,15 @@ public void testWorks() throws Exception { } @Test - public void testHeaderPredicateFails() throws Exception { + public void testHeaderPredicateFails() { MockEndpoint result = getMockEndpoint("mock:result"); result.message(0).header("sample.name").isEqualTo("shouldNotMatch"); template.sendBody("direct:start", "value"); - try { - result.assertIsSatisfied(); - fail("Should have failed this test!"); - } catch (AssertionError e) { - log.info("Caught expected assertion failure: {}", e, e); - } + + AssertionError e = assertThrows(AssertionError.class, result::assertIsSatisfied, + "Should have failed this test!"); + + log.info("Caught expected assertion failure: {}", e, e); } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java index 8ca3a1f9866d3..1def5acf0b489 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/MockExpectedHeaderNoMessageSentTest.java @@ -22,23 +22,21 @@ import org.junit.jupiter.api.Test; 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 MockExpectedHeaderNoMessageSentTest extends ContextTestSupport { @Test - public void testHeaderExpectedNoMessageSent() throws Exception { + public void testHeaderExpectedNoMessageSent() { MockEndpoint mock = getMockEndpoint("mock:result"); mock.setResultWaitTime(100); // run test quick mock.expectedHeaderReceived("foo", "bar"); - try { - mock.assertIsSatisfied(); - fail("Should fail"); - } catch (AssertionError e) { - assertEquals("mock://result Received message count 0, expected at least 1", e.getMessage()); - } + AssertionError e = assertThrows(AssertionError.class, mock::assertIsSatisfied, + "Should fail"); + + assertEquals("mock://result Received message count 0, expected at least 1", e.getMessage()); } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java index 510c999347f8b..d038def5c33a1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.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.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @@ -37,13 +37,12 @@ public void testOnExceptionErrorHandlerRef() throws Exception { getMockEndpoint("mock:handled").expectedMessageCount(1); getMockEndpoint("mock:dead").expectedMessageCount(0); - try { - template.sendBody("direct:start", "Hello World"); - fail("Should have thrown exception"); - } catch (CamelExecutionException e) { - IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Damn", cause.getMessage()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello World"), + "Should have thrown exception"); + + IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Damn", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java index ed636c073b41e..74174a6db7ff5 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.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.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @@ -37,13 +37,12 @@ public void testOnExceptionErrorHandlerRef() throws Exception { getMockEndpoint("mock:handled").expectedMessageCount(1); getMockEndpoint("mock:dead").expectedMessageCount(0); - try { - template.sendBody("direct:start", "Hello World"); - fail("Should have thrown exception"); - } catch (CamelExecutionException e) { - IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Damn", cause.getMessage()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello World"), + "Should have thrown exception"); + + IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Damn", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java index 914f708e2a5af..c55c69f601f00 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.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.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @@ -37,13 +37,12 @@ public void testOnExceptionErrorHandlerRef() throws Exception { getMockEndpoint("mock:handled").expectedMessageCount(1); getMockEndpoint("mock:dead").expectedMessageCount(0); - try { - template.sendBody("direct:start", "Hello World"); - fail("Should have thrown exception"); - } catch (CamelExecutionException e) { - IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Damn", cause.getMessage()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello World"), + "Should have thrown exception"); + + IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Damn", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java index 8856e49136b10..08a96e193b359 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.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.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @@ -37,13 +37,12 @@ public void testOnExceptionErrorHandlerRef() throws Exception { getMockEndpoint("mock:handled").expectedMessageCount(1); getMockEndpoint("mock:dead").expectedMessageCount(0); - try { - template.sendBody("direct:start", "Hello World"); - fail("Should have thrown exception"); - } catch (CamelExecutionException e) { - IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Damn", cause.getMessage()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello World"), + "Should have thrown exception"); + + IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Damn", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListShareUnitOfWorkOnExceptionHandledFalseIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListShareUnitOfWorkOnExceptionHandledFalseIssueTest.java index 4f494c603e1f9..e97bc9d0c1e5a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListShareUnitOfWorkOnExceptionHandledFalseIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/RecipientListShareUnitOfWorkOnExceptionHandledFalseIssueTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; 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 RecipientListShareUnitOfWorkOnExceptionHandledFalseIssueTest extends ContextTestSupport { @@ -32,13 +32,12 @@ public void testRecipientList() throws Exception { getMockEndpoint("mock:c").expectedMessageCount(1); getMockEndpoint("mock:result").expectedMessageCount(0); - try { - template.sendBodyAndHeader("direct:start", "Hello World", "foo", "direct:b,direct:c"); - fail("Should throw exception"); - } catch (Exception e) { - IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause()); - assertEquals("Forced", cause.getMessage()); - } + Exception e = assertThrows(Exception.class, + () -> template.sendBodyAndHeader("direct:start", "Hello World", "foo", "direct:b,direct:c"), + "Should throw exception"); + + IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause()); + assertEquals("Forced", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java index da60796d5821d..e4d75a834940f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/RomeksExceptionTest.java @@ -50,14 +50,13 @@ protected void assertErrorHandlingWorks(String route) throws Exception { resultEndpoint.expectedMessageCount(0); exceptionEndpoint.expectedBodiesReceived(""); - try { - template.sendBodyAndHeader("direct:start", "", "route", route); - fail("Should have thrown exception"); - } catch (RuntimeCamelException e) { - boolean b = e.getCause() instanceof IllegalArgumentException; - assertTrue(b); - assertEquals("Exception thrown intentionally.", e.getCause().getMessage()); - } + RuntimeCamelException e = assertThrows(RuntimeCamelException.class, + () -> template.sendBodyAndHeader("direct:start", "", "route", route), + "Should have thrown exception"); + + boolean b = e.getCause() instanceof IllegalArgumentException; + assertTrue(b); + assertEquals("Exception thrown intentionally.", e.getCause().getMessage()); assertMockEndpointsSatisfied(); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java index 6077ae3362a8b..d7f9a78c59345 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedErrorHandlerAndOnExceptionTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Based on user forum issue @@ -51,13 +51,12 @@ public void configure() { // we fail all redeliveries so after that we send to mock:exhausted getMockEndpoint("mock:exhausted").expectedMessageCount(1); - try { - template.sendBody("direct:start", "Hello World"); - fail("Should thrown an exception"); - } catch (CamelExecutionException e) { - ConnectException cause = assertIsInstanceOf(ConnectException.class, e.getCause()); - assertEquals("Forced", cause.getMessage()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello World"), + "Should thrown an exception"); + + ConnectException cause = assertIsInstanceOf(ConnectException.class, e.getCause()); + assertEquals("Forced", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java index 8d642c0b86ebf..cba289e14f0b4 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionWithInterceptSendToEndpointIssueTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Based on user forum issue @@ -50,13 +50,12 @@ public void configure() { // we fail all redeliveries so after that we send to mock:exhausted getMockEndpoint("mock:exhausted").expectedMessageCount(1); - try { - template.sendBody("direct:start", "Hello World"); - fail("Should thrown an exception"); - } catch (CamelExecutionException e) { - ConnectException cause = assertIsInstanceOf(ConnectException.class, e.getCause()); - assertEquals("Forced", cause.getMessage()); - } + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello World"), + "Should thrown an exception"); + + ConnectException cause = assertIsInstanceOf(ConnectException.class, e.getCause()); + assertEquals("Forced", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java index 10db59417d2d7..7becb3b6bd49b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/RouteStartupFailShouldStopAlsoIssueTest.java @@ -59,11 +59,7 @@ public void configure() { } }); - try { - context.start(); - } catch (Exception e) { - // should fail - } + assertThrows(Exception.class, () -> context.start(), "Should fail"); assertTrue(context.getRouteController().getRouteStatus("foo").isStopped()); assertFalse(context.getRouteController().getRouteStatus("foo").isStarted()); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitShareUnitOfWorkOnExceptionHandledFalseIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitShareUnitOfWorkOnExceptionHandledFalseIssueTest.java index 7127ede2bf8a1..ef38e5e161bd7 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitShareUnitOfWorkOnExceptionHandledFalseIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitShareUnitOfWorkOnExceptionHandledFalseIssueTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; 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 SplitShareUnitOfWorkOnExceptionHandledFalseIssueTest extends ContextTestSupport { @@ -31,13 +31,11 @@ public void testSplit() throws Exception { getMockEndpoint("mock:b").expectedMessageCount(2); getMockEndpoint("mock:result").expectedMessageCount(0); - try { - template.sendBody("direct:start", "Camel,Donkey"); - fail("Should throw exception"); - } catch (Exception e) { - IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause()); - assertEquals("Forced", cause.getMessage()); - } + Exception e = assertThrows(Exception.class, () -> template.sendBody("direct:start", "Camel,Donkey"), + "Should throw exception"); + + IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause()); + assertEquals("Forced", cause.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java index 8c65c13e9c0cd..e9b56cc25c7c1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java @@ -26,6 +26,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; public class SplitterParallelRuntimeExceptionInHasNextOrNextTest extends ContextTestSupport { @@ -50,12 +51,12 @@ public void testSplitErrorInNext() throws Exception { private void execute(String from) throws InterruptedException { for (int i = 0; i < 10; i++) { - try { - template.sendBody(from, "some content"); - } catch (Exception e) { - // expected due to runtime exception in hasNext method - assertTrue(e.getMessage().startsWith("Exception occurred")); - } + + Exception e = assertThrows(Exception.class, () -> template.sendBody(from, "some content"), + "expected due to runtime exception in hasNext method"); + + assertTrue(e.getMessage().startsWith("Exception occurred")); + assertMockEndpointsSatisfied(); } } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java index 517d52bc459e6..d4dd5ad20264c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.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.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests the issue stated in CAMEL-12441. @@ -36,13 +36,12 @@ public void testIteratorThrowExceptionOnFirst() throws Exception { getMockEndpoint("mock:line").expectedMessageCount(0); getMockEndpoint("mock:end").expectedMessageCount(0); - try { - template.sendBody("direct:start", new MyIterator(1)); - fail("Should throw exception"); - } catch (Exception e) { - IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Forced error", iae.getMessage()); - } + Exception e = assertThrows(Exception.class, + () -> template.sendBody("direct:start", new MyIterator(1)), + "Should throw exception"); + + IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Forced error", iae.getMessage()); assertMockEndpointsSatisfied(); } @@ -52,13 +51,12 @@ public void testIteratorThrowExceptionOnSecond() throws Exception { getMockEndpoint("mock:line").expectedMessageCount(1); getMockEndpoint("mock:end").expectedMessageCount(0); - try { - template.sendBody("direct:start", new MyIterator(2)); - fail("Should throw exception"); - } catch (Exception e) { - IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Forced error", iae.getMessage()); - } + Exception e = assertThrows(Exception.class, + () -> template.sendBody("direct:start", new MyIterator(2)), + "Should throw exception"); + + IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Forced error", iae.getMessage()); assertMockEndpointsSatisfied(); } @@ -68,13 +66,12 @@ public void testIteratorThrowExceptionOnThird() throws Exception { getMockEndpoint("mock:line").expectedMessageCount(2); getMockEndpoint("mock:end").expectedMessageCount(0); - try { - template.sendBody("direct:start", new MyIterator(3)); - fail("Should throw exception"); - } catch (Exception e) { - IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); - assertEquals("Forced error", iae.getMessage()); - } + Exception e = assertThrows(Exception.class, + () -> template.sendBody("direct:start", new MyIterator(3)), + "Should throw exception"); + + IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause()); + assertEquals("Forced error", iae.getMessage()); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningCloseableIteratorTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningCloseableIteratorTest.java index c44160fe292ad..d383032f55f87 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningCloseableIteratorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningCloseableIteratorTest.java @@ -26,8 +26,8 @@ import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; +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 SplitterUsingBeanReturningCloseableIteratorTest extends ContextTestSupport { @@ -46,13 +46,11 @@ public Iterator split(Exchange exchange) { @Test public void testCloseableIterator() { - try { - template.sendBody("direct:start", "Hello,World"); - } catch (CamelExecutionException e) { - assertTrue(MyCloseableIterator.getInstance().isClosed(), "MyCloseableIterator.close() was not invoked"); - return; - } - fail("Exception should have been thrown"); + CamelExecutionException e = assertThrows(CamelExecutionException.class, + () -> template.sendBody("direct:start", "Hello,World"), + "Exception should have been thrown"); + + assertTrue(MyCloseableIterator.getInstance().isClosed(), "MyCloseableIterator.close() was not invoked"); } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java index ec6ffbfb68043..1dbba33bd7a51 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/TwoDoTryAndThrowInInnerCatchIssueTest.java @@ -24,7 +24,7 @@ import org.apache.camel.support.PluginHelper; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; /** * Based on user forum issue @@ -42,11 +42,8 @@ public void testSendThatIsCaught() throws Exception { getMockEndpoint("mock:catch4").expectedMessageCount(1); getMockEndpoint("mock:catch5").expectedMessageCount(1); - try { - template.requestBody("direct:test", "test", String.class); - } catch (Exception e) { - fail("Should not fail"); - } + assertDoesNotThrow(() -> template.requestBody("direct:test", "test", String.class), + "Should not fail"); assertMockEndpointsSatisfied(); }