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 dd2fc4b31d3d55e0f82d9ebda8ff71f22bc05105 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Sat Jan 24 17:19:03 2026 +0000 CAMEL-21196: modernize exception-based assertions in camel-main --- .../camel/main/MainIoCBeanPostProcessorDisabledTest.java | 10 +++------- .../test/java/org/apache/camel/main/MainListenerTest.java | 10 ++-------- .../src/test/java/org/apache/camel/main/MainScan3Test.java | 14 +++++--------- .../org/apache/camel/main/MainStartupConditionTest.java | 6 ++---- .../apache/camel/main/MainStartupConditionTimeoutTest.java | 6 ++---- ...pervisingRouteControllerFilterFailToStartRouteTest.java | 10 +++------- 6 files changed, 17 insertions(+), 39 deletions(-) diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java index 7dfbf6616438..67b0d98cb1e1 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java @@ -53,13 +53,9 @@ public class MainIoCBeanPostProcessorDisabledTest { main.configure().addRoutesBuilder(new MyRouteBuilder()); main.configure().withBeanPostProcessorEnabled(false); - try { - main.start(); - fail("Should throw exception"); - } catch (FailedToCreateRouteException e) { - NoSuchBeanException nsbe = (NoSuchBeanException) e.getCause(); - assertEquals("tiger", nsbe.getName()); - } + FailedToCreateRouteException e = assertThrows(FailedToCreateRouteException.class, () -> main.start()); + NoSuchBeanException nsbe = (NoSuchBeanException) e.getCause(); + assertEquals("tiger", nsbe.getName()); } public static class MyRouteBuilder extends RouteBuilder { diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java index 15e903d7abd6..138688f5d1ea 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainListenerTest.java @@ -24,8 +24,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import static org.apache.camel.util.CollectionHelper.propertiesOf; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; public class MainListenerTest { @@ -40,13 +40,7 @@ public class MainListenerTest { events.add(method.getName()); return null; })); - Thread thread = new Thread(() -> { - try { - main.run(); - } catch (Exception e) { - fail("Unexpected exception: " + e); - } - }); + Thread thread = new Thread(() -> assertDoesNotThrow(() -> main.run())); thread.start(); Thread.sleep(100); main.completed(); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainScan3Test.java b/core/camel-main/src/test/java/org/apache/camel/main/MainScan3Test.java index 527da89a6148..a1a631bcc30b 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainScan3Test.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainScan3Test.java @@ -20,7 +20,7 @@ import org.apache.camel.FailedToCreateRouteException; 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 MainScan3Test { @@ -28,14 +28,10 @@ public class MainScan3Test { public void testScan3() { Main main = new Main(); main.configure().withBasePackageScan("org.apache.camel.main.scan3"); - try { - main.start(); - fail(); - } catch (FailedToCreateRouteException e) { - assertEquals( - "Failed to create route because: Duplicate route ids detected: foo2. Please correct ids to be unique among all your routes.", - e.getMessage()); - } + FailedToCreateRouteException e = assertThrows(FailedToCreateRouteException.class, () -> main.start()); + assertEquals( + "Failed to create route because: Duplicate route ids detected: foo2. Please correct ids to be unique among all your routes.", + e.getMessage()); main.stop(); } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTest.java index 0d284e6d1aa6..c076b287d1c8 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTest.java @@ -22,7 +22,7 @@ import org.apache.camel.spi.StartupCondition; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; public class MainStartupConditionTest { @@ -33,9 +33,7 @@ public class MainStartupConditionTest { main.configure().withRoutesBuilderClasses("org.apache.camel.main.MainStartupConditionTest$MyRoute"); main.configure().startupCondition().withEnabled(true).withTimeout(250).withInterval(100) .withCustomClassNames("org.apache.camel.main.MainStartupConditionTest$MyCondition"); - main.start(); - fail("Should throw exception"); - } catch (Exception e) { + Exception e = assertThrows(Exception.class, () -> main.start()); Assertions.assertEquals("Startup condition timeout error", e.getCause().getMessage()); } finally { main.stop(); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTimeoutTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTimeoutTest.java index 66d8fd9c67d8..8804f36fd0b4 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTimeoutTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainStartupConditionTimeoutTest.java @@ -21,7 +21,7 @@ import org.apache.camel.util.StopWatch; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; public class MainStartupConditionTimeoutTest { @@ -34,9 +34,7 @@ public class MainStartupConditionTimeoutTest { .withOnTimeout("fail") .withTimeout(250) .withCustomClassNames("org.apache.camel.main.MainStartupConditionTimeoutTest$MyEnvCondition"); - main.start(); - fail("Should throw exception"); - } catch (Exception e) { + Exception e = assertThrows(Exception.class, () -> main.start()); Assertions.assertEquals( "Startup condition: ENV cannot continue due to: OS Environment Variable: MY_ENV does not exist", e.getCause().getMessage()); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerFilterFailToStartRouteTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerFilterFailToStartRouteTest.java index e44115b510a5..ff53d0882988 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerFilterFailToStartRouteTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerFilterFailToStartRouteTest.java @@ -29,7 +29,7 @@ import org.apache.camel.component.seda.SedaEndpoint; 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 MainSupervisingRouteControllerFilterFailToStartRouteTest { @@ -45,12 +45,8 @@ public class MainSupervisingRouteControllerFilterFailToStartRouteTest { main.configure().routeControllerConfig().setThreadPoolSize(2); main.configure().routeControllerConfig().setExcludeRoutes("inbox"); - try { - main.start(); - fail("Should fail"); - } catch (FailedToStartRouteException e) { - assertEquals("inbox", e.getRouteId()); - } + FailedToStartRouteException e = assertThrows(FailedToStartRouteException.class, () -> main.start()); + assertEquals("inbox", e.getRouteId()); main.stop(); }
