You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/10/13 14:27:06 UTC
[camel] 01/02: CAMEL-16484: camel-dropbox - Fix existing tests and doc
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-16484/dropbox-v5
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dcc2e4e0af371eecbed8428b9b5e901bfdbd9ee2
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Thu Oct 13 16:02:11 2022 +0200
CAMEL-16484: camel-dropbox - Fix existing tests and doc
---
.../src/main/docs/dropbox-component.adoc | 4 ++--
.../consumer/DropboxConsumerGetSingleIT.java | 20 ++++++++++----------
.../consumer/DropboxConsumerSearchQueryIT.java | 20 ++++++++++----------
.../producer/DropboxProducerGetFolderIT.java | 11 +++++++----
.../producer/DropboxProducerPutSingleFileIT.java | 19 ++++++++++---------
5 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
index eb5d89c370d..c62480acb8d 100644
--- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
+++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
@@ -173,9 +173,9 @@ The following objects are set on message body result:
|===
|Object type |Description
-|`ByteArrayOutputStream` |in case of single file download, stream representing the file downloaded
+|`byte[]` or `CachedOutputStream` if stream caching is enabled |in case of single file download, stream representing the file downloaded
-|`Map<String, ByteArrayOutputStream>` |in case of multiple files download, a map with as key the path of the
+|`Map<String, byte[]>` or `Map<String, CachedOutputStream>` if stream caching is enabled |in case of multiple files download, a map with as key the path of the
remote file downloaded and as value the stream representing the file
downloaded
|===
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java
index dad8edc993a..89cf369fdcc 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleIT.java
@@ -24,21 +24,21 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
-public class DropboxConsumerGetSingleIT extends DropboxTestSupport {
+class DropboxConsumerGetSingleIT extends DropboxTestSupport {
public static final String FILE_NAME = "myFile.txt";
@Test
- public void testCamelDropbox() throws Exception {
+ void testCamelDropbox() throws Exception {
final String content = "Hi camels";
createFile(FILE_NAME, content);
- context.start();
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.expectedBodiesReceived(content);
mock.expectedHeaderReceived(DropboxResultHeader.DOWNLOADED_FILE.name(), String.format("%s/%s", workdir, FILE_NAME));
+
+ context.getRouteController().startRoute("consumer");
mock.assertIsSatisfied();
}
@@ -46,12 +46,12 @@ public class DropboxConsumerGetSingleIT extends DropboxTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(String.format("dropbox://get?accessToken={{accessToken}}" +
- "&expireIn={{expireIn}}" +
- "&refreshToken={{refreshToken}}" +
- "&apiKey={{apiKey}}&apiSecret={{apiSecret}}" +
- "&remotePath=%s/%s",
- workdir, FILE_NAME))
+ fromF("dropbox://get?accessToken={{accessToken}}" +
+ "&expireIn={{expireIn}}" +
+ "&refreshToken={{refreshToken}}" +
+ "&apiKey={{apiKey}}&apiSecret={{apiSecret}}" +
+ "&remotePath=%s/%s",
+ workdir, FILE_NAME)
.autoStartup(false).id("consumer")
.to("mock:result");
}
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java
index bc6b83c29f4..925d6ec0177 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryIT.java
@@ -24,20 +24,20 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
-public class DropboxConsumerSearchQueryIT extends DropboxTestSupport {
+class DropboxConsumerSearchQueryIT extends DropboxTestSupport {
public static final String FILE_NAME = "myTestFile.txt";
@Test
- public void testCamelDropbox() throws Exception {
+ void testCamelDropbox() throws Exception {
final String content = "Hi camels";
createFile(FILE_NAME, content);
- context.start();
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
mock.message(0).header(DropboxResultHeader.FOUND_FILES.name()).contains(String.format("%s/%s", workdir, FILE_NAME));
+
+ context.getRouteController().startRoute("consumer");
mock.assertIsSatisfied();
}
@@ -45,12 +45,12 @@ public class DropboxConsumerSearchQueryIT extends DropboxTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(String.format("dropbox://search?accessToken={{accessToken}}" +
- "&expireIn={{expireIn}}" +
- "&refreshToken={{refreshToken}}" +
- "&apiKey={{apiKey}}&apiSecret={{apiSecret}}" +
- "&remotePath=%s&query=%s",
- workdir, FILE_NAME))
+ fromF("dropbox://search?accessToken={{accessToken}}" +
+ "&expireIn={{expireIn}}" +
+ "&refreshToken={{refreshToken}}" +
+ "&apiKey={{apiKey}}&apiSecret={{apiSecret}}" +
+ "&remotePath=%s&query=%s",
+ workdir, FILE_NAME)
.id("consumer").autoStartup(false)
.to("mock:result");
}
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java
index efbca85bea8..a270cd16b34 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderIT.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.condition.EnabledIf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
-public class DropboxProducerGetFolderIT extends DropboxTestSupport {
+class DropboxProducerGetFolderIT extends DropboxTestSupport {
public static final String FILE_NAME1 = "myFile.txt";
public static final String FILE_NAME2 = "myFile2.txt";
@@ -45,17 +45,17 @@ public class DropboxProducerGetFolderIT extends DropboxTestSupport {
}
@Test
- public void testCamelDropbox() throws Exception {
+ void testCamelDropbox() throws Exception {
test("direct:start");
}
@Test
- public void testCamelDropboxWithOptionInHeader() throws Exception {
+ void testCamelDropboxWithOptionInHeader() throws Exception {
test("direct:start2");
}
@Test
- public void testCamelDropboxHeaderHasPriorityOnParameter() throws Exception {
+ void testCamelDropboxHeaderHasPriorityOnParameter() throws Exception {
test("direct:start3");
}
@@ -79,6 +79,7 @@ public class DropboxProducerGetFolderIT extends DropboxTestSupport {
return new RouteBuilder() {
public void configure() {
from("direct:start")
+ .noStreamCaching()
.to("dropbox://get?accessToken={{accessToken}}" +
"&expireIn={{expireIn}}" +
"&refreshToken={{refreshToken}}" +
@@ -87,6 +88,7 @@ public class DropboxProducerGetFolderIT extends DropboxTestSupport {
.to("mock:result");
from("direct:start2")
+ .noStreamCaching()
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir))
.to("dropbox://get?accessToken={{accessToken}}" +
"&expireIn={{expireIn}}" +
@@ -95,6 +97,7 @@ public class DropboxProducerGetFolderIT extends DropboxTestSupport {
.to("mock:result");
from("direct:start3")
+ .noStreamCaching()
.setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir))
.to("dropbox://get?accessToken={{accessToken}}" +
"&expireIn={{expireIn}}" +
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
index f869ce66e88..7613ee7cf11 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileIT.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
import org.apache.camel.component.dropbox.util.DropboxConstants;
@@ -35,14 +36,14 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@EnabledIf("org.apache.camel.component.dropbox.integration.DropboxTestSupport#hasCredentials")
-public class DropboxProducerPutSingleFileIT extends DropboxTestSupport {
+class DropboxProducerPutSingleFileIT extends DropboxTestSupport {
public static final String FILENAME = "newFile.txt";
@Test
- public void testCamelDropboxWithOptionInHeader() throws Exception {
+ void testCamelDropboxWithOptionInHeader() throws Exception {
final Path file = Files.createTempFile("camel", ".txt");
final Map<String, Object> headers = new HashMap<>();
headers.put(DropboxConstants.HEADER_LOCAL_PATH, file.toAbsolutePath().toString());
@@ -53,25 +54,25 @@ public class DropboxProducerPutSingleFileIT extends DropboxTestSupport {
}
@Test
- public void uploadBodyTest() throws Exception {
- template.sendBodyAndHeader("direct:start", "Helo Camels", DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.add);
+ void uploadBodyTest() throws Exception {
+ template.sendBodyAndHeader("direct:start", "Hello Camels", DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.add);
assertFileUploaded();
}
@Test
- public void uploadIfExistsAddTest() throws Exception {
+ void uploadIfExistsAddTest() throws Exception {
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);
- assertThrows(DropboxException.class,
- () -> template.sendBodyAndHeaders("direct:start", null, headers));
+ Exchange exchange = template.send("direct:start", ex -> ex.getIn().setHeaders(headers));
+ assertInstanceOf(DropboxException.class, exchange.getException());
}
@Test
- public void uploadIfExistsForceTest() throws Exception {
+ void uploadIfExistsForceTest() throws Exception {
final String newContent = UUID.randomUUID().toString();
createFile(FILENAME, "Hi camels");
final Path file = Files.createTempFile("camel", ".txt");