This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch camel-spring-boot-4.22.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.22.x by
this push:
new b65146163cc ci: Fix recurring 4.22.x Spring Boot test failures
b65146163cc is described below
commit b65146163cc8aab165b865e5366fdc926ea17eec
Author: Croway <[email protected]>
AuthorDate: Mon Sep 28 14:21:12 2026 +0200
ci: Fix recurring 4.22.x Spring Boot test failures
---
.../test/JsonPathSplitWriteAsStringMapTest.java | 17 ++++-------------
.../springboot/SpringBootPlatformHttpCookiesTest.java | 6 ++----
.../quartz/springboot/QuartzCustomCalendarFireTest.java | 6 +++++-
.../springboot/QuartzCustomCalendarNoFireTest.java | 6 +++++-
.../zipfile/springboot/ZipFileDataFormatTest.java | 2 +-
tests/camel-itest-spring-boot/pom.xml | 1 +
.../springboot/{CamelJooqIT.java => CamelA2aIT.java} | 2 +-
.../springboot/{CamelJooqIT.java => CamelAiToolIT.java} | 2 +-
.../{CamelJooqIT.java => CamelClickhouseIT.java} | 2 +-
.../springboot/{CamelJooqIT.java => CamelDuckdbIT.java} | 2 +-
.../springboot/{CamelJooqIT.java => CamelJactlIT.java} | 6 +++---
.../org/apache/camel/itest/springboot/CamelJooqIT.java | 9 +++++++++
12 files changed, 34 insertions(+), 27 deletions(-)
diff --git
a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java
b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java
index 7a69012fc4d..a7c924b3df0 100644
---
a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java
+++
b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathSplitWriteAsStringMapTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.jsonpath.springboot.test;
import java.io.File;
-import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
@@ -26,8 +25,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
@@ -51,20 +48,14 @@ public class JsonPathSplitWriteAsStringMapTest {
public void testSplitToJSon() throws Exception {
mock.expectedMessageCount(2);
+ mock.expectedBodiesReceived(
+
"{\"action\":\"CU\",\"id\":123,\"modifiedTime\":\"2015-07-28T11:40:09.520+02:00\"}",
+
"{\"action\":\"CU\",\"id\":456,\"modifiedTime\":\"2015-07-28T11:42:29.510+02:00\"}");
template.sendBody("direct:start", new
File("src/test/resources/content-map.json"));
mock.assertIsSatisfied();
- Map.Entry<?, ?> row =
mock.getReceivedExchanges().get(0).getIn().getBody(Map.Entry.class);
- assertEquals("foo", row.getKey());
-
assertEquals("{\"action\":\"CU\",\"id\":123,\"modifiedTime\":\"2015-07-28T11:40:09.520+02:00\"}",
- row.getValue());
-
- row =
mock.getReceivedExchanges().get(1).getIn().getBody(Map.Entry.class);
- assertEquals("bar", row.getKey());
-
assertEquals("{\"action\":\"CU\",\"id\":456,\"modifiedTime\":\"2015-07-28T11:42:29.510+02:00\"}",
- row.getValue());
}
// *************************************
@@ -79,7 +70,7 @@ public class JsonPathSplitWriteAsStringMapTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:start").split().jsonpathWriteAsString("$.content").to("mock:line").to("log:line")
+
from("direct:start").split().jsonpathWriteAsString("$.content.*").to("mock:line").to("log:line")
.end();
}
};
diff --git
a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java
b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java
index bf1d34b80d9..99c4b170a0b 100644
---
a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java
+++
b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java
@@ -42,7 +42,6 @@ import org.springframework.context.annotation.Configuration;
import static io.restassured.RestAssured.given;
import static io.restassured.matcher.RestAssuredMatchers.detailedCookie;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertEquals;
@EnableAutoConfiguration
@@ -129,7 +128,7 @@ public class SpringBootPlatformHttpCookiesTest {
.setBody().constant("replace");
from("platform-http:/echo")
- .setBody().constant("echo");
+ .setBody(header("cookie"));
}
};
}
@@ -239,8 +238,7 @@ public class SpringBootPlatformHttpCookiesTest {
.get("/echo")
.then()
.statusCode(200)
- .header("cookie", startsWith("echo=cookie"))
- .body(equalTo("echo"));
+ .body(equalTo("echo=cookie"));
}
}
diff --git
a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java
b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java
index ef9e3e78c47..49cc7d05a9a 100644
---
a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java
+++
b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarFireTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.component.quartz.QuartzConstants;
+import org.apache.camel.component.quartz.QuartzEndpoint;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.junit.jupiter.api.Test;
@@ -64,7 +65,10 @@ public class QuartzCustomCalendarFireTest extends
BaseQuartzTest {
QuartzComponent component = context.getComponent("quartz",
QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
- Calendar c =
scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
+ QuartzEndpoint endpoint = (QuartzEndpoint)
context.getRoutes().get(0).getConsumer().getEndpoint();
+ String calendarName = QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR +
"_" + endpoint.getGroupName() + "_"
+ + endpoint.getTriggerName();
+ Calendar c = scheduler.getCalendar(calendarName);
Date now = new Date();
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
tomorrow.setTime(now);
diff --git
a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java
b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java
index df598d1d470..9cef4abe837 100644
---
a/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java
+++
b/components-starter/camel-quartz-starter/src/test/java/org/apache/camel/component/quartz/springboot/QuartzCustomCalendarNoFireTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.quartz.QuartzComponent;
import org.apache.camel.component.quartz.QuartzConstants;
+import org.apache.camel.component.quartz.QuartzEndpoint;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.junit.jupiter.api.Test;
@@ -64,7 +65,10 @@ public class QuartzCustomCalendarNoFireTest extends
BaseQuartzTest {
QuartzComponent component = context.getComponent("quartz",
QuartzComponent.class);
Scheduler scheduler = component.getScheduler();
- Calendar c =
scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
+ QuartzEndpoint endpoint = (QuartzEndpoint)
context.getRoutes().get(0).getConsumer().getEndpoint();
+ String calendarName = QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR +
"_" + endpoint.getGroupName() + "_"
+ + endpoint.getTriggerName();
+ Calendar c = scheduler.getCalendar(calendarName);
Date now = new Date();
java.util.Calendar tomorrow = java.util.Calendar.getInstance();
tomorrow.setTime(now);
diff --git
a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
index b0675f4eb3e..62c70643b0a 100644
---
a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
+++
b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
@@ -355,7 +355,7 @@ public class ZipFileDataFormatTest {
public void process(Exchange exchange) throws
Exception {
ZipFile zfile = new ZipFile(new
File("src/test/resources/hello.odt"));
ZipEntry entry = new ZipEntry(
- (String)
exchange.getIn().getHeader(Exchange.FILE_NAME));
+ (String)
exchange.getIn().getHeader("zipFileName"));
String outputDirectory = "hello_out";
File file = new File(outputDirectory,
entry.getName());
diff --git a/tests/camel-itest-spring-boot/pom.xml
b/tests/camel-itest-spring-boot/pom.xml
index e10cad758b9..3b8756031e2 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -138,6 +138,7 @@
<systemPropertyVariables>
<camel-version>${camel-version}</camel-version>
<spring-boot-version>${spring-boot-version}</spring-boot-version>
+ <jooq-version>${jooq-version}</jooq-version>
<maven-compiler-plugin-version>${maven-compiler-plugin-version}</maven-compiler-plugin-version>
<project-version>${project.version}</project-version>
<project.build.directory>${project.build.directory}</project.build.directory>
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelA2aIT.java
similarity index 93%
copy from
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
copy to
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelA2aIT.java
index 8620b8bc9ff..14470e8d44d 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelA2aIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.itest.springboot;
import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
import org.junit.jupiter.api.Test;
-public class CamelJooqIT extends AbstractSpringBootBaseTestSupport {
+public class CamelA2aIT extends AbstractSpringBootBaseTestSupport {
@Test
void componentTest() {
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAiToolIT.java
similarity index 93%
copy from
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
copy to
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAiToolIT.java
index 8620b8bc9ff..f192e881f27 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAiToolIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.itest.springboot;
import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
import org.junit.jupiter.api.Test;
-public class CamelJooqIT extends AbstractSpringBootBaseTestSupport {
+public class CamelAiToolIT extends AbstractSpringBootBaseTestSupport {
@Test
void componentTest() {
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelClickhouseIT.java
similarity index 93%
copy from
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
copy to
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelClickhouseIT.java
index 8620b8bc9ff..9371848f5ae 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelClickhouseIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.itest.springboot;
import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
import org.junit.jupiter.api.Test;
-public class CamelJooqIT extends AbstractSpringBootBaseTestSupport {
+public class CamelClickhouseIT extends AbstractSpringBootBaseTestSupport {
@Test
void componentTest() {
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelDuckdbIT.java
similarity index 93%
copy from
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
copy to
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelDuckdbIT.java
index 8620b8bc9ff..40e3ada8ecc 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelDuckdbIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.itest.springboot;
import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
import org.junit.jupiter.api.Test;
-public class CamelJooqIT extends AbstractSpringBootBaseTestSupport {
+public class CamelDuckdbIT extends AbstractSpringBootBaseTestSupport {
@Test
void componentTest() {
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJactlIT.java
similarity index 86%
copy from
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
copy to
tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJactlIT.java
index 8620b8bc9ff..e20b7835e24 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJactlIT.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.springboot;
import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
import org.junit.jupiter.api.Test;
-public class CamelJooqIT extends AbstractSpringBootBaseTestSupport {
+public class CamelJactlIT extends AbstractSpringBootBaseTestSupport {
@Test
- void componentTest() {
- assertComponent(inferComponentName(getClass()));
+ void languageTest() {
+ assertLanguage(inferComponentName(getClass()));
}
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
index 8620b8bc9ff..89d85095233 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJooqIT.java
@@ -17,10 +17,19 @@
package org.apache.camel.itest.springboot;
import
org.apache.camel.itest.springboot.common.AbstractSpringBootBaseTestSupport;
+import org.apache.camel.itest.springboot.common.ArchetypeConfig;
import org.junit.jupiter.api.Test;
public class CamelJooqIT extends AbstractSpringBootBaseTestSupport {
+ @Override
+ protected ArchetypeConfig getArchetypeConfig() {
+ // Spring Boot manages a Java 21 version of jOOQ; this test runs on
Java 17.
+ return baseArchetypeConfig()
+ .dependency("org.jooq:jooq:" +
System.getProperty("jooq-version"))
+ .build();
+ }
+
@Test
void componentTest() {
assertComponent(inferComponentName(getClass()));
