[camel] branch main updated: CAMEL-20008 - Improve assertion to compare xml and not string in (#11754)

[da...@apache.org]

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 97c63d14015 CAMEL-20008 - Improve assertion to compare xml and not string in (#11754)
97c63d14015 is described below

commit 97c63d140153fee9119c4a963cf9ad0d82098154
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Fri Oct 20 14:39:56 2023 +0200

    CAMEL-20008 - Improve assertion to compare xml and not string in (#11754)
    
    XMLTokenExpressionIteratorTest
    
    * With Java 21, the order of attributes are different but it does not
    change the semantic
    * factorize the xml-unit version in parent pom
    
    Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
 components/camel-stax/pom.xml                                     | 5 +++++
 .../camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index 109b5d1cc60..58a449d5bb9 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -74,6 +74,11 @@
             <artifactId>camel-jaxb</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-assertj3</artifactId>
+            <scope>test</scope>
+       </dependency>
 
     </dependencies>
 
diff --git a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
index 2288dd68dbf..3e96b899ed0 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/language/xtokenizer/XMLTokenExpressionIteratorTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.xmlunit.assertj3.XmlAssert;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -490,7 +491,12 @@ public class XMLTokenExpressionIteratorTest {
 
         assertEquals(expected.length, results.size(), "token count");
         for (int i = 0; i < expected.length; i++) {
-            assertEquals(expected[i], results.get(i), "mismatch [" + i + "]");
+            String expectedToken = expected[i];
+            if (expectedToken.startsWith("<")) {
+                XmlAssert.assertThat(results.get(i)).and(expectedToken).areIdentical();
+            } else {
+                assertEquals(expectedToken, results.get(i), "mismatch [" + i + "]");
+            }
         }
     }