This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch camel-spring-boot-4.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit e99c9d67227ab235b1f4b6726bb31d1ab6b547ea Author: Croway <[email protected]> AuthorDate: Mon Oct 20 10:01:58 2025 +0200 Align tests to new Jira API --- .../springboot/test/NewIssuesConsumerTest.java | 30 +++++++++++++++++----- .../component/jira/springboot/test/Utils.java | 9 +++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java index a92a91f8c63..41cfbd764f2 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/NewIssuesConsumerTest.java @@ -19,23 +19,28 @@ package org.apache.camel.component.jira.springboot.test; import static org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY; import static org.apache.camel.component.jira.springboot.test.JiraTestConstants.PROJECT; import static org.apache.camel.component.jira.springboot.test.Utils.createIssue; +import static org.apache.camel.component.jira.springboot.test.Utils.createIssueWithCreationDate; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import com.atlassian.jira.rest.client.api.IssueRestClient; import com.atlassian.jira.rest.client.api.JiraRestClient; import com.atlassian.jira.rest.client.api.JiraRestClientFactory; import com.atlassian.jira.rest.client.api.SearchRestClient; +import com.atlassian.jira.rest.client.api.UserRestClient; import com.atlassian.jira.rest.client.api.domain.Issue; import com.atlassian.jira.rest.client.api.domain.SearchResult; +import com.atlassian.jira.rest.client.api.domain.User; import org.apache.camel.CamelContext; import org.apache.camel.EndpointInject; import org.apache.camel.Produce; @@ -46,12 +51,14 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.CamelContextConfiguration; import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import io.atlassian.util.concurrent.Promise; import io.atlassian.util.concurrent.Promises; +import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; @@ -82,15 +89,17 @@ public class NewIssuesConsumerTest { static IssueRestClient issueRestClient; + static UserRestClient userRestClient; + static SearchRestClient searchRestClient; static List<Issue> issues = new ArrayList<>(); @BeforeAll public static void beforeAll() { - issues.add(createIssue(1L)); - issues.add(createIssue(2L)); - issues.add(createIssue(3L)); + issues.add(createIssueWithCreationDate(3L, DateTime.now().minusMinutes(10))); + issues.add(createIssueWithCreationDate(2L, DateTime.now().minusMinutes(8))); + issues.add(createIssueWithCreationDate(1L, DateTime.now().minusMinutes(6))); } @Bean @@ -103,13 +112,20 @@ public class NewIssuesConsumerTest { jiraClient = mock(JiraRestClient.class); issueRestClient = mock(IssueRestClient.class); searchRestClient = mock(SearchRestClient.class); + userRestClient = mock(UserRestClient.class); SearchResult result = new SearchResult(0, 50, 100, issues); Promise<SearchResult> promiseSearchResult = Promises.promise(result); + User user = new User( + null, "admin", null, null, true, null, + Map.of("48x48", URI.create("")), DateTime.now().getZone().getID()); + Promise<User> promiseUserResult = Promises.promise(user); when(jiraClient.getSearchClient()).thenReturn(searchRestClient); + when(jiraClient.getUserClient()).thenReturn(userRestClient); when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(), any(), any())) .thenReturn(jiraClient); when(searchRestClient.searchJql(any(), any(), any(), any())).thenReturn(promiseSearchResult); + when(userRestClient.getUser(any(URI.class))).thenReturn(promiseUserResult); camelContext.getRegistry().bind(JIRA_REST_CLIENT_FACTORY, jiraRestClientFactory); } @@ -128,7 +144,7 @@ public class NewIssuesConsumerTest { @Test public void singleIssueTest() throws Exception { - Issue issue = createIssue(11); + Issue issue = createIssueWithCreationDate(11, DateTime.now()); reset(searchRestClient); AtomicBoolean searched = new AtomicBoolean(); @@ -147,9 +163,9 @@ public class NewIssuesConsumerTest { @Test public void multipleIssuesTest() throws Exception { - Issue issue1 = createIssue(21); - Issue issue2 = createIssue(22); - Issue issue3 = createIssue(23); + Issue issue1 = createIssueWithCreationDate(21, DateTime.now()); + Issue issue2 = createIssueWithCreationDate(22, DateTime.now()); + Issue issue3 = createIssueWithCreationDate(23, DateTime.now()); reset(searchRestClient); AtomicBoolean searched = new AtomicBoolean(); diff --git a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/Utils.java b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/Utils.java index 9d72882e084..5da498a6f12 100644 --- a/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/Utils.java +++ b/components-starter/camel-jira-starter/src/test/java/org/apache/camel/component/jira/springboot/test/Utils.java @@ -66,6 +66,15 @@ public final class Utils { return createIssueWithComments(id, 0); } + public static Issue createIssueWithCreationDate(long id, DateTime dateTime) { + URI selfUri = URI.create(TEST_JIRA_URL + "/rest/api/latest/issue/" + id); + return new Issue( + "jira summary test " + id, selfUri, KEY + "-" + id, id, null, issueType, null, "Description " + id, + null, null, null, null, userAssignee, dateTime, null, null, null, null, null, null, null, null, null, + null, + null, null, null, null, null, null, null, null, null); + } + public static Issue createIssue(long id, String summary, String key, IssueType issueType, String description, BasicPriority priority, User assignee, Collection<BasicComponent> components, BasicWatchers watchers) { URI selfUri = URI.create(TEST_JIRA_URL + "/rest/api/latest/issue/" + id);
