[camel] 01/03: CAMEL-13557: Fixed test to use property binding support as the old has removed the legacy JDK PropertyEditor in CAMEL-13566

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 466ee956e4d99aa66f563cb6143cea8c1d6b0b45
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun May 26 10:54:58 2019 +0200

    CAMEL-13557: Fixed test to use property binding support as the old has removed the legacy JDK PropertyEditor in CAMEL-13566
---
 .../java/org/apache/camel/component/atmos/AtmosComponentTest.java  | 7 +++++++
 .../component/aws/lambda/LambdaComponentClientRegistryTest.java    | 3 ++-
 .../org/apache/camel/component/couchdb/CouchDbComponentTest.java   | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java
index b5a3051..20ab324 100644
--- a/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java
+++ b/components/camel-atmos/src/test/java/org/apache/camel/component/atmos/AtmosComponentTest.java
@@ -26,6 +26,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import static org.junit.Assert.assertEquals;
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AtmosComponentTest {
@@ -40,6 +43,8 @@ public class AtmosComponentTest {
 
     @Test
     public void testComponentOptions() throws Exception {
+        when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
+
         AtmosComponent component = new AtmosComponent(context);
         component.setFullTokenId(FAKE_TOKEN);
         component.setSecretKey(FAKE_SECRET);
@@ -60,6 +65,8 @@ public class AtmosComponentTest {
 
     @Test
     public void testUriParamsOverrideComponentOptions() throws Exception {
+        when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
+
         AtmosComponent component = new AtmosComponent(context);
         component.setFullTokenId("fakeTokenToBeOverridden");
         component.setSecretKey("fakeSecretToBeOverridden");
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
index 293a6c8..5ab2f29 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.lambda;
 
 import com.amazonaws.services.lambda.AWSLambdaClient;
 
+import org.apache.camel.PropertyBindingException;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
@@ -37,7 +38,7 @@ public class LambdaComponentClientRegistryTest extends CamelTestSupport {
         assertNotNull(endpoint.getConfiguration().getAwsLambdaClient());
     }
     
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = PropertyBindingException.class)
     public void createEndpointWithMinimalKMSClientMisconfiguration() throws Exception {
 
         LambdaComponent component = new LambdaComponent(context);
diff --git a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
index ad8b029..c375dd0 100644
--- a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
+++ b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
@@ -30,6 +30,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CouchDbComponentTest {
@@ -50,6 +53,8 @@ public class CouchDbComponentTest {
 
     @Test
     public void testPropertiesSet() throws Exception {
+        when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
+
         Map<String, Object> params = new HashMap<>();
         params.put("createDatabase", true);
         params.put("username", "coldplay");