This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new cc707706eef Fix camel-jira-starter tests on Camel-Spring-Boot Daily
#399/#400
cc707706eef is described below
commit cc707706eefd4fb603de66391bf104e717f2eb5c
Author: croway <[email protected]>
AuthorDate: Wed Oct 14 09:51:02 2026 +0200
Fix camel-jira-starter tests on Camel-Spring-Boot Daily #399/#400
CAMEL-25544 made the camel-jira write producers call claim() on the
Promise returned by IssueRestClient, so the test mocks must return a
completed Promise instead of null.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../component/jira/springboot/test/AddCommentProducerTest.java | 5 +++--
.../jira/springboot/test/AddIssueLinkProducerTest.java | 10 ++++++----
.../component/jira/springboot/test/AddWorkLogProducerTest.java | 5 +++--
.../component/jira/springboot/test/AttachFileProducerTest.java | 2 +-
.../jira/springboot/test/DeleteIssueProducerTest.java | 2 +-
.../jira/springboot/test/TransitionIssueProducerTest.java | 2 +-
.../component/jira/springboot/test/WatcherProducerTest.java | 4 ++--
7 files changed, 17 insertions(+), 13 deletions(-)
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
index 8fc7f5881cf..aebbdb7dc21 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddCommentProducerTest.java
@@ -51,6 +51,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import io.atlassian.util.concurrent.Promise;
import io.atlassian.util.concurrent.Promises;
import org.springframework.beans.factory.annotation.Autowired;
@@ -102,14 +103,14 @@ public class AddCommentProducerTest {
.thenReturn(jiraClient);
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
- when(issueRestClient.addComment(any(),
any())).then((Answer<Void>) inv -> {
+ when(issueRestClient.addComment(any(),
any())).then((Answer<Promise<Void>>) inv -> {
Collection<Comment> comments = new ArrayList<>();
for (Comment c : backendIssue.getComments()) {
comments.add(c);
}
comments.add(newComment(backendIssue.getId(),
comments.size() + 1, comment));
backendIssue =
createIssueWithComments(backendIssue.getId(), comments);
- return null;
+ return Promises.promise(null);
});
backendIssue = createIssueWithComments(1, 1);
when(issueRestClient.getIssue(any())).then(inv ->
Promises.promise(backendIssue));
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
index 2e4f6a86f61..3cd6dd50c95 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddIssueLinkProducerTest.java
@@ -43,6 +43,8 @@ import
com.atlassian.jira.rest.client.api.JiraRestClientFactory;
import com.atlassian.jira.rest.client.api.domain.Issue;
import com.atlassian.jira.rest.client.api.domain.IssueLink;
import com.atlassian.jira.rest.client.api.domain.input.LinkIssuesInput;
+import io.atlassian.util.concurrent.Promise;
+import io.atlassian.util.concurrent.Promises;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
@@ -130,11 +132,11 @@ public class AddIssueLinkProducerTest {
headers.put(CHILD_ISSUE_KEY, childIssue.getKey());
headers.put(LINK_TYPE, linkType);
-
when(issueRestClient.linkIssue(any(LinkIssuesInput.class))).then((Answer<Void>)
inv -> {
+
when(issueRestClient.linkIssue(any(LinkIssuesInput.class))).then((Answer<Promise<Void>>)
inv -> {
Collection<IssueLink> links = new ArrayList<>();
links.add(newIssueLink(childIssue.getId(), 1, comment));
parentIssue = createIssueWithLinks(parentIssue.getId(), links);
- return null;
+ return Promises.promise(null);
});
template.sendBodyAndHeaders(comment, headers);
@@ -153,11 +155,11 @@ public class AddIssueLinkProducerTest {
headers.put(CHILD_ISSUE_KEY, childIssue.getKey());
headers.put(LINK_TYPE, linkType);
-
when(issueRestClient.linkIssue(any(LinkIssuesInput.class))).then((Answer<Void>)
inv -> {
+
when(issueRestClient.linkIssue(any(LinkIssuesInput.class))).then((Answer<Promise<Void>>)
inv -> {
Collection<IssueLink> links = new ArrayList<>();
links.add(newIssueLink(childIssue.getId(), 1, null));
parentIssue = createIssueWithLinks(parentIssue.getId(), links);
- return null;
+ return Promises.promise(null);
});
template.sendBodyAndHeaders(null, headers);
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
index 8810cfce60c..7796a0e4430 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AddWorkLogProducerTest.java
@@ -61,6 +61,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import io.atlassian.util.concurrent.Promise;
import io.atlassian.util.concurrent.Promises;
import org.springframework.beans.factory.annotation.Autowired;
@@ -129,11 +130,11 @@ public class AddWorkLogProducerTest {
headers.put(MINUTES_SPENT, minutesSpent);
String comment = "A new test comment " + new Date();
- when(issueRestClient.addWorklog(any(URI.class),
any(WorklogInput.class))).then((Answer<Void>) inv -> {
+ when(issueRestClient.addWorklog(any(URI.class),
any(WorklogInput.class))).then((Answer<Promise<Void>>) inv -> {
Collection<Worklog> workLogs = new ArrayList<>();
workLogs.add(newWorkLog(backendIssue.getId(), minutesSpent,
comment));
backendIssue = createIssueWithWorkLogs(backendIssue.getId(),
workLogs);
- return null;
+ return Promises.promise(null);
});
template.sendBodyAndHeaders(comment, headers);
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
index 839d669a35e..3916f8e5b96 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/AttachFileProducerTest.java
@@ -123,7 +123,7 @@ public class AttachFileProducerTest {
issue = createIssueWithAttachment(issue.getId(),
issue.getSummary(), issue.getKey(),
issue.getIssueType(), issue.getDescription(),
issue.getPriority(), issue.getAssignee(),
attachments);
- return null;
+ return Promises.promise(null);
});
camelContext.getRegistry().bind(JIRA_REST_CLIENT_FACTORY,
jiraRestClientFactory);
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
index df1ed9e6660..d46a8cd5f63 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/DeleteIssueProducerTest.java
@@ -102,7 +102,7 @@ public class DeleteIssueProducerTest {
when(issueRestClient.getIssue(any())).then(inv ->
Promises.promise(issue));
when(issueRestClient.deleteIssue(anyString(),
anyBoolean())).then(inv -> {
issue = null;
- return null;
+ return Promises.promise(null);
});
camelContext.getRegistry().bind(JIRA_REST_CLIENT_FACTORY,
jiraRestClientFactory);
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
index 6663789bd70..d74dde6497e 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/TransitionIssueProducerTest.java
@@ -110,7 +110,7 @@ public class TransitionIssueProducerTest {
Status status = new Status(doneStatusUri, 1L, "Done",
"Done", null, null);
Resolution resolution = new Resolution(doneResolutionUri,
1L, "Resolution", "Resolution");
issue = transitionIssueDone(issue, status, resolution);
- return null;
+ return Promises.promise(null);
});
camelContext.getRegistry().bind(JIRA_REST_CLIENT_FACTORY,
jiraRestClientFactory);
diff --git
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
index b2bda4cc7e9..8cb0af43421 100644
---
a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
+++
b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/WatcherProducerTest.java
@@ -126,7 +126,7 @@ public class WatcherProducerTest {
backendIssue = createIssue(backendIssue.getId(),
backendIssue.getSummary(), backendIssue.getKey(),
backendIssue.getIssueType(),
backendIssue.getDescription(), backendIssue.getPriority(),
backendIssue.getAssignee(), null, basicWatchers);
- return null;
+ return Promises.promise(null);
});
lenient().when(issueRestClient.removeWatcher(any(URI.class),
anyString())).then(inv -> {
String username = inv.getArgument(1);
@@ -135,7 +135,7 @@ public class WatcherProducerTest {
backendIssue = createIssue(backendIssue.getId(),
backendIssue.getSummary(), backendIssue.getKey(),
backendIssue.getIssueType(),
backendIssue.getDescription(), backendIssue.getPriority(),
backendIssue.getAssignee(), null, basicWatchers);
- return null;
+ return Promises.promise(null);
});
lenient().when(issueRestClient.getIssue(anyString())).then(inv
-> Promises.promise(backendIssue));
lenient().when(issueRestClient.getWatchers(any(URI.class))).then(inv -> {
