Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8c37113 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8c37113 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8c37113 Branch: refs/heads/camel-2.16.x Commit: d8c3711394c085f8c75da776729d3985d573da36 Parents: 4fa2398 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jan 10 14:07:35 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jan 10 14:08:02 2016 +0100 ---------------------------------------------------------------------- .../camel/component/dropbox/DropboxConsumerTest.java | 11 ++++++----- .../dropbox/integration/DropboxTestSupport.java | 7 ++++--- .../consumer/DropboxConsumerGetSingleTest.java | 3 +-- .../consumer/DropboxConsumerSearchQueryTest.java | 3 +-- .../integration/consumer/DropboxConsumerSearchTest.java | 3 +-- .../integration/producer/DropboxProducerDelTest.java | 2 +- .../producer/DropboxProducerGetFolderTest.java | 2 +- .../producer/DropboxProducerGetSingleTest.java | 2 +- .../integration/producer/DropboxProducerMoveTest.java | 2 +- .../producer/DropboxProducerPutSingleFileTest.java | 2 +- .../DropboxProducerPutSingleFileWithRemotePathTest.java | 2 +- .../producer/DropboxProducerPutWithRemotePathTest.java | 2 +- .../producer/DropboxProducerSearchQueryTest.java | 2 +- .../integration/producer/DropboxProducerSearchTest.java | 3 +-- 14 files changed, 22 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java ---------------------------------------------------------------------- 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 1e6008d..8ae984a 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 @@ -19,21 +19,22 @@ package org.apache.camel.component.dropbox; import org.apache.camel.Consumer; import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.dropbox.integration.DropboxTestSupport; 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 static org.apache.camel.component.dropbox.util.DropboxOperation.get; +public class DropboxConsumerTest extends DropboxTestSupport { -public class DropboxConsumerTest extends CamelTestSupport { + public DropboxConsumerTest() throws Exception { + } @Override protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { @Override public void configure() throws Exception { - from("dropbox://" + get + "?accessToken=token&remotePath=/path").to("mock:test"); + from("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/path").to("mock:test"); } }; } @@ -41,7 +42,7 @@ public class DropboxConsumerTest extends CamelTestSupport { @Test public void shouldCreateGetConsumer() throws Exception { // Given - Endpoint dropboxEndpoint = context.getEndpoint("dropbox://" + get + "?accessToken=token&remotePath=/path"); + Endpoint dropboxEndpoint = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/path"); // When Consumer consumer = dropboxEndpoint.createConsumer(null); http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java ---------------------------------------------------------------------- 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 325066e..7e154a9 100755 --- 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 @@ -48,8 +48,9 @@ public class DropboxTestSupport extends CamelTestSupport { } } - protected String getAuthParams() { - return "accessToken=" + properties.get("accessToken") - + "&clientIdentifier=" + properties.get("clientIdentifier"); + @Override + protected Properties useOverridePropertiesWithPropertiesComponent() { + return properties; } + } http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java ---------------------------------------------------------------------- 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 71801b1..8ffa064 100755 --- 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 @@ -25,7 +25,6 @@ import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; - public class DropboxConsumerGetSingleTest extends DropboxTestSupport { public DropboxConsumerGetSingleTest() throws Exception { } @@ -49,7 +48,7 @@ public class DropboxConsumerGetSingleTest extends DropboxTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { - from("dropbox://get?" + getAuthParams() + "&remotePath=XXX") + from("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=XXX") .to("file:XXX") .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java ---------------------------------------------------------------------- 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 dce191c..e9f5f7f 100755 --- 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 @@ -25,7 +25,6 @@ import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; - public class DropboxConsumerSearchQueryTest extends DropboxTestSupport { public DropboxConsumerSearchQueryTest() throws Exception { } @@ -49,7 +48,7 @@ public class DropboxConsumerSearchQueryTest extends DropboxTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { - from("dropbox://search?" + getAuthParams() + "&remotePath=/XXX&query=XXX") + from("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX&query=XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java index 1eec3aa..5d135b7 100755 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java @@ -25,7 +25,6 @@ import org.apache.camel.component.dropbox.util.DropboxResultHeader; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; - public class DropboxConsumerSearchTest extends DropboxTestSupport { public DropboxConsumerSearchTest() throws Exception { } @@ -49,7 +48,7 @@ public class DropboxConsumerSearchTest extends DropboxTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { - from("dropbox://search?" + getAuthParams() + "&remotePath=/XXX") + from("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java ---------------------------------------------------------------------- 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 5768fd4..411abe0 100755 --- 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 @@ -58,7 +58,7 @@ public class DropboxProducerDelTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://del?" + getAuthParams() + "&remotePath=/XXX") + .to("dropbox://del?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java ---------------------------------------------------------------------- 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 6652304..ee2e0c4 100755 --- 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 @@ -60,7 +60,7 @@ public class DropboxProducerGetFolderTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://get?" + getAuthParams() + "&remotePath=/XXX") + .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java ---------------------------------------------------------------------- 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 d06c880..2313c55 100755 --- 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 @@ -58,7 +58,7 @@ public class DropboxProducerGetSingleTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://get?" + getAuthParams() + "&remotePath=/XXX") + .to("dropbox://get?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX") .to("file:///XXX?fileName=XXX") .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java ---------------------------------------------------------------------- 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 f797330..2416e90 100755 --- 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 @@ -58,7 +58,7 @@ public class DropboxProducerMoveTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://move?" + getAuthParams() + "&remotePath=/XXX&newRemotePath=/XXX") + .to("dropbox://move?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX&newRemotePath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java ---------------------------------------------------------------------- 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 1ff8204..e01c2de 100755 --- 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 @@ -58,7 +58,7 @@ public class DropboxProducerPutSingleFileTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://put?" + getAuthParams() + "&uploadMode=add&localPath=/XXX") + .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&uploadMode=add&localPath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java index a704ae3..df6eea9 100755 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java @@ -58,7 +58,7 @@ public class DropboxProducerPutSingleFileWithRemotePathTest extends DropboxTestS return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://put?" + getAuthParams() + "&uploadMode=add&localPath=/XXX&remotePath=/XXX") + .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&uploadMode=add&localPath=/XXX&remotePath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java index f99cb26..163136c 100755 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java @@ -59,7 +59,7 @@ public class DropboxProducerPutWithRemotePathTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://put?" + getAuthParams() + "&uploadMode=add&localPath=/XXX&remotePath=/XXX") + .to("dropbox://put?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&uploadMode=add&localPath=/XXX&remotePath=/XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java ---------------------------------------------------------------------- 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 2550276..748f683 100755 --- 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 @@ -59,7 +59,7 @@ public class DropboxProducerSearchQueryTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://search?" + getAuthParams() + "&remotePath=/XXX&query=XXX") + .to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX&query=XXX") .to("mock:result"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/d8c37113/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java ---------------------------------------------------------------------- diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java index 613b25c..d47730f 100755 --- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java +++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java @@ -51,7 +51,6 @@ public class DropboxProducerSearchTest extends DropboxTestSupport { Object body = exchange.getIn().getBody(); assertNotNull(header); assertNotNull(body); - } @Override @@ -59,7 +58,7 @@ public class DropboxProducerSearchTest extends DropboxTestSupport { return new RouteBuilder() { public void configure() { from("direct:start") - .to("dropbox://search?" + getAuthParams() + "&remotePath=/XXX") + .to("dropbox://search?accessToken={{accessToken}}&clientIdentifier={{clientIdentifier}}&remotePath=/XXX") .to("mock:result"); } };
