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 99e9fb5bfec27558d98ad6b2f7c4205e47a4fd92 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 10:46:04 2020 +0200 [CAMEL-11807] Upgrade camel-dropbox to junit5 --- components/camel-dropbox/pom.xml | 6 +++--- .../dropbox/DropboxComponentVerifierExtensionTest.java | 11 ++++++----- .../camel/component/dropbox/DropboxConsumerTest.java | 11 ++++++----- .../dropbox/integration/DropboxTestSupport.java | 13 ++++++++----- .../consumer/DropboxConsumerGetSingleTest.java | 2 +- .../consumer/DropboxConsumerSearchQueryTest.java | 2 +- .../integration/producer/DropboxProducerDelTest.java | 6 +++--- .../producer/DropboxProducerGetFolderTest.java | 8 +++++--- .../producer/DropboxProducerGetSingleTest.java | 6 +++--- .../integration/producer/DropboxProducerMoveTest.java | 6 +++--- .../producer/DropboxProducerPutSingleFileTest.java | 18 +++++++----------- .../producer/DropboxProducerSearchQueryTest.java | 6 +++--- 12 files changed, 49 insertions(+), 46 deletions(-) diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml index 45c3265..93e2eac 100644 --- a/components/camel-dropbox/pom.xml +++ b/components/camel-dropbox/pom.xml @@ -68,7 +68,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> @@ -78,8 +78,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxComponentVerifierExtensionTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxComponentVerifierExtensionTest.java index f277925..4f7bf5d 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxComponentVerifierExtensionTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxComponentVerifierExtensionTest.java @@ -21,9 +21,10 @@ import java.util.Map; import org.apache.camel.Component; import org.apache.camel.component.extension.ComponentVerifierExtension; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -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 DropboxComponentVerifierExtensionTest extends CamelTestSupport { @@ -47,7 +48,7 @@ public class DropboxComponentVerifierExtensionTest extends CamelTestSupport { ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); } @Test @@ -61,7 +62,7 @@ public class DropboxComponentVerifierExtensionTest extends CamelTestSupport { ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); } } diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java index a264c79..64bc0da 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java @@ -20,9 +20,10 @@ import org.apache.camel.Consumer; import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.dropbox.integration.consumer.DropboxScheduledPollGetConsumer; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class DropboxConsumerTest extends CamelTestSupport { @@ -47,7 +48,7 @@ public class DropboxConsumerTest extends CamelTestSupport { Consumer consumer1 = dropboxEndpoint1.createConsumer(null); // Then - Assert.assertTrue(consumer1 instanceof DropboxScheduledPollGetConsumer); + assertTrue(consumer1 instanceof DropboxScheduledPollGetConsumer); // Given Endpoint dropboxEndpoint2 = context.getEndpoint("dropbox://get?accessToken=accessToken&remotePath=/path with spaces/file"); @@ -56,7 +57,7 @@ public class DropboxConsumerTest extends CamelTestSupport { Consumer consumer2 = dropboxEndpoint2.createConsumer(null); // Then - Assert.assertTrue(consumer2 instanceof DropboxScheduledPollGetConsumer); + assertTrue(consumer2 instanceof DropboxScheduledPollGetConsumer); } } \ No newline at end of file diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java index 501bf40..e45918d 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java @@ -27,11 +27,14 @@ import com.dropbox.core.DbxException; import com.dropbox.core.DbxRequestConfig; import com.dropbox.core.v2.DbxClientV2; import com.dropbox.core.v2.files.FileMetadata; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DropboxTestSupport extends CamelTestSupport { + private static final Logger LOG = LoggerFactory.getLogger(DropboxTestSupport.class); protected final Properties properties; protected String workdir; @@ -55,7 +58,7 @@ public class DropboxTestSupport extends CamelTestSupport { } - @Before + @BeforeEach public void setUpWorkingFolder() throws DbxException { createDir(workdir); } @@ -78,9 +81,9 @@ public class DropboxTestSupport extends CamelTestSupport { //wait some time for synchronization Thread.sleep(1000); } catch (DbxException e) { - log.info("folder is already created"); + LOG.info("folder is already created"); } catch (InterruptedException e) { - log.debug("Waiting for synchronization interrupted."); + LOG.debug("Waiting for synchronization interrupted."); } } diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java index b88917c..f59a077 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DropboxConsumerGetSingleTest extends DropboxTestSupport { diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java index 911d88f..9c29cf6 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java @@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DropboxConsumerSearchQueryTest extends DropboxTestSupport { diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java index 7648c49..6a2b25b 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java @@ -23,14 +23,14 @@ import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxConstants; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DropboxProducerDelTest extends DropboxTestSupport { public static final String FILE_NAME = "file.txt"; - @Before + @BeforeEach public void createFile() throws IOException { createFile(FILE_NAME, "content"); } diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java index 7f22752..df2a1b4 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java @@ -24,8 +24,10 @@ import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxConstants; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class DropboxProducerGetFolderTest extends DropboxTestSupport { @@ -34,7 +36,7 @@ public class DropboxProducerGetFolderTest extends DropboxTestSupport { private static final String CONTENT1 = "content1"; private static final String CONTENT2 = "content2"; - @Before + @BeforeEach public void createFile() throws IOException { createFile(FILE_NAME1, CONTENT1); createFile(FILE_NAME2, CONTENT2); diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java index faf375d..cde26b3 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java @@ -23,15 +23,15 @@ import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxConstants; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DropboxProducerGetSingleTest extends DropboxTestSupport { public static final String FILE_NAME = "myFile.txt"; public static final String CONTENT = "Hi camels"; - @Before + @BeforeEach public void createFile() throws IOException { createFile(FILE_NAME, CONTENT); } diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java index 495cf6f..94f1301 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java @@ -24,15 +24,15 @@ import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxConstants; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DropboxProducerMoveTest extends DropboxTestSupport { public static final String COPY_WORKDIR = "/test-workdir"; public static final String FILE = "file.txt"; - @Before + @BeforeEach public void removeDir() throws DbxException, IOException { createDir(COPY_WORKDIR); createFile(FILE, "content"); diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java index 2eee1e0..c47f184 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java @@ -31,18 +31,14 @@ import org.apache.camel.component.dropbox.util.DropboxException; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.dropbox.util.DropboxUploadMode; import org.apache.camel.component.mock.MockEndpoint; -import org.hamcrest.core.IsInstanceOf; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DropboxProducerPutSingleFileTest extends DropboxTestSupport { public static final String FILENAME = "newFile.txt"; - @Rule - public ExpectedException thrown = ExpectedException.none(); - @Test public void testCamelDropboxWithOptionInHeader() throws Exception { final Path file = Files.createTempFile("camel", ".txt"); @@ -63,13 +59,13 @@ public class DropboxProducerPutSingleFileTest extends DropboxTestSupport { @Test public void uploadIfExistsAddTest() throws Exception { - thrown.expectCause(IsInstanceOf.instanceOf(DropboxException.class)); createFile(FILENAME, "content"); final Path file = Files.createTempFile("camel", ".txt"); final Map<String, Object> headers = new HashMap<>(); headers.put(DropboxConstants.HEADER_LOCAL_PATH, file.toAbsolutePath().toString()); headers.put(DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.add); - template.sendBodyAndHeaders("direct:start", null, headers); + assertThrows(DropboxException.class, + () -> template.sendBodyAndHeaders("direct:start", null, headers)); } @Test @@ -88,7 +84,7 @@ public class DropboxProducerPutSingleFileTest extends DropboxTestSupport { assertFileUploaded(); - Assert.assertEquals(newContent, getFileContent(workdir + "/" + FILENAME)); + assertEquals(newContent, getFileContent(workdir + "/" + FILENAME)); } private void assertFileUploaded() throws InterruptedException { diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java index 4e88f60..3466fd5 100644 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java @@ -23,15 +23,15 @@ import org.apache.camel.component.dropbox.integration.DropboxTestSupport; import org.apache.camel.component.dropbox.util.DropboxConstants; import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DropboxProducerSearchQueryTest extends DropboxTestSupport { public static final String FILE_NAME = "myTestFile.txt"; - @Before + @BeforeEach public void createFile() throws IOException { final String content = "Hi camels"; createFile(FILE_NAME, content);
