This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9926ebcd2e56cad41fa427a2fcf61a78f6320946
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 10:38:49 2020 +0200
[CAMEL-11807] Upgrade camel-jira to junit5
---
components/camel-jira/pom.xml | 8 ++---
.../jira/JiraComponentConfigurationTest.java | 6 ++--
.../jira/consumer/NewCommentsConsumerTest.java | 14 ++++----
.../jira/consumer/NewIssuesConsumerTest.java | 14 ++++----
.../jira/producer/AddCommentProducerTest.java | 11 +++---
.../jira/producer/AddIssueLinkProducerTest.java | 18 ++++++----
.../jira/producer/AddIssueProducerTest.java | 39 +++++++++++++---------
.../jira/producer/AddWorkLogProducerTest.java | 20 ++++++-----
.../jira/producer/AttachFileProducerTest.java | 11 +++---
.../jira/producer/DeleteIssueProducerTest.java | 12 ++++---
.../jira/producer/FetchCommentsProducerTest.java | 18 ++++++----
.../jira/producer/FetchIssueProducerTest.java | 18 ++++++----
.../jira/producer/TransitionIssueProducerTest.java | 11 +++---
.../jira/producer/UpdateIssueProducerTest.java | 21 ++++++++----
.../jira/producer/WatcherProducerTest.java | 32 ++++++++++--------
15 files changed, 149 insertions(+), 104 deletions(-)
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index a23cff7..59d8dd2 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -84,17 +84,17 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
index 41c5211..5e7ee5c 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/JiraComponentConfigurationTest.java
@@ -17,8 +17,10 @@
package org.apache.camel.component.jira;
import com.google.common.base.Joiner;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JiraComponentConfigurationTest extends CamelTestSupport {
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
index 08d90fe0..a2fdec2 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewCommentsConsumerTest.java
@@ -36,12 +36,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
@@ -54,7 +54,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class NewCommentsConsumerTest extends CamelTestSupport {
private static List<Issue> issues = new ArrayList<>();
@@ -81,7 +81,7 @@ public class NewCommentsConsumerTest extends CamelTestSupport
{
registry.bind(JIRA_REST_CLIENT_FACTORY, jiraRestClientFactory);
}
- @BeforeClass
+ @BeforeAll
public static void beforeAll() {
issues.add(createIssueWithComments(1L, 1));
issues.add(createIssueWithComments(2L, 1));
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java
index 8a6d932..a267ebb 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/consumer/NewIssuesConsumerTest.java
@@ -33,12 +33,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
@@ -49,7 +49,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class NewIssuesConsumerTest extends CamelTestSupport {
private static List<Issue> issues = new ArrayList<>();
@@ -71,7 +71,7 @@ public class NewIssuesConsumerTest extends CamelTestSupport {
registry.bind(JIRA_REST_CLIENT_FACTORY, jiraRestClientFactory);
}
- @BeforeClass
+ @BeforeAll
public static void beforeAll() {
issues.add(createIssue(1L));
issues.add(createIssue(2L));
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java
index de60564..f770718 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddCommentProducerTest.java
@@ -34,11 +34,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
@@ -47,10 +47,11 @@ import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FAC
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.Utils.createIssueWithComments;
import static org.apache.camel.component.jira.Utils.newComment;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class AddCommentProducerTest extends CamelTestSupport {
@Mock
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java
index 04e59fe..d9c19cf 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueLinkProducerTest.java
@@ -37,11 +37,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import static org.apache.camel.component.jira.JiraConstants.CHILD_ISSUE_KEY;
@@ -53,12 +53,16 @@ import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS
import static org.apache.camel.component.jira.Utils.createIssue;
import static org.apache.camel.component.jira.Utils.createIssueWithLinks;
import static org.apache.camel.component.jira.Utils.newIssueLink;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class AddIssueLinkProducerTest extends CamelTestSupport {
@Mock
@@ -95,8 +99,8 @@ public class AddIssueLinkProducerTest extends
CamelTestSupport {
}
public void setMocks() {
- when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
- when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
+
lenient().when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
+
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
parentIssue = createIssue(1);
childIssue = createIssue(2);
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java
index 477282c..1a00e1b 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddIssueProducerTest.java
@@ -41,21 +41,30 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.apache.camel.component.jira.JiraConstants.*;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_ASSIGNEE;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_PRIORITY_ID;
+import static
org.apache.camel.component.jira.JiraConstants.ISSUE_PRIORITY_NAME;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_PROJECT_KEY;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_SUMMARY;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_ID;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_NAME;
+import static org.apache.camel.component.jira.JiraConstants.JIRA;
+import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.Utils.createIssue;
import static org.apache.camel.component.jira.Utils.userAssignee;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class AddIssueProducerTest extends CamelTestSupport {
@Mock
@@ -84,23 +93,23 @@ public class AddIssueProducerTest extends CamelTestSupport {
}
public void setMocks() {
- when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
- when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
- when(jiraClient.getMetadataClient()).thenReturn(metadataRestClient);
+
lenient().when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
+
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
+
lenient().when(jiraClient.getMetadataClient()).thenReturn(metadataRestClient);
Map<Integer, IssueType> issueTypes = new HashMap<>();
issueTypes.put(1, new IssueType(null, 1L, "Bug", false, null, null));
issueTypes.put(2, new IssueType(null, 2L, "Task", false, null, null));
Promise<Iterable<IssueType>> promiseIssueTypes =
Promises.promise(issueTypes.values());
- when(metadataRestClient.getIssueTypes()).thenReturn(promiseIssueTypes);
+
lenient().when(metadataRestClient.getIssueTypes()).thenReturn(promiseIssueTypes);
Map<Integer, Priority> issuePriorities = new HashMap<>();
issuePriorities.put(1, new Priority(null, 1L, "High", null, null,
null));
issuePriorities.put(2, new Priority(null, 2L, "Low", null, null,
null));
Promise<Iterable<Priority>> promisePriorities =
Promises.promise(issuePriorities.values());
- when(metadataRestClient.getPriorities()).thenReturn(promisePriorities);
+
lenient().when(metadataRestClient.getPriorities()).thenReturn(promisePriorities);
- when(issueRestClient.createIssue(any(IssueInput.class))).then(inv -> {
+
lenient().when(issueRestClient.createIssue(any(IssueInput.class))).then(inv -> {
IssueInput issueInput = inv.getArgument(0);
String summary = (String)
issueInput.getField("summary").getValue();
Integer issueTypeId = Integer.parseInt(getValue(issueInput,
"issuetype", "id"));
@@ -113,7 +122,7 @@ public class AddIssueProducerTest extends CamelTestSupport {
BasicIssue basicIssue = new BasicIssue(backendIssue.getSelf(),
backendIssue.getKey(), backendIssue.getId());
return Promises.promise(basicIssue);
});
- when(issueRestClient.getIssue(any())).then(inv ->
Promises.promise(backendIssue));
+ lenient().when(issueRestClient.getIssue(any())).then(inv ->
Promises.promise(backendIssue));
}
private String getValue(IssueInput issueInput, String field, String key) {
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java
index 34fa2e7..a3e4e91 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AddWorkLogProducerTest.java
@@ -39,11 +39,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
@@ -54,13 +54,17 @@ import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS
import static org.apache.camel.component.jira.Utils.createIssueWithComments;
import static org.apache.camel.component.jira.Utils.createIssueWithWorkLogs;
import static org.apache.camel.component.jira.Utils.newWorkLog;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class AddWorkLogProducerTest extends CamelTestSupport {
@Mock
private JiraRestClient jiraClient;
@@ -85,11 +89,11 @@ public class AddWorkLogProducerTest extends
CamelTestSupport {
}
public void setMocks() {
- when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
- when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
+
lenient().when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
+
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
backendIssue = createIssueWithComments(1, 1);
- when(issueRestClient.getIssue(any())).then(inv ->
Promises.promise(backendIssue));
+ lenient().when(issueRestClient.getIssue(any())).then(inv ->
Promises.promise(backendIssue));
}
@Override
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java
index a4434e7..0698b4d 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/AttachFileProducerTest.java
@@ -39,11 +39,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
@@ -52,10 +52,11 @@ import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS
import static org.apache.camel.component.jira.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.Utils.createIssue;
import static org.apache.camel.component.jira.Utils.createIssueWithAttachment;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class AttachFileProducerTest extends CamelTestSupport {
@Mock
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java
index c376332..a3673f9 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/DeleteIssueProducerTest.java
@@ -31,11 +31,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
@@ -43,12 +43,14 @@ import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FAC
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.Utils.createIssue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DeleteIssueProducerTest extends CamelTestSupport {
@Mock
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java
index 6e14dbc..5096670 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchCommentsProducerTest.java
@@ -30,22 +30,26 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class FetchCommentsProducerTest extends CamelTestSupport {
@Mock
private JiraRestClient jiraClient;
@@ -71,8 +75,8 @@ public class FetchCommentsProducerTest extends
CamelTestSupport {
}
public void setMocks() {
- when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
- when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
+
lenient().when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
+
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
}
@Override
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java
index cec7c97..849d820 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/FetchIssueProducerTest.java
@@ -30,22 +30,26 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static org.apache.camel.component.jira.JiraConstants.JIRA;
import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.apache.camel.test.junit5.TestSupport.assertStringContains;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class FetchIssueProducerTest extends CamelTestSupport {
@Mock
private JiraRestClient jiraClient;
@@ -71,8 +75,8 @@ public class FetchIssueProducerTest extends CamelTestSupport {
}
public void setMocks() {
- when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
- when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
+
lenient().when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
+
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
}
@Override
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java
index 6922d3d..97037ea 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/TransitionIssueProducerTest.java
@@ -35,11 +35,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
import static
org.apache.camel.component.jira.JiraConstants.ISSUE_TRANSITION_ID;
@@ -50,10 +50,11 @@ import static
org.apache.camel.component.jira.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.JiraTestConstants.TEST_JIRA_URL;
import static org.apache.camel.component.jira.Utils.createIssue;
import static org.apache.camel.component.jira.Utils.transitionIssueDone;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class TransitionIssueProducerTest extends CamelTestSupport {
@Mock
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java
index 456c801..2239bcb2 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/UpdateIssueProducerTest.java
@@ -41,21 +41,28 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.apache.camel.component.jira.JiraConstants.*;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_ASSIGNEE;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
+import static
org.apache.camel.component.jira.JiraConstants.ISSUE_PRIORITY_NAME;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_SUMMARY;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_TYPE_NAME;
+import static org.apache.camel.component.jira.JiraConstants.JIRA;
+import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.Utils.createIssue;
import static org.apache.camel.component.jira.Utils.userAssignee;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class UpdateIssueProducerTest extends CamelTestSupport {
@Mock
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
index 7acb5a8..5595232 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/producer/WatcherProducerTest.java
@@ -39,22 +39,28 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.apache.camel.component.jira.JiraConstants.*;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_KEY;
+import static org.apache.camel.component.jira.JiraConstants.ISSUE_WATCHERS_ADD;
+import static
org.apache.camel.component.jira.JiraConstants.ISSUE_WATCHERS_REMOVE;
+import static org.apache.camel.component.jira.JiraConstants.JIRA;
+import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FACTORY;
import static
org.apache.camel.component.jira.JiraTestConstants.JIRA_CREDENTIALS;
import static org.apache.camel.component.jira.JiraTestConstants.KEY;
import static org.apache.camel.component.jira.JiraTestConstants.TEST_JIRA_URL;
import static org.apache.camel.component.jira.Utils.createIssue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class WatcherProducerTest extends CamelTestSupport {
@Mock
@@ -81,8 +87,8 @@ public class WatcherProducerTest extends CamelTestSupport {
}
public void setMocks() {
- when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
- when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
+
lenient().when(jiraRestClientFactory.createWithBasicHttpAuthentication(any(),
any(), any())).thenReturn(jiraClient);
+
lenient().when(jiraClient.getIssueClient()).thenReturn(issueRestClient);
backendwatchers.add("user1");
backendwatchers.add("user2");
@@ -92,7 +98,7 @@ public class WatcherProducerTest extends CamelTestSupport {
URI watchersUri = URI.create(TEST_JIRA_URL +
"/rest/api/2/backendIssue/" + KEY + "-11/backendwatchers");
BasicWatchers initialBasicWatchers = new BasicWatchers(watchersUri,
true, backendwatchers.size());
backendIssue = createIssue(11L, "Test backendIssue", KEY + "-" + 11,
null, null, null, null, null, initialBasicWatchers);
- when(issueRestClient.addWatcher(any(URI.class), anyString())).then(inv
-> {
+ lenient().when(issueRestClient.addWatcher(any(URI.class),
anyString())).then(inv -> {
String username = inv.getArgument(1);
backendwatchers.add(username);
BasicWatchers basicWatchers = new BasicWatchers(watchersUri, true,
backendwatchers.size());
@@ -100,7 +106,7 @@ public class WatcherProducerTest extends CamelTestSupport {
backendIssue.getPriority(), backendIssue.getAssignee(),
null, basicWatchers);
return null;
});
- when(issueRestClient.removeWatcher(any(URI.class),
anyString())).then(inv -> {
+ lenient().when(issueRestClient.removeWatcher(any(URI.class),
anyString())).then(inv -> {
String username = inv.getArgument(1);
backendwatchers.remove(username);
BasicWatchers basicWatchers = new BasicWatchers(watchersUri, true,
backendwatchers.size());
@@ -108,8 +114,8 @@ public class WatcherProducerTest extends CamelTestSupport {
backendIssue.getPriority(), backendIssue.getAssignee(),
null, basicWatchers);
return null;
});
- when(issueRestClient.getIssue(anyString())).then(inv ->
Promises.promise(backendIssue));
- when(issueRestClient.getWatchers(any(URI.class))).then(inv -> {
+ lenient().when(issueRestClient.getIssue(anyString())).then(inv ->
Promises.promise(backendIssue));
+ lenient().when(issueRestClient.getWatchers(any(URI.class))).then(inv
-> {
Collection<BasicUser> users = new ArrayList<>();
for (String watcher: backendwatchers) {
users.add(new BasicUser(null, watcher, watcher));
