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 11e869c4c839 CAMEL-24727: Make RunExportGoldenTest independent of
routes order (#28734)
11e869c4c839 is described below
commit 11e869c4c8390c7765151d4cd69f32edda41c7c2
Author: Aurélien Pupier <[email protected]>
AuthorDate: Fri Oct 30 17:29:54 2026 +0100
CAMEL-24727: Make RunExportGoldenTest independent of routes order (#28734)
RunExportGoldenTest compared the route files of a directory in the order
the file system listed them. The golden files are now sorted, and the test
sorts the entries before comparing, so it passes whatever order the file system
uses.
Co-authored-by: IBM Bob 2.2.1
---
.../apache/camel/dsl/jbang/core/commands/RunExportGoldenTest.java | 7 ++++---
.../src/test/resources/golden/expected/kamelet.export.txt | 2 +-
.../src/test/resources/golden/expected/kamelet.run.txt | 4 ++--
.../src/test/resources/golden/expected/openapi.export.txt | 2 +-
.../src/test/resources/golden/expected/openapi.run.txt | 4 ++--
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/RunExportGoldenTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/RunExportGoldenTest.java
index 849b6098cf30..fd746e8d40d0 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/RunExportGoldenTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/RunExportGoldenTest.java
@@ -484,11 +484,12 @@ class RunExportGoldenTest {
}
/**
- * Sorts the lists of files (such as camel.jbang.classpathFiles): a
directory given to camel run is listed in the
- * order of the file system, which differs from one machine to another.
+ * Sorts the lists of files (such as camel.jbang.classpathFiles and
camel.main.routesIncludePattern): a directory
+ * given to camel run is listed in the order of the file system, which
differs from one machine to another.
*/
private static String sortFileLists(String text) {
- Matcher m =
Pattern.compile("(?m)^(\\s*camel\\.jbang\\.\\w+Files=)(.*)$").matcher(text);
+ Matcher m =
Pattern.compile("(?m)^(\\s*(?:camel\\.jbang\\.\\w+Files|camel\\.main\\.routesIncludePattern)=)(.*)$")
+ .matcher(text);
StringBuilder sb = new StringBuilder();
while (m.find()) {
String files =
Arrays.stream(m.group(2).split(",")).sorted().collect(Collectors.joining(","));
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
index f1a92e95273a..41077cd8c170 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.export.txt
@@ -17,7 +17,7 @@ camel.jbang.quarkusVersion=3.35.3
camel.jbang.quarkusExtensionRegistryBaseUri=file\://${basedir}/target/test-classes/registry.quarkus.io
camel.jbang.javaVersion=21
camel.jbang.kameletsVersion=${kamelets.version}
-camel.main.routesIncludePattern=file\:src/test/resources/golden/kamelet/route.camel.yaml,file\:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml
+camel.main.routesIncludePattern=file\:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml,file\:src/test/resources/golden/kamelet/route.camel.yaml
camel.component.kamelet.location=classpath\:kamelets,file\:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml
dependency=mvn\:org.apache.camel\:camel-kamelet\:${camel.version}
dependency=mvn\:org.apache.camel.kamelets\:camel-kamelets\:${kamelets.version}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.run.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.run.txt
index 46dc2e2a9fc8..558cdb6ca1ab 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.run.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/kamelet.run.txt
@@ -20,7 +20,7 @@
camel.jbang.quarkusExtensionRegistryBaseUri=file\://${basedir}/target/test-class
camel.jbang.javaVersion=21
camel.jbang.kameletsVersion=${kamelets.version}
camel.main.name=route
-camel.main.routesIncludePattern=file\:src/test/resources/golden/kamelet/route.camel.yaml,file\:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml
+camel.main.routesIncludePattern=file\:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml,file\:src/test/resources/golden/kamelet/route.camel.yaml
camel.component.kamelet.location=classpath\:kamelets,file\:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml
# initial properties
@@ -43,6 +43,6 @@ camel.jbang.springBootVersion=${spring-boot.version}
camel.jbang.verbose=false
camel.main.modeline=true
camel.main.name=route
-camel.main.routesIncludePattern=file:src/test/resources/golden/kamelet/route.camel.yaml,file:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml
+camel.main.routesIncludePattern=file:src/test/resources/golden/kamelet/greeting-source.kamelet.yaml,file:src/test/resources/golden/kamelet/route.camel.yaml
# override properties
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
index a89e31977b13..52d1866737cc 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.export.txt
@@ -18,7 +18,7 @@ camel.jbang.quarkusVersion=3.35.3
camel.jbang.quarkusExtensionRegistryBaseUri=file\://${basedir}/target/test-classes/registry.quarkus.io
camel.jbang.javaVersion=21
camel.jbang.kameletsVersion=${kamelets.version}
-camel.main.routesIncludePattern=file\:src/test/resources/golden/openapi/greeting.camel.yaml,file\:.camel-jbang/generated-openapi.yaml
+camel.main.routesIncludePattern=file\:.camel-jbang/generated-openapi.yaml,file\:src/test/resources/golden/openapi/greeting.camel.yaml
camel.jbang.classpathFiles=src/test/resources/golden/openapi/api.yaml
dependency=mvn\:org.apache.camel\:camel-kamelet\:${camel.version}
dependency=mvn\:org.apache.camel.kamelets\:camel-kamelets\:${kamelets.version}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.run.txt
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.run.txt
index 7c62a5a58b53..d106af415d57 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.run.txt
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/resources/golden/expected/openapi.run.txt
@@ -21,7 +21,7 @@
camel.jbang.quarkusExtensionRegistryBaseUri=file\://${basedir}/target/test-class
camel.jbang.javaVersion=21
camel.jbang.kameletsVersion=${kamelets.version}
camel.main.name=greeting
-camel.main.routesIncludePattern=file\:src/test/resources/golden/openapi/greeting.camel.yaml,file\:${dir}/generated-openapi.yaml
+camel.main.routesIncludePattern=file\:${dir}/generated-openapi.yaml,file\:src/test/resources/golden/openapi/greeting.camel.yaml
camel.jbang.classpathFiles=src/test/resources/golden/openapi/api.yaml
# initial properties
@@ -46,6 +46,6 @@ camel.jbang.springBootVersion=${spring-boot.version}
camel.jbang.verbose=false
camel.main.modeline=true
camel.main.name=greeting
-camel.main.routesIncludePattern=file:src/test/resources/golden/openapi/greeting.camel.yaml,file:${dir}/generated-openapi.yaml
+camel.main.routesIncludePattern=file:${dir}/generated-openapi.yaml,file:src/test/resources/golden/openapi/greeting.camel.yaml
# override properties
