From 5f8f5134df2aad39c220abb0ed11f774ff44ec9e Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 8 Apr 2026 06:44:34 +0200
Subject: [PATCH] CAMEL-23274: Fix SonarCloud critical bugs in test code

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../java/org/apache/camel/xml/in/ModelParserTest.java |  3 ++-
 .../dsl/jbang/core/common/EnvironmentHelperTest.java  | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
index 882ec709678be..7f6ac36a195c8 100644
--- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
+++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
@@ -469,8 +469,9 @@ public void testMethodAfterStepsInWhenClauseShouldFail() throws Exception {
                   </route>
                 </routes>
                 """;
+        ModelParser parser = new ModelParser(new StringReader(routesXml));
         Exception e = assertThrows(Exception.class, () -> {
-            new ModelParser(new StringReader(routesXml)).parseRoutesDefinition();
+            parser.parseRoutesDefinition();
         });
         assertThat(e).hasStackTraceContaining("already has a predicate");
     }
diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/EnvironmentHelperTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/EnvironmentHelperTest.java
index 0a5985a4ac1c8..e4ca3124e6f6c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/EnvironmentHelperTest.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/EnvironmentHelperTest.java
@@ -18,8 +18,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class EnvironmentHelperTest {
@@ -28,20 +28,17 @@ class EnvironmentHelperTest {
     void testIsColorEnabledReturnsBoolean() {
         // Should not throw and should return a boolean value
         // The actual result depends on the environment, but the method should work
-        boolean result = EnvironmentHelper.isColorEnabled();
-        assertNotNull(result);
+        assertDoesNotThrow(() -> EnvironmentHelper.isColorEnabled());
     }
 
     @Test
     void testIsCIEnvironmentReturnsBoolean() {
-        boolean result = EnvironmentHelper.isCIEnvironment();
-        assertNotNull(result);
+        assertDoesNotThrow(() -> EnvironmentHelper.isCIEnvironment());
     }
 
     @Test
     void testIsInteractiveTerminalReturnsBoolean() {
-        boolean result = EnvironmentHelper.isInteractiveTerminal();
-        assertNotNull(result);
+        assertDoesNotThrow(() -> EnvironmentHelper.isInteractiveTerminal());
     }
 
     @Test