You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2026/01/25 14:04:17 UTC
(camel) 03/36: CAMEL-21196: modernize exception-based assertions in camel-groovy
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 562ff5de80899697dce02c4a10bf95b8dfdbbb49
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Sat Jan 24 18:17:24 2026 +0000
CAMEL-21196: modernize exception-based assertions in camel-groovy
Convert try-catch-fail patterns to modern JUnit 5 assertThrows() in test files:
- GroovyLanguageTest.java
- GroovyExpressionTest.java
- GroovyLogEipTest.java
Updated imports to replace fail with assertThrows for better readability and
modern testing patterns.
---
.../apache/camel/language/groovy/GroovyExpressionTest.java | 14 ++++++--------
.../apache/camel/language/groovy/GroovyLanguageTest.java | 12 +++++-------
.../apache/camel/processor/groovy/GroovyLogEipTest.java | 10 ++++------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
index 946d1b90fec1..ecd8fa9d8d23 100644
--- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
+++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
@@ -28,8 +28,8 @@ import static org.apache.camel.test.junit5.TestSupport.assertExpression;
import static org.apache.camel.test.junit5.TestSupport.assertInMessageHeader;
import static org.apache.camel.test.junit5.TestSupport.assertPredicate;
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 GroovyExpressionTest {
private static final Logger LOG = LoggerFactory.getLogger(GroovyExpressionTest.class);
@@ -104,14 +104,12 @@ public class GroovyExpressionTest {
@Test
public void testInvalidExpressionFailsWithMeaningfulException() {
- try {
+ Exception e = assertThrows(Exception.class, () -> {
GroovyLanguage.groovy("exchange.doesNotExist").evaluate(exchange);
- fail("This test case should have thrown an exception!");
- } catch (Exception e) {
- LOG.debug("Caught expected exception: {}", e.getMessage(), e);
- String message = e.getMessage();
- assertTrue(message.contains("doesNotExist"), "The message should include 'doesNotExist' but was: " + message);
- }
+ });
+ LOG.debug("Caught expected exception: {}", e.getMessage(), e);
+ String message = e.getMessage();
+ assertTrue(message.contains("doesNotExist"), "The message should include 'doesNotExist' but was: " + message);
}
@BeforeEach
diff --git a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
index 2c12a0dabed1..b49b2dda0750 100644
--- a/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
+++ b/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyLanguageTest.java
@@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+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 GroovyLanguageTest extends LanguageTestSupport {
@@ -65,16 +65,14 @@ public class GroovyLanguageTest extends LanguageTestSupport {
assertTrue(g.validateExpression("exchange.getExchangeId()"));
assertTrue(g.validatePredicate("2 * 3 > 4"));
- try {
+ GroovyValidationException e = assertThrows(GroovyValidationException.class, () -> {
g.validateExpression("""
var a = 123;
println a */ 2;
""");
- fail("Should throw error");
- } catch (GroovyValidationException e) {
- assertEquals(23, e.getIndex());
- assertInstanceOf(MultipleCompilationErrorsException.class, e.getCause());
- }
+ });
+ assertEquals(23, e.getIndex());
+ assertInstanceOf(MultipleCompilationErrorsException.class, e.getCause());
}
}
diff --git a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java
index 6a02b09d64a8..8f21b2a21477 100644
--- a/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java
+++ b/components/camel-groovy/src/test/java/org/apache/camel/processor/groovy/GroovyLogEipTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
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 GroovyLogEipTest extends CamelTestSupport {
@@ -43,12 +43,10 @@ public class GroovyLogEipTest extends CamelTestSupport {
@Test
public void testLogFail() {
- try {
+ Exception e = assertThrows(Exception.class, () -> {
template.sendBody("direct:fail", 4);
- fail("Should fail");
- } catch (Exception e) {
- Assertions.assertInstanceOf(MissingPropertyException.class, e.getCause());
- }
+ });
+ Assertions.assertInstanceOf(MissingPropertyException.class, e.getCause());
}
@Override