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
commit d98b3d32d6e30e4100a96efdb5ee91e5008b1f70 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Feb 13 09:18:32 2023 +0100 Fixed test after xml-io model dumper (order attributes changed) --- .../org/apache/camel/management/ManagedFromRestGetTest.java | 10 +++++----- .../camel/management/ManagedFromRestPlaceholderTest.java | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java index 8321c74485f..842ee64ab8b 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java @@ -64,14 +64,14 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { assertTrue(xml.contains("application/json")); assertTrue(xml.contains("</rests>")); - assertTrue(xml.contains("<param collectionFormat=\"multi\" dataType=\"string\" defaultValue=\"b\" " - + "description=\"header param description2\" name=\"header_letter\" required=\"false\" type=\"query\">")); - assertTrue(xml.contains("<param dataType=\"integer\" defaultValue=\"1\" " - + "description=\"header param description1\" name=\"header_count\" required=\"true\" type=\"header\">")); + assertTrue(xml.contains("<param defaultValue=\"1\" dataType=\"integer\" name=\"header_count\"" + + " description=\"header param description1\" type=\"header\" required=\"true\">")); + assertTrue(xml.contains("<param defaultValue=\"b\" dataType=\"string\" name=\"header_letter\"" + + " description=\"header param description2\" type=\"query\" collectionFormat=\"multi\" required=\"false\">")); assertTrue(xml.contains("<value>1</value>")); assertTrue(xml.contains("<value>a</value>")); - assertTrue(xml.contains("<responseMessage code=\"300\" message=\"test msg\" responseModel=\"java.lang.Integer\"/>")); + assertTrue(xml.contains("<responseMessage code=\"300\" responseModel=\"java.lang.Integer\" message=\"test msg\"/>")); String xml2 = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null, null); log.info(xml2); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java index a21759d67fa..2f979809d0a 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedFromRestPlaceholderTest.java @@ -65,15 +65,14 @@ public class ManagedFromRestPlaceholderTest extends ManagementTestSupport { assertTrue(xml.contains("application/json")); assertTrue(xml.contains("</rests>")); - assertTrue(xml.contains( - "<param collectionFormat=\"multi\" dataType=\"string\" defaultValue=\"b\" description=\"header param description2\" " - + "name=\"header_letter\" required=\"false\" type=\"query\">")); - assertTrue(xml.contains("<param dataType=\"integer\" defaultValue=\"1\" description=\"header param description1\" " - + "name=\"header_count\" required=\"true\" type=\"header\">")); + assertTrue(xml.contains("<param defaultValue=\"1\" dataType=\"integer\" name=\"header_count\"" + + " description=\"header param description1\" type=\"header\" required=\"true\">")); + assertTrue(xml.contains("<param defaultValue=\"b\" dataType=\"string\" name=\"header_letter\"" + + " description=\"header param description2\" type=\"query\" collectionFormat=\"multi\" required=\"false\">")); assertTrue(xml.contains("<value>1</value>")); assertTrue(xml.contains("<value>a</value>")); - assertTrue(xml.contains("<responseMessage code=\"300\" message=\"test msg\" responseModel=\"java.lang.Integer\"/>")); + assertTrue(xml.contains("<responseMessage code=\"300\" responseModel=\"java.lang.Integer\" message=\"test msg\"/>")); String xml2 = (String) mbeanServer.invoke(on, "dumpRoutesAsXml", null, null); log.info(xml2);
