You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/23 07:30:57 UTC
[camel] 05/06: Avoid using mockito when possible
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ae25cc1168b276b84dabc31adb07b6df2c8e2a4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 23 08:49:18 2019 +0200
Avoid using mockito when possible
---
.../org/apache/camel/component/metrics/MetricsComponentTest.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 edd8862..7eaa38b 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
@@ -24,7 +24,9 @@ import java.util.Map;
import com.codahale.metrics.MetricRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.impl.engine.DefaultBeanIntrospection;
import org.apache.camel.spi.Registry;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +50,7 @@ import static org.mockito.Mockito.when;
public class MetricsComponentTest {
@Mock
- private CamelContext camelContext;
+ private ExtendedCamelContext camelContext;
@Mock
private Registry camelRegistry;
@@ -72,6 +74,8 @@ public class MetricsComponentTest {
when(camelContext.getRegistry()).thenReturn(camelRegistry);
when(camelContext.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME, MetricRegistry.class)).thenReturn(metricRegistry);
+ when(camelContext.adapt(ExtendedCamelContext.class)).thenReturn(camelContext);
+ when(camelContext.getBeanIntrospection()).thenReturn(new DefaultBeanIntrospection());
Map<String, Object> params = new HashMap<>();
Long value = System.currentTimeMillis();
@@ -95,6 +99,8 @@ public class MetricsComponentTest {
when(camelContext.getRegistry()).thenReturn(camelRegistry);
when(camelContext.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME, MetricRegistry.class)).thenReturn(metricRegistry);
+ when(camelContext.adapt(ExtendedCamelContext.class)).thenReturn(camelContext);
+ when(camelContext.getBeanIntrospection()).thenReturn(new DefaultBeanIntrospection());
Map<String, Object> params = new HashMap<>();
Long value = System.currentTimeMillis();
params.put("mark", value);