You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2017/11/30 17:57:05 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
version 2.11.0 for camel-bonita, camel-influxdb, camel-metrics,
camel-reactor, camel-itest,
camel-eip-documentation-enricher-maven-plugin and swagger-rest-dsl-generator
This is an automated email from the ASF dual-hosted git repository.
aldettinger 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 655a0e3 CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-bonita, camel-influxdb, camel-metrics, camel-reactor, camel-itest, camel-eip-documentation-enricher-maven-plugin and swagger-rest-dsl-generator
655a0e3 is described below
commit 655a0e338de7e5995dc9fc08cb7b58bf73d534c2
Author: aldettinger <al...@gmail.com>
AuthorDate: Thu Nov 30 18:30:39 2017 +0100
CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-bonita, camel-influxdb, camel-metrics, camel-reactor, camel-itest, camel-eip-documentation-enricher-maven-plugin and swagger-rest-dsl-generator
---
components/camel-bonita/pom.xml | 1 +
.../api/util/BonitaAPIUtilPrepareInputsTest.java | 62 +++++++++-------------
components/camel-influxdb/pom.xml | 61 ++++++++++-----------
.../influxdb/MockedInfluxDbConfiguration.java | 1 -
components/camel-metrics/pom.xml | 1 +
.../metrics/AbstractMetricsProducerTest.java | 2 +-
.../component/metrics/CounterEndpointTest.java | 2 +-
.../component/metrics/CounterProducerTest.java | 8 +--
.../camel/component/metrics/CounterRouteTest.java | 4 +-
.../camel/component/metrics/GaugeEndpointTest.java | 2 +-
.../camel/component/metrics/GaugeProducerTest.java | 14 ++---
.../camel/component/metrics/GaugeRouteTest.java | 27 +++++-----
.../component/metrics/HistogramEndpointTest.java | 2 +-
.../component/metrics/HistogramProducerTest.java | 4 +-
.../component/metrics/HistogramRouteTest.java | 4 +-
.../camel/component/metrics/MeterEndpointTest.java | 2 +-
.../camel/component/metrics/MeterProducerTest.java | 4 +-
.../camel/component/metrics/MeterRouteTest.java | 4 +-
.../metrics/MetricComponentSpringTest.java | 4 +-
.../component/metrics/MetricsComponentTest.java | 2 +-
.../component/metrics/MetricsEndpointTest.java | 4 +-
.../camel/component/metrics/TimerEndpointTest.java | 2 +-
.../camel/component/metrics/TimerProducerTest.java | 4 +-
.../camel/component/metrics/TimerRouteTest.java | 4 +-
.../spi/InstrumentedThreadPoolFactoryTest.java | 4 +-
components/camel-reactor/pom.xml | 6 ---
tests/camel-itest/pom.xml | 1 +
.../itest/ftp/FtpInitialConnectTimeoutTest.java | 8 +--
.../pom.xml | 1 +
.../maven/EipDocumentationEnricherMojoTest.java | 19 ++-----
tooling/swagger-rest-dsl-generator/pom.xml | 8 +--
31 files changed, 108 insertions(+), 164 deletions(-)
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 5e4820b..38a60a5 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -65,6 +65,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
index b08acc7..2709db1 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtilPrepareInputsTest.java
@@ -27,95 +27,81 @@ import org.apache.camel.component.bonita.api.model.UploadFileResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Matchers;
import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+@RunWith(MockitoJUnitRunner.class)
public class BonitaAPIUtilPrepareInputsTest {
@Mock
ProcessDefinitionResponse processDefinition;
-
+
private BonitaAPIUtil bonitaApiUtil;
@Before
public void setup() {
- MockitoAnnotations.initMocks(this);
- bonitaApiUtil = BonitaAPIUtil
- .getInstance(new BonitaAPIConfig("hostname", "port", "username", "password"));
- Mockito.when(processDefinition.getName()).thenReturn("processName");
- Mockito.when(processDefinition.getVersion()).thenReturn("1.0");
- Mockito.when(processDefinition.getId()).thenReturn("1");
+ bonitaApiUtil = BonitaAPIUtil.getInstance(new BonitaAPIConfig("hostname", "port", "username", "password"));
}
@Test
public void testPrepareInputsEmpty() throws Exception {
- Map<String, Serializable> rawInputs = new HashMap<String, Serializable>();
- Map<String, Serializable> inputs =
- bonitaApiUtil.prepareInputs(processDefinition, rawInputs);
+ Map<String, Serializable> rawInputs = new HashMap<>();
+ Map<String, Serializable> inputs = bonitaApiUtil.prepareInputs(processDefinition, rawInputs);
assertEquals(inputs.size(), rawInputs.size());
}
@Test
public void testPrepareInputsNoFiles() throws Exception {
- Map<String, Serializable> rawInputs = new HashMap<String, Serializable>();
+ Map<String, Serializable> rawInputs = new HashMap<>();
rawInputs.put("myVariable", 1);
- Map<String, Serializable> inputs =
- bonitaApiUtil.prepareInputs(processDefinition, rawInputs);
+ Map<String, Serializable> inputs = bonitaApiUtil.prepareInputs(processDefinition, rawInputs);
assertEquals(rawInputs.size(), inputs.size());
}
@Test
public void testPrepareInputsOneFile() throws Exception {
-
- Map<String, Serializable> rawInputs = new HashMap<String, Serializable>();
+ Map<String, Serializable> rawInputs = new HashMap<>();
FileInput file = new FileInput("filename", "String".getBytes());
rawInputs.put("myVariable", 1);
rawInputs.put("filename", file);
- BonitaAPIUtil bonitaApiUtilMod = Mockito.spy(bonitaApiUtil);
+ BonitaAPIUtil bonitaApiUtilMod = spy(bonitaApiUtil);
UploadFileResponse uploadFileResponse = new UploadFileResponse();
uploadFileResponse.setTempPath("temp");
- Mockito.doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(Matchers.any(),
- Matchers.any());
- Map<String, Serializable> inputs =
- bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
+ doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(any(), any());
+ Map<String, Serializable> inputs = bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
assertEquals(rawInputs.size(), inputs.size());
}
@Test
public void testPrepareInputsFileType() throws Exception {
-
- Map<String, Serializable> rawInputs = new HashMap<String, Serializable>();
+ Map<String, Serializable> rawInputs = new HashMap<>();
FileInput file = new FileInput("filename", "String".getBytes());
rawInputs.put("filename", file);
- BonitaAPIUtil bonitaApiUtilMod = Mockito.spy(bonitaApiUtil);
+ BonitaAPIUtil bonitaApiUtilMod = spy(bonitaApiUtil);
UploadFileResponse uploadFileResponse = new UploadFileResponse();
uploadFileResponse.setTempPath("temp");
- Mockito.doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(Matchers.any(),
- Matchers.any());
- Map<String, Serializable> inputs =
- bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
+ doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(any(), any());
+ Map<String, Serializable> inputs = bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
assertTrue(Map.class.isInstance(inputs.get("filename")));
}
@Test
public void testPrepareInputsTempFilePath() throws Exception {
-
- Map<String, Serializable> rawInputs = new HashMap<String, Serializable>();
+ Map<String, Serializable> rawInputs = new HashMap<>();
FileInput file = new FileInput("filename", "String".getBytes());
rawInputs.put("filename", file);
- BonitaAPIUtil bonitaApiUtilMod = Mockito.spy(bonitaApiUtil);
+ BonitaAPIUtil bonitaApiUtilMod = spy(bonitaApiUtil);
UploadFileResponse uploadFileResponse = new UploadFileResponse();
uploadFileResponse.setTempPath("temp");
- Mockito.doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(Matchers.any(),
- Matchers.any());
- Map<String, Serializable> inputs =
- bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
- Map<String, Serializable> fileMap = (Map<String, Serializable>) inputs.get("filename");
+ doReturn(uploadFileResponse).when(bonitaApiUtilMod).uploadFile(any(), any());
+ Map<String, Serializable> inputs = bonitaApiUtilMod.prepareInputs(processDefinition, rawInputs);
+ Map<String, Serializable> fileMap = (Map<String, Serializable>)inputs.get("filename");
assertEquals("temp", fileMap.get("tempPath"));
}
}
diff --git a/components/camel-influxdb/pom.xml b/components/camel-influxdb/pom.xml
index 9383f48..244022f 100644
--- a/components/camel-influxdb/pom.xml
+++ b/components/camel-influxdb/pom.xml
@@ -1,22 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -60,23 +52,24 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/MockedInfluxDbConfiguration.java b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/MockedInfluxDbConfiguration.java
index 632200d..1705aa2 100644
--- a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/MockedInfluxDbConfiguration.java
+++ b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/MockedInfluxDbConfiguration.java
@@ -21,7 +21,6 @@ import java.net.UnknownHostException;
import static junit.framework.TestCase.assertNotNull;
import org.influxdb.InfluxDB;
-import org.influxdb.InfluxDBFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 07c1a03..13675df 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -86,6 +86,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
index d96f4d0..5811855 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.AbstractMetricsProducer.HEADER_PATTERN;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
index 6dff310..076f8c2 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
index 7a35062..d319fb1 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT;
@@ -65,7 +65,6 @@ public class CounterProducerTest {
public void setUp() throws Exception {
producer = new CounterProducer(endpoint);
inOrder = Mockito.inOrder(endpoint, exchange, registry, counter, in);
- when(endpoint.getRegistry()).thenReturn(registry);
when(registry.counter(METRICS_NAME)).thenReturn(counter);
when(exchange.getIn()).thenReturn(in);
}
@@ -81,7 +80,6 @@ public class CounterProducerTest {
when(endpoint.getIncrement()).thenReturn(INCREMENT);
when(endpoint.getDecrement()).thenReturn(null);
when(in.getHeader(HEADER_COUNTER_INCREMENT, INCREMENT, Long.class)).thenReturn(INCREMENT);
- when(in.getHeader(HEADER_COUNTER_DECREMENT, null, Long.class)).thenReturn(null);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(exchange, times(1)).getIn();
inOrder.verify(registry, times(1)).counter(METRICS_NAME);
@@ -98,7 +96,6 @@ public class CounterProducerTest {
Object action = null;
when(endpoint.getIncrement()).thenReturn(null);
when(endpoint.getDecrement()).thenReturn(DECREMENT);
- when(in.getHeader(HEADER_COUNTER_INCREMENT, null, Long.class)).thenReturn(null);
when(in.getHeader(HEADER_COUNTER_DECREMENT, DECREMENT, Long.class)).thenReturn(DECREMENT);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(exchange, times(1)).getIn();
@@ -133,8 +130,6 @@ public class CounterProducerTest {
Object action = null;
when(endpoint.getIncrement()).thenReturn(null);
when(endpoint.getDecrement()).thenReturn(null);
- when(in.getHeader(HEADER_COUNTER_INCREMENT, null, Long.class)).thenReturn(null);
- when(in.getHeader(HEADER_COUNTER_DECREMENT, null, Long.class)).thenReturn(null);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(exchange, times(1)).getIn();
inOrder.verify(registry, times(1)).counter(METRICS_NAME);
@@ -168,7 +163,6 @@ public class CounterProducerTest {
Object action = null;
when(endpoint.getIncrement()).thenReturn(null);
when(endpoint.getDecrement()).thenReturn(DECREMENT);
- when(in.getHeader(HEADER_COUNTER_INCREMENT, null, Long.class)).thenReturn(null);
when(in.getHeader(HEADER_COUNTER_DECREMENT, DECREMENT, Long.class)).thenReturn(DECREMENT - 1);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(exchange, times(1)).getIn();
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
index ed78774..4804a2c 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.apache.camel.test.spring.MockEndpoints;
import org.junit.After;
import org.junit.Before;
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(
classes = { CounterRouteTest.TestConfig.class },
loader = CamelSpringDelegatingTestContextLoader.class)
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeEndpointTest.java
index 778ea82..0a9c095 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeEndpointTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeProducerTest.java
index 6fd3b92..24c6f17 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeProducerTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_GAUGE_SUBJECT;
import static org.hamcrest.Matchers.is;
@@ -76,8 +76,8 @@ public class GaugeProducerTest {
public void testDefault() throws Exception {
verify(registry, times(1)).register(eq(METRICS_NAME), argThat(new ArgumentMatcher<CamelMetricsGauge>() {
@Override
- public boolean matches(Object argument) {
- return argument instanceof CamelMetricsGauge && VALUE.equals(((CamelMetricsGauge)argument).getValue());
+ public boolean matches(CamelMetricsGauge argument) {
+ return VALUE.equals(argument.getValue());
}
}));
}
@@ -89,14 +89,14 @@ public class GaugeProducerTest {
verify(in, times(1)).getHeader(HEADER_GAUGE_SUBJECT, Object.class);
verify(registry, times(1)).register(eq(METRICS_NAME), argThat(new ArgumentMatcher<CamelMetricsGauge>() {
@Override
- public boolean matches(Object argument) {
- return argument instanceof CamelMetricsGauge && VALUE.equals(((CamelMetricsGauge)argument).getValue());
+ public boolean matches(CamelMetricsGauge argument) {
+ return VALUE.equals(argument.getValue());
}
}));
verify(registry, times(1)).register(eq(METRICS_NAME_HEADER), argThat(new ArgumentMatcher<CamelMetricsGauge>() {
@Override
- public boolean matches(Object argument) {
- return argument instanceof CamelMetricsGauge && VALUE_HEADER.equals(((CamelMetricsGauge)argument).getValue());
+ public boolean matches(CamelMetricsGauge argument) {
+ return VALUE_HEADER.equals(argument.getValue());
}
}));
}
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java
index 4a03ebf..92a4b36 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/GaugeRouteTest.java
@@ -29,14 +29,13 @@ import org.apache.camel.component.metrics.GaugeProducer.CamelMetricsGauge;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.apache.camel.test.spring.MockEndpoints;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatcher;
-import org.mockito.Matchers;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -47,20 +46,22 @@ import org.springframework.test.context.ContextConfiguration;
import static org.apache.camel.component.metrics.MetricsComponent.METRIC_REGISTRY_NAME;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_GAUGE_SUBJECT;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.argThat;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(
classes = { GaugeRouteTest.TestConfig.class },
loader = CamelSpringDelegatingTestContextLoader.class)
@MockEndpoints
public class GaugeRouteTest {
- private static SortedMap<String, Gauge> mockGauges = new TreeMap<String, Gauge>();;
+ private static SortedMap<String, Gauge> mockGauges = new TreeMap<>();
@EndpointInject(uri = "mock:out")
private MockEndpoint endpoint;
@@ -101,12 +102,12 @@ public class GaugeRouteTest {
public MetricRegistry getMetricRegistry() {
MetricRegistry registry = Mockito.mock(MetricRegistry.class);
when(registry.getGauges()).thenReturn(mockGauges);
- when(registry.register(Matchers.anyString(), Matchers.any(CamelMetricsGauge.class))).then(
+ when(registry.register(anyString(), any())).then(
new Answer<CamelMetricsGauge>() {
@Override
public CamelMetricsGauge answer(InvocationOnMock invocation) throws Throwable {
- mockGauges.put(invocation.getArgumentAt(0, String.class), invocation.getArgumentAt(1, CamelMetricsGauge.class));
- return invocation.getArgumentAt(1, CamelMetricsGauge.class);
+ mockGauges.put(invocation.getArgument(0), invocation.getArgument(1));
+ return invocation.getArgument(1);
}
});
return registry;
@@ -137,8 +138,8 @@ public class GaugeRouteTest {
endpoint.assertIsSatisfied();
verify(mockRegistry, times(1)).register(eq("A"), argThat(new ArgumentMatcher<CamelMetricsGauge>() {
@Override
- public boolean matches(Object argument) {
- return argument instanceof CamelMetricsGauge && "my subject".equals(((CamelMetricsGauge)argument).getValue());
+ public boolean matches(CamelMetricsGauge argument) {
+ return "my subject".equals(argument.getValue());
}
}));
}
@@ -147,8 +148,8 @@ public class GaugeRouteTest {
public void testOverride() throws Exception {
verify(mockRegistry, times(1)).register(eq("A"), argThat(new ArgumentMatcher<CamelMetricsGauge>() {
@Override
- public boolean matches(Object argument) {
- return argument instanceof CamelMetricsGauge && "my subject".equals(((CamelMetricsGauge)argument).getValue());
+ public boolean matches(CamelMetricsGauge argument) {
+ return "my subject".equals(argument.getValue());
}
}));
endpoint.expectedMessageCount(1);
@@ -156,8 +157,8 @@ public class GaugeRouteTest {
endpoint.assertIsSatisfied();
verify(mockRegistry, times(1)).register(eq("B"), argThat(new ArgumentMatcher<CamelMetricsGauge>() {
@Override
- public boolean matches(Object argument) {
- return argument instanceof CamelMetricsGauge && "my overriding subject".equals(((CamelMetricsGauge)argument).getValue());
+ public boolean matches(CamelMetricsGauge argument) {
+ return "my overriding subject".equals(argument.getValue());
}
}));
}
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
index 0e03af5..26ff004 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
index 9e5d6c3..e4f9cf8 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE;
import static org.hamcrest.Matchers.is;
@@ -63,7 +63,6 @@ public class HistogramProducerTest {
public void setUp() throws Exception {
producer = new HistogramProducer(endpoint);
inOrder = Mockito.inOrder(endpoint, registry, histogram, exchange, in);
- when(endpoint.getRegistry()).thenReturn(registry);
when(registry.histogram(METRICS_NAME)).thenReturn(histogram);
when(exchange.getIn()).thenReturn(in);
}
@@ -90,7 +89,6 @@ public class HistogramProducerTest {
public void testProcessValueNotSet() throws Exception {
Object action = null;
when(endpoint.getValue()).thenReturn(null);
- when(in.getHeader(HEADER_HISTOGRAM_VALUE, null, Long.class)).thenReturn(null);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(exchange, times(1)).getIn();
inOrder.verify(registry, times(1)).histogram(METRICS_NAME);
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java
index e22909f..a72bd9f 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramRouteTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.apache.camel.test.spring.MockEndpoints;
import org.junit.After;
import org.junit.Before;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(
classes = { HistogramRouteTest.TestConfig.class },
loader = CamelSpringDelegatingTestContextLoader.class)
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
index d58d539..87e6476 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
index 79416f4..5d9cec2 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METER_MARK;
import static org.hamcrest.Matchers.equalTo;
@@ -65,7 +65,6 @@ public class MeterProducerTest {
public void setUp() throws Exception {
producer = new MeterProducer(endpoint);
inOrder = Mockito.inOrder(endpoint, registry, meter, exchange, in);
- when(endpoint.getRegistry()).thenReturn(registry);
when(registry.meter(METRICS_NAME)).thenReturn(meter);
when(exchange.getIn()).thenReturn(in);
}
@@ -106,7 +105,6 @@ public class MeterProducerTest {
public void testProcessMarkNotSet() throws Exception {
Object action = null;
when(endpoint.getMark()).thenReturn(null);
- when(in.getHeader(HEADER_METER_MARK, null, Long.class)).thenReturn(null);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(registry, times(1)).meter(METRICS_NAME);
inOrder.verify(endpoint, times(1)).getMark();
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java
index 1e2dfa9..af707f5 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterRouteTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.apache.camel.test.spring.MockEndpoints;
import org.junit.After;
import org.junit.Before;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(
classes = { MeterRouteTest.TestConfig.class },
loader = CamelSpringDelegatingTestContextLoader.class)
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java
index 8ddd5ca..109052e 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricComponentSpringTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.apache.camel.test.spring.MockEndpoints;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@ import org.springframework.test.context.ContextConfiguration;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(
classes = { MetricComponentSpringTest.TestConfig.class },
loader = CamelSpringDelegatingTestContextLoader.class)
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 0f1ec94..906960e 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
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
index e1607d2..92f8895 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
@@ -29,11 +29,10 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class MetricsEndpointTest {
@@ -70,7 +69,6 @@ public class MetricsEndpointTest {
}
};
inOrder = Mockito.inOrder(registry, processor, exchange, in);
- when(exchange.getIn()).thenReturn(in);
}
@After
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
index 1cb8ea9..fa1dbef 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
index 0baf5778..ae08f88 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION;
import static org.hamcrest.Matchers.is;
@@ -69,7 +69,6 @@ public class TimerProducerTest {
public void setUp() throws Exception {
producer = new TimerProducer(endpoint);
inOrder = Mockito.inOrder(endpoint, exchange, registry, timer, context, in);
- when(endpoint.getRegistry()).thenReturn(registry);
when(registry.timer(METRICS_NAME)).thenReturn(timer);
when(timer.time()).thenReturn(context);
when(exchange.getIn()).thenReturn(in);
@@ -146,7 +145,6 @@ public class TimerProducerTest {
@Test
public void testProcessNoAction() throws Exception {
when(endpoint.getAction()).thenReturn(null);
- when(in.getHeader(HEADER_TIMER_ACTION, null, MetricsTimerAction.class)).thenReturn(null);
producer.doProcess(exchange, endpoint, registry, METRICS_NAME);
inOrder.verify(exchange, times(1)).getIn();
inOrder.verify(endpoint, times(1)).getAction();
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java
index adc6913..68098df 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerRouteTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
-import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.apache.camel.test.spring.MockEndpoints;
import org.junit.After;
import org.junit.Before;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(
classes = { TimerRouteTest.TestConfig.class },
loader = CamelSpringDelegatingTestContextLoader.class)
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java
index 592cb14..d6efc0b 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java
@@ -33,13 +33,13 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.times;
@RunWith(MockitoJUnitRunner.class)
diff --git a/components/camel-reactor/pom.xml b/components/camel-reactor/pom.xml
index 10cff0a..d4faaea 100644
--- a/components/camel-reactor/pom.xml
+++ b/components/camel-reactor/pom.xml
@@ -86,12 +86,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 48bb056..a9e0e1c 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -229,6 +229,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
index 0d44c3b..af13d26 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
@@ -32,13 +32,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockftpserver.fake.FakeFtpServer;
-import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
public class FtpInitialConnectTimeoutTest extends CamelTestSupport {
@@ -52,7 +52,7 @@ public class FtpInitialConnectTimeoutTest extends CamelTestSupport {
@Override
public Socket answer(InvocationOnMock invocation) throws Throwable {
- final Socket socket = Mockito.spy(new Socket());
+ final Socket socket = spy(new Socket());
final AtomicBoolean timeout = new AtomicBoolean();
try {
@@ -79,7 +79,7 @@ public class FtpInitialConnectTimeoutTest extends CamelTestSupport {
}
try {
- doAnswer(new Answer() {
+ doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
if ((Integer) invocation.getArguments()[0] == CONNECT_TIMEOUT) {
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index e7c78ce..fba87b2 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -133,6 +133,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
index 83035b3..ed1283f 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
@@ -21,12 +21,14 @@ import java.io.File;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public class EipDocumentationEnricherMojoTest {
private EipDocumentationEnricherMojo eipDocumentationEnricherMojo = new EipDocumentationEnricherMojo();
@@ -40,7 +42,6 @@ public class EipDocumentationEnricherMojoTest {
@Before
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
eipDocumentationEnricherMojo.camelCoreDir = mockCamelCore;
eipDocumentationEnricherMojo.inputCamelSchemaFile = mockInputSchema;
eipDocumentationEnricherMojo.pathToModelDir = "sub/path";
@@ -49,7 +50,6 @@ public class EipDocumentationEnricherMojoTest {
@Test
public void testExecuteCamelCoreDoesNotExist() throws Exception {
when(mockCamelCore.exists()).thenReturn(false);
- when(mockCamelCore.isDirectory()).thenReturn(true);
when(mockInputSchema.exists()).thenReturn(true);
when(mockInputSchema.isFile()).thenReturn(true);
@@ -79,7 +79,6 @@ public class EipDocumentationEnricherMojoTest {
@Test
public void testExecuteCamelCoreIsNotADirectory() throws Exception {
when(mockCamelCore.exists()).thenReturn(true);
- when(mockCamelCore.isDirectory()).thenReturn(false);
when(mockInputSchema.exists()).thenReturn(true);
when(mockInputSchema.isFile()).thenReturn(true);
@@ -93,10 +92,7 @@ public class EipDocumentationEnricherMojoTest {
@Test
public void testExecuteInputCamelSchemaDoesNotExist() throws Exception {
- when(mockCamelCore.exists()).thenReturn(true);
- when(mockCamelCore.isDirectory()).thenReturn(true);
when(mockInputSchema.exists()).thenReturn(false);
- when(mockInputSchema.isFile()).thenReturn(true);
try {
eipDocumentationEnricherMojo.execute();
@@ -110,9 +106,6 @@ public class EipDocumentationEnricherMojoTest {
public void testExecuteInputCamelSchemaIsNull() throws Exception {
eipDocumentationEnricherMojo.inputCamelSchemaFile = null;
- when(mockCamelCore.exists()).thenReturn(true);
- when(mockCamelCore.isDirectory()).thenReturn(true);
-
try {
eipDocumentationEnricherMojo.execute();
fail("Expected MojoExecutionException");
@@ -123,8 +116,6 @@ public class EipDocumentationEnricherMojoTest {
@Test
public void testExecuteInputCamelSchemaIsNotAFile() throws Exception {
- when(mockCamelCore.exists()).thenReturn(true);
- when(mockCamelCore.isDirectory()).thenReturn(true);
when(mockInputSchema.exists()).thenReturn(true);
when(mockInputSchema.isFile()).thenReturn(false);
@@ -139,10 +130,6 @@ public class EipDocumentationEnricherMojoTest {
@Test
public void testExecutePathToModelDirIsNull() throws Exception {
eipDocumentationEnricherMojo.pathToModelDir = null;
- when(mockCamelCore.exists()).thenReturn(true);
- when(mockCamelCore.isDirectory()).thenReturn(true);
- when(mockInputSchema.exists()).thenReturn(true);
- when(mockInputSchema.isFile()).thenReturn(true);
try {
eipDocumentationEnricherMojo.execute();
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index cc843a9..f2eabd9 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -56,12 +56,6 @@
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-version}</version>
@@ -69,4 +63,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].