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 982854eaee55ee873d5a128314155e4801b99346
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 25 09:43:58 2020 +0200
[CAMEL-11807] Upgrade camel-git to junit5
---
components/camel-git/pom.xml | 2 +-
.../apache/camel/component/git/GitTestSupport.java | 9 +++++++-
.../component/git/consumer/GitConsumerTest.java | 5 ++++-
.../component/git/producer/GitProducerTest.java | 25 +++++++++++++++-------
.../git/producer/GitRemoteProducerTest.java | 9 +++++---
5 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/components/camel-git/pom.xml b/components/camel-git/pom.xml
index 9018426..36adb3b 100644
--- a/components/camel-git/pom.xml
+++ b/components/camel-git/pom.xml
@@ -48,7 +48,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-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
index 98f6ebc..d1d8952 100644
---
a/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
+++
b/components/camel-git/src/test/java/org/apache/camel/component/git/GitTestSupport.java
@@ -19,12 +19,17 @@ package org.apache.camel.component.git;
import java.io.File;
import java.io.IOException;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class GitTestSupport extends CamelTestSupport {
@@ -46,6 +51,7 @@ public class GitTestSupport extends CamelTestSupport {
public final String remoteUriTest =
"https://github.com/oscerd/json-webserver-example.git";;
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
@@ -55,6 +61,7 @@ public class GitTestSupport extends CamelTestSupport {
path.deleteOnExit();
}
+ @AfterEach
@Override
public void tearDown() throws Exception {
super.tearDown();
diff --git
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
index ba39d3e..a7e3386 100644
---
a/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
+++
b/components/camel-git/src/test/java/org/apache/camel/component/git/consumer/GitConsumerTest.java
@@ -28,7 +28,10 @@ import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.lib.ObjectIdRef;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
-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.assertTrue;
public class GitConsumerTest extends GitTestSupport {
diff --git
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
index 63d8cf7..ec0e4a3 100644
---
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
+++
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitProducerTest.java
@@ -41,7 +41,13 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GitProducerTest extends GitTestSupport {
@@ -129,12 +135,14 @@ public class GitProducerTest extends GitTestSupport {
git.close();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void doubleCloneOperationTest() throws Exception {
- template.sendBody("direct:clone", "");
- template.sendBody("direct:clone", "");
- File gitDir = new File(gitLocalRepo, ".git");
- assertEquals(gitDir.exists(), true);
+ assertThrows(CamelExecutionException.class, () -> {
+ template.sendBody("direct:clone", "");
+ template.sendBody("direct:clone", "");
+ File gitDir = new File(gitLocalRepo, ".git");
+ assertEquals(gitDir.exists(), true);
+ });
}
@Test
@@ -226,7 +234,7 @@ public class GitProducerTest extends GitTestSupport {
git.close();
}
- @Test(expected = CamelExecutionException.class)
+ @Test
public void commitTestAllowEmptyFalse() throws Exception {
// Init
Git git = getGitTestRepository();
@@ -242,7 +250,8 @@ public class GitProducerTest extends GitTestSupport {
// Test camel-git commit (with allowEmpty set to false)
Map<String, Object> headers = new HashMap<>();
headers.put(GitConstants.GIT_COMMIT_MESSAGE, commitMessage);
- template.requestBodyAndHeaders("direct:commit-not-allow-empty", "",
headers);
+ assertThrows(CamelExecutionException.class,
+ () ->
template.requestBodyAndHeaders("direct:commit-not-allow-empty", "", headers));
// Check : An exception should have been raised
}
diff --git
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
index 3eec00a..d83c79e 100644
---
a/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
+++
b/components/camel-git/src/test/java/org/apache/camel/component/git/producer/GitRemoteProducerTest.java
@@ -26,12 +26,15 @@ import org.apache.camel.component.git.GitTestSupport;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.lib.Repository;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GitRemoteProducerTest extends GitTestSupport {
- @Ignore("Require a remote git repository")
+ @Disabled("Require a remote git repository")
@Test
public void pushTest() throws Exception {
