(camel) branch main updated: CAMEL-21490: camel-yaml-io - Dump to yaml with choice does not work correctly.

[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 63e73632908 CAMEL-21490: camel-yaml-io - Dump to yaml with choice does 
not work correctly.
63e73632908 is described below

commit 63e7363290811b97e915f3ed7fa60bb05163a568
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Nov 29 13:55:32 2024 +0100

    CAMEL-21490: camel-yaml-io - Dump to yaml with choice does not work 
correctly.
---
 .../org/apache/camel/yaml/out/ModelWriterTest.java |  1 +
 .../yaml/out/ModelWriterUriAsParametersTest.java   |  2 ++
 core/camel-yaml-io/src/test/resources/route6.yaml  | 26 +++++++++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git 
a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
 
b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
index a0fbf0f6cc9..4f27542b62a 100644
--- 
a/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
+++ 
b/core/camel-yaml-io/src/test/java/org/apache/camel/yaml/out/ModelWriterTest.java
@@ -196,6 +196,7 @@ public class ModelWriterTest {
         Assertions.assertEquals(expected, out);
     }
 
+    @Disabled("TODO: https://issues.apache.org/jira/browse/CAMEL-21490";)
     @Test
     public void testFromChoice() throws Exception {
         StringWriter sw = new StringWriter();
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 005f1c62dce..5fd756ab410 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
@@ -40,6 +40,7 @@ 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;
@@ -205,6 +206,7 @@ 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();
diff --git a/core/camel-yaml-io/src/test/resources/route6.yaml 
b/core/camel-yaml-io/src/test/resources/route6.yaml
index 81bc512dec9..e7e7391ab83 100644
--- a/core/camel-yaml-io/src/test/resources/route6.yaml
+++ b/core/camel-yaml-io/src/test/resources/route6.yaml
@@ -21,22 +21,22 @@
       uri: direct:start6
       steps:
         - choice:
-            steps:
-              - when:
+            when:
+              - expression:
                   simple:
                     expression: "${header.age} < 21"
-                  steps:
-                    - to:
-                        uri: mock:young
-              - when:
+                steps:
+                  - to:
+                      uri: mock:young
+              - expression:
                   simple:
                     expression: "${header.age} > 21 && ${header.age} < 70"
-                  steps:
-                    - to:
-                        uri: mock:work
-              - otherwise:
-                  steps:
-                    - to:
-                        uri: mock:senior
+                steps:
+                  - to:
+                      uri: mock:work
+            otherwise:
+              steps:
+                - to:
+                    uri: mock:senior
         - to:
             uri: mock:result