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 ff117f88bbaa13fb59706b0dfee522f96f9e49cf
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 25 09:46:14 2020 +0200
[CAMEL-11807] Upgrade camel-github to junit5
---
components/camel-github/pom.xml | 2 +-
.../apache/camel/component/github/GitHubComponentTestBase.java | 8 ++++++--
.../camel/component/github/consumer/CommitConsumerTest.java | 2 +-
.../component/github/consumer/PullRequestCommentConsumerTest.java | 2 +-
.../camel/component/github/consumer/PullRequestConsumerTest.java | 2 +-
.../apache/camel/component/github/consumer/TagConsumerTest.java | 2 +-
.../component/github/producer/ClosePullRequestProducerTest.java | 7 +++++--
.../camel/component/github/producer/CreateIssueProducerTest.java | 4 +++-
.../component/github/producer/PullRequestCommentProducerTest.java | 8 +++++---
.../component/github/producer/PullRequestFilesProducerTest.java | 4 +++-
.../component/github/producer/PullRequestStateProducerTest.java | 6 +++++-
11 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index 124e8bf..4af5e4c 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -52,7 +52,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java
index bd8fd61..5c8a2f3 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java
@@ -23,11 +23,15 @@ import
org.apache.camel.component.github.services.MockIssueService;
import org.apache.camel.component.github.services.MockPullRequestService;
import org.apache.camel.component.github.services.MockRepositoryService;
import org.apache.camel.component.mock.MockEndpoint;
-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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class GitHubComponentTestBase extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@BindToRegistry(GitHubConstants.GITHUB_COMMIT_SERVICE)
protected MockCommitService commitService = new MockCommitService();
@BindToRegistry(GitHubConstants.GITHUB_REPOSITORY_SERVICE)
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
index 48998dc..694d4ce 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.github.GitHubComponent;
import org.apache.camel.component.github.GitHubComponentTestBase;
import org.eclipse.egit.github.core.RepositoryCommit;
import org.eclipse.egit.github.core.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CommitConsumerTest extends GitHubComponentTestBase {
@Override
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java
index ea1bb48..6c5b838 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java
@@ -25,7 +25,7 @@ import
org.apache.camel.component.github.GitHubComponentTestBase;
import org.eclipse.egit.github.core.Comment;
import org.eclipse.egit.github.core.CommitComment;
import org.eclipse.egit.github.core.PullRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java
index 2373f2f..6cbeb89 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.github.GitHubComponent;
import org.apache.camel.component.github.GitHubComponentTestBase;
import org.eclipse.egit.github.core.PullRequest;
import org.eclipse.egit.github.core.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java
index 844dc34..7571775 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.github.GitHubComponent;
import org.apache.camel.component.github.GitHubComponentTestBase;
import org.eclipse.egit.github.core.RepositoryTag;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TagConsumerTest extends GitHubComponentTestBase {
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java
index 8a433b6..6c77ffc 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java
@@ -28,10 +28,13 @@ import org.apache.camel.component.github.GitHubComponent;
import org.apache.camel.component.github.GitHubComponentTestBase;
import org.apache.camel.component.github.GitHubConstants;
import org.eclipse.egit.github.core.PullRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ClosePullRequestProducerTest extends GitHubComponentTestBase {
public static final String PULL_REQUEST_PRODUCER_ENDPOINT =
"direct:validPullRequest";
protected static final Logger LOG =
LoggerFactory.getLogger(ClosePullRequestProducerTest.class);
@@ -81,7 +84,7 @@ public class ClosePullRequestProducerTest extends
GitHubComponentTestBase {
}
}
- assertTrue("Didn't find pull request " + latestPullRequestId, found);
+ assertTrue(found, "Didn't find pull request " + latestPullRequestId);
}
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/CreateIssueProducerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/CreateIssueProducerTest.java
index b102abb..10c2d09 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/CreateIssueProducerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/CreateIssueProducerTest.java
@@ -28,7 +28,9 @@ import
org.apache.camel.component.github.GitHubComponentTestBase;
import org.apache.camel.component.github.GitHubConstants;
import org.eclipse.egit.github.core.Issue;
import org.eclipse.egit.github.core.Repository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CreateIssueProducerTest extends GitHubComponentTestBase {
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java
index 17333e1..2a477ac 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java
@@ -30,10 +30,12 @@ import
org.apache.camel.component.github.GitHubComponentTestBase;
import org.apache.camel.component.github.GitHubConstants;
import org.eclipse.egit.github.core.CommitComment;
import org.eclipse.egit.github.core.PullRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class PullRequestCommentProducerTest extends GitHubComponentTestBase {
protected static final Logger LOG =
LoggerFactory.getLogger(PullRequestCommentProducerTest.class);
private long latestPullRequestId;
@@ -72,8 +74,8 @@ public class PullRequestCommentProducerTest extends
GitHubComponentTestBase {
List<CommitComment> commitComments =
pullRequestService.getComments(null, (int) pullRequest.getId());
assertEquals(1, commitComments.size());
CommitComment commitComment = commitComments.get(0);
- assertEquals("Commit IDs did not match ",
Long.toString(pullRequest.getId()), commitComment.getCommitId());
- assertEquals("Comment text did not match ", commentText,
commitComment.getBodyText());
+ assertEquals(Long.toString(pullRequest.getId()),
commitComment.getCommitId(), "Commit IDs did not match");
+ assertEquals(commentText, commitComment.getBodyText(), "Comment text
did not match");
}
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java
index dcb53ab..6c8e4fad1 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java
@@ -30,10 +30,12 @@ import
org.apache.camel.component.github.GitHubComponentTestBase;
import org.apache.camel.component.github.GitHubConstants;
import org.eclipse.egit.github.core.CommitFile;
import org.eclipse.egit.github.core.PullRequest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class PullRequestFilesProducerTest extends GitHubComponentTestBase {
protected static final Logger LOG =
LoggerFactory.getLogger(PullRequestFilesProducerTest.class);
private int latestPullRequestNumber;
diff --git
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java
index cc6cfba..8904463 100644
---
a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java
+++
b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java
@@ -28,7 +28,11 @@ import org.apache.camel.component.github.GitHubComponent;
import org.apache.camel.component.github.GitHubComponentTestBase;
import org.apache.camel.component.github.GitHubConstants;
import org.eclipse.egit.github.core.CommitStatus;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class PullRequestStateProducerTest extends GitHubComponentTestBase {
private String commitsha;
