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 6c4e849 CAMEL-11869: Upgrade camel-beanstalk to mockito-core 2.11.0
6c4e849 is described below
commit 6c4e849c70d498597e599b8d8e327c7f9ac545d5
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Thu Oct 19 14:47:31 2017 +0200
CAMEL-11869: Upgrade camel-beanstalk to mockito-core 2.11.0
---
components/camel-beanstalk/pom.xml | 1 +
.../camel/component/beanstalk/ConsumerCompletionTest.java | 10 +++++-----
.../component/beanstalk/ConsumerToProducerHeadersTest.java | 7 ++++---
parent/pom.xml | 1 +
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/components/camel-beanstalk/pom.xml
b/components/camel-beanstalk/pom.xml
index 99f8445..77ad066 100644
--- a/components/camel-beanstalk/pom.xml
+++ b/components/camel-beanstalk/pom.xml
@@ -63,6 +63,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
index 809b78a..136fb1d 100644
---
a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
+++
b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.atLeastOnce;
@@ -63,7 +63,7 @@ public class ConsumerCompletionTest extends
BeanstalkMockTestSupport {
when(client.reserve(anyInt()))
.thenReturn(jobMock)
.thenReturn(null);
- when(client.statsJob(anyInt())).thenReturn(null);
+ when(client.statsJob(anyLong())).thenReturn(null);
MockEndpoint result = getMockEndpoint("mock:result");
@@ -77,7 +77,7 @@ public class ConsumerCompletionTest extends
BeanstalkMockTestSupport {
result.assertIsSatisfied();
verify(client, atLeastOnce()).reserve(anyInt());
- verify(client, atLeastOnce()).statsJob(anyInt());
+ verify(client, atLeastOnce()).statsJob(anyLong());
verify(client).delete(jobId);
}
@@ -95,7 +95,7 @@ public class ConsumerCompletionTest extends
BeanstalkMockTestSupport {
when(client.reserve(anyInt()))
.thenReturn(jobMock)
.thenReturn(null);
- when(client.statsJob(anyInt())).thenReturn(null);
+ when(client.statsJob(anyLong())).thenReturn(null);
when(client.release(anyInt(), anyLong(), anyInt())).thenReturn(true);
NotifyBuilder notify = new
NotifyBuilder(context).whenFailed(1).create();
@@ -108,7 +108,7 @@ public class ConsumerCompletionTest extends
BeanstalkMockTestSupport {
assertTrue(notify.matches(5, TimeUnit.SECONDS));
verify(client, atLeastOnce()).reserve(anyInt());
- verify(client, atLeastOnce()).statsJob(anyInt());
+ verify(client, atLeastOnce()).statsJob(anyLong());
verify(client).release(jobId, priority, delay);
}
diff --git
a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
index cec0c07..b03f484 100644
---
a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
+++
b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerToProducerHeadersTest.java
@@ -27,7 +27,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -68,7 +69,7 @@ public class ConsumerToProducerHeadersTest extends
BeanstalkMockTestSupport {
when(client.reserve(anyInt()))
.thenReturn(jobMock)
.thenReturn(null);
- when(client.statsJob(anyInt())).thenReturn(stats);
+ when(client.statsJob(anyLong())).thenReturn(stats);
when(client.put(BeanstalkComponent.DEFAULT_PRIORITY,
BeanstalkComponent.DEFAULT_DELAY,
@@ -87,7 +88,7 @@ public class ConsumerToProducerHeadersTest extends
BeanstalkMockTestSupport {
result.assertIsSatisfied();
verify(client, atLeastOnce()).reserve(anyInt());
- verify(client, atLeastOnce()).statsJob(anyInt());
+ verify(client, atLeastOnce()).statsJob(anyLong());
assertEquals(((TestExchangeCopyProcessor)a).getExchangeCopy().getIn().getHeaders(),
((TestExchangeCopyProcessor)b).getExchangeCopy().getIn().getHeaders());
diff --git a/parent/pom.xml b/parent/pom.xml
index 2deb23d..acd22f6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -502,6 +502,7 @@
<mock-javamail-version>1.9</mock-javamail-version>
<mockwebserver-version>0.0.15</mockwebserver-version>
<mockito-version>1.10.19</mockito-version>
+ <mockito2-version>2.11.0</mockito2-version>
<mongo-java-driver-version>3.5.0</mongo-java-driver-version>
<mongo-java-driver32-version>3.2.2</mongo-java-driver32-version>
<mongo-hadoop-version>1.5.0</mongo-hadoop-version>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
