From 99e1c267660501e465d44d5a0134021d39a8c5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Wed, 9 Sep 2026 11:13:01 +0200 Subject: [PATCH] Fix CamelConfigITCase.testCamelListConfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The order of config in the output is not important, check only if they are all there it avoids this error: ``` [command camel config list should output gav = com.foo:acme:1.0-SNAPSHOT runtime = quarkus directory = /deployments/data/84965e9286b07] Expecting actual: "----- Global ----- gav = com.foo:acme:1.0-SNAPSHOT directory = /deployments/data/84965e9286b07 runtime = quarkus " to contain: "gav = com.foo:acme:1.0-SNAPSHOT runtime = quarkus directory = /deployments/data/84965e9286b07" ``` Signed-off-by: Aurélien Pupier --- .../org/apache/camel/dsl/jbang/it/CamelConfigITCase.java | 7 ++++--- .../camel/dsl/jbang/it/support/JBangTestSupport.java | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java index 0f22f54d8e34d..f94a64a857587 100644 --- a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java +++ b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/CamelConfigITCase.java @@ -37,9 +37,10 @@ public void testCamelListConfig() { execute("config set runtime=quarkus"); execute("config set directory=" + mountPoint()); checkCommandOutputs("config list", - "gav = com.foo:acme:1.0-SNAPSHOT\n" + - "runtime = quarkus\n" + - "directory = " + mountPoint()); + new String[] { + "gav = com.foo:acme:1.0-SNAPSHOT", + "runtime = quarkus", + "directory = " + mountPoint() }); } @Test diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java index 7b174e6a335e8..51e1c7d3ca737 100644 --- a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java +++ b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java @@ -215,6 +215,12 @@ protected void checkCommandOutputs(String command, String contains) { .contains(contains); } + protected void checkCommandOutputs(String command, String... contains) { + Assertions.assertThat(execute(command)) + .as("command " + getMainCommand() + " " + command + " should output each of these lines " + contains) + .contains(contains); + } + protected void checkCommandFailsWithError(String command, String error) { Assertions.assertThat(execute(command, true, true)) .as("command " + getMainCommand() + " " + command + " should fail with error " + error)