(camel) branch main updated: CAMEL-21490: Fix test

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new c17a63fbb1c CAMEL-21490: Fix test
c17a63fbb1c is described below

commit c17a63fbb1c47a9acf93f3a3d0265b10770a3f7e
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 16 15:16:12 2025 +0200

    CAMEL-21490: Fix test
---
 .../camel/yaml/out/ModelWriterUriAsParametersTest.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
 
b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
index ad8d2eb41fd..edad85b4134 100644
--- 
a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
+++ 
b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterUriAsParametersTest.java
@@ -36,12 +36,12 @@ import org.apache.camel.model.SetBodyDefinition;
 import org.apache.camel.model.SetHeaderDefinition;
 import org.apache.camel.model.SplitDefinition;
 import org.apache.camel.model.ToDefinition;
+import org.apache.camel.model.WhenDefinition;
 import org.apache.camel.model.dataformat.CsvDataFormat;
 import org.apache.camel.model.language.ConstantExpression;
 import org.apache.camel.model.language.HeaderExpression;
 import org.apache.camel.model.language.SimpleExpression;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.camel.util.IOHelper.stripLineComments;
@@ -207,7 +207,6 @@ public class ModelWriterUriAsParametersTest {
         Assertions.assertEquals(expected, out);
     }
 
-    @Disabled("TODO: https://issues.apache.org/jira/browse/CAMEL-21490";)
     @Test
     public void testFromChoice() throws Exception {
         StringWriter sw = new StringWriter();
@@ -219,8 +218,17 @@ public class ModelWriterUriAsParametersTest {
         route.setInput(new FromDefinition("direct:start6"));
         ChoiceDefinition choice = new ChoiceDefinition();
         route.addOutput(choice);
-        choice.when().simple("${header.age} < 21").to("mock:young");
-        choice.when().simple("${header.age} > 21 && ${header.age} < 
70").to("mock:work");
+
+        WhenDefinition when = new WhenDefinition();
+        when.setExpression(new SimpleExpression("${header.age} < 21"));
+        when.addOutput(new ToDefinition("mock:young"));
+        choice.addOutput(when);
+
+        when = new WhenDefinition();
+        when.setExpression(new SimpleExpression("${header.age} > 21 && 
${header.age} < 70"));
+        when.addOutput(new ToDefinition("mock:work"));
+        choice.addOutput(when);
+
         choice.otherwise().to("mock:senior");
         ToDefinition to = new ToDefinition("mock:result");
         route.addOutput(to);