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 cc7ef1d CAMEL-13557: Fixed test to use property binding support as
the old has removed the legacy JDK PropertyEditor in CAMEL-13566
cc7ef1d is described below
commit cc7ef1dfaad7a131d828eed22850e3798d36143a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun May 26 08:26:25 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/jooq/JooqComponentTest.java | 5 +++--
.../org/apache/camel/component/metrics/MetricsComponentTest.java | 7 ++++++-
.../apache/camel/component/micrometer/MicrometerComponentTest.java | 1 -
.../org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java | 4 ++++
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
index 8055315..d2e7269 100644
---
a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
+++
b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqComponentTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.camel.component.jooq;
-import org.apache.camel.TypeConversionException;
+import org.apache.camel.PropertyBindingException;
import org.apache.camel.component.jooq.db.tables.records.BookStoreRecord;
import org.junit.Test;
public class JooqComponentTest extends BaseJooqTest {
+
@Test
public void testEndpointConfiguration() throws Exception {
JooqComponent component = (JooqComponent)
context().getComponent("jooq");
@@ -38,7 +39,7 @@ public class JooqComponentTest extends BaseJooqTest {
assertEquals(BookStoreRecord.class,
ep3.getConfiguration().getEntityType());
}
- @Test(expected = TypeConversionException.class)
+ @Test(expected = PropertyBindingException.class)
public void testNonDefaultConfig() throws Exception {
JooqComponent component = (JooqComponent)
context().getComponent("jooq");
component.createEndpoint("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?operation=unexpectedOperation");
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
index 145a913..edd8862 100644
---
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
@@ -39,6 +39,8 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@@ -68,7 +70,9 @@ public class MetricsComponentTest {
public void testCreateEndpoint() throws Exception {
component.setCamelContext(camelContext);
when(camelContext.getRegistry()).thenReturn(camelRegistry);
+
when(camelContext.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class)).thenReturn(metricRegistry);
+
Map<String, Object> params = new HashMap<>();
Long value = System.currentTimeMillis();
params.put("mark", value);
@@ -89,6 +93,7 @@ public class MetricsComponentTest {
public void testCreateEndpoints() throws Exception {
component.setCamelContext(camelContext);
when(camelContext.getRegistry()).thenReturn(camelRegistry);
+
when(camelContext.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class)).thenReturn(metricRegistry);
Map<String, Object> params = new HashMap<>();
Long value = System.currentTimeMillis();
@@ -116,7 +121,7 @@ public class MetricsComponentTest {
inOrder.verify(camelContext, times(1)).getRegistry();
inOrder.verify(camelRegistry,
times(1)).lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class);
- inOrder.verify(camelContext, times(2)).getTypeConverter();
+ inOrder.verify(camelContext, times(3)).getTypeConverter();
inOrder.verifyNoMoreInteractions();
}
diff --git
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
index 90174fd..7d73591 100644
---
a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
+++
b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
@@ -87,7 +87,6 @@ public class MicrometerComponentTest {
inOrder.verify(camelRegistry,
times(1)).lookupByNameAndType(MicrometerConstants.METRICS_REGISTRY_NAME,
MeterRegistry.class);
inOrder.verify(camelContext, times(1)).getTypeConverter();
inOrder.verify(typeConverter, times(1)).convertTo(String.class,
"key=value");
- inOrder.verify(camelContext, times(1)).getTypeConverter();
inOrder.verifyNoMoreInteractions();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
index ec4c92b..4025f02 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
@@ -29,6 +29,9 @@ import org.mockito.Mockito;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
public class RabbitMQComponentTest {
@@ -98,6 +101,7 @@ public class RabbitMQComponentTest {
String remaining = "special.host:14/queuey";
RabbitMQComponent comp = new RabbitMQComponent(context);
+
when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
comp.setAutoDetectConnectionFactory(false);
return comp.createEndpoint(uri, remaining, params);
}
