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

[davsclaus]

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


The following commit(s) were added to refs/heads/master by this push:
     new aefa1f5   CAMEL-13557: Fixed test to use property binding support as 
the old has removed the legacy JDK PropertyEditor in CAMEL-13566
aefa1f5 is described below

commit aefa1f594dcff4bf8cd004fcd79c18220627f320
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat May 25 21:30:51 2019 +0200

     CAMEL-13557: Fixed test to use property binding support as the old has 
removed the legacy JDK PropertyEditor in CAMEL-13566
---
 .../apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java
 
b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java
index dad4eef..6b78bd1 100644
--- 
a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java
+++ 
b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointTest.java
@@ -41,6 +41,8 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -80,6 +82,7 @@ public class RestSwaggerEndpointTest {
         when(camelContext.getClassResolver()).thenReturn(new 
DefaultClassResolver());
         final Endpoint endpointDelegate = mock(Endpoint.class);
         
when(camelContext.getEndpoint("rest:GET:/v2:/pet/{petId}")).thenReturn(endpointDelegate);
+        
when(camelContext.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
         final Producer delegateProducer = mock(Producer.class);
         when(endpointDelegate.createProducer()).thenReturn(delegateProducer);