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/16 17:53:56 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
version 2.11.0 for camel-docker, camel-irc,
camel-smpp and camel-spring-batch
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 b24e027 CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-docker, camel-irc, camel-smpp and camel-spring-batch
b24e027 is described below
commit b24e027f99476ed274cd8cb109ced9a2102818db
Author: aldettinger <al...@gmail.com>
AuthorDate: Thu Nov 16 18:50:46 2017 +0100
CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-docker, camel-irc, camel-smpp and camel-spring-batch
---
components/camel-docker/pom.xml | 1 +
.../camel/component/docker/RemoveImageCmdUriTest.java | 8 +++-----
.../docker/consumer/DockerEventsConsumerTest.java | 7 ++++---
.../docker/consumer/DockerStatsConsumerTest.java | 7 ++++---
.../docker/headers/AttachContainerCmdHeaderTest.java | 19 +++++++++++--------
.../component/docker/headers/AuthCmdHeaderTest.java | 5 +++--
.../docker/headers/BaseDockerHeaderTest.java | 2 +-
.../docker/headers/BuildImageCmdHeaderTest.java | 16 +++++++++-------
.../docker/headers/CommitContainerCmdHeaderTest.java | 5 +++--
.../headers/CopyFileContainerCmdHeaderTest.java | 8 +++++---
.../docker/headers/CreateContainerCmdHeaderTest.java | 12 +++++++-----
.../docker/headers/CreateImageCmdHeaderTest.java | 9 ++++++---
.../docker/headers/DiffContainerCmdHeaderTest.java | 5 +++--
.../docker/headers/ExecCreateCmdHeaderTest.java | 16 +++++++++-------
.../docker/headers/ExecStartCmdHeaderTest.java | 13 ++++++++-----
.../docker/headers/InspectContainerCmdHeaderTest.java | 5 +++--
.../docker/headers/InspectImageCmdHeaderTest.java | 8 +++++---
.../docker/headers/KillContainerCmdHeaderTest.java | 8 +++++---
.../docker/headers/ListContainersCmdHeaderTest.java | 13 +++++++------
.../docker/headers/ListImagesCmdHeaderTest.java | 6 +++---
.../docker/headers/LogContainerCmdHeaderTest.java | 19 +++++++++++--------
.../docker/headers/PauseContainerCmdHeaderTest.java | 5 +++--
.../docker/headers/PullImageCmdHeaderTest.java | 13 ++++++++-----
.../docker/headers/PushImageCmdHeaderTest.java | 8 +++++---
.../docker/headers/RemoveContainerCmdHeaderTest.java | 10 ++++++----
.../docker/headers/RemoveImageCmdHeaderTest.java | 10 +++-------
.../docker/headers/RestartContainerCmdHeaderTest.java | 8 +++++---
.../docker/headers/SearchImagesCmdHeaderTest.java | 8 +++++---
.../docker/headers/StartContainerCmdHeaderTest.java | 5 +++--
.../docker/headers/StopContainerCmdHeaderTest.java | 8 +++++---
.../docker/headers/TagImageCmdHeaderTest.java | 5 +++--
.../docker/headers/TopContainerCmdHeaderTest.java | 8 +++++---
.../docker/headers/UnpauseContainerCmdHeaderTest.java | 5 +++--
.../docker/headers/WaitContainerCmdHeaderTest.java | 11 +++++++----
components/camel-irc/pom.xml | 6 +++---
components/camel-smpp/pom.xml | 6 +-----
.../apache/camel/component/smpp/SmppConsumerTest.java | 2 +-
.../camel/component/smpp/SmppDataSmCommandTest.java | 2 +-
.../smpp/SmppProducerLazySessionCreationTest.java | 2 +-
.../apache/camel/component/smpp/SmppProducerTest.java | 2 +-
.../component/smpp/SmppReplaceSmCommandTest.java | 4 ++--
.../component/smpp/SmppSubmitMultiCommandTest.java | 6 +++---
.../camel/component/smpp/SmppSubmitSmCommandTest.java | 6 +++---
components/camel-spring-batch/pom.xml | 8 ++------
.../spring/batch/SpringBatchEndpointTest.java | 12 +++++-------
.../spring/batch/SpringBatchJobRegistryTest.java | 12 ++++++------
.../batch/support/CamelJobExecutionListenerTest.java | 5 +----
47 files changed, 202 insertions(+), 167 deletions(-)
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index e15d05f..ecb1f1e 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -100,6 +100,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
index 563d700..0073287 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java
@@ -24,10 +24,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.docker.headers.BaseDockerHeaderTest;
import org.junit.Ignore;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Remove Image Request URI parameters are applied properly
*/
@@ -61,14 +62,11 @@ public class RemoveImageCmdUriTest extends BaseDockerHeaderTest<RemoveImageCmd>
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).removeImageCmd(imageId);
-// Mockito.verify(mockObject, Mockito.times(0)).withNoPrune();
-// Mockito.verify(mockObject, Mockito.times(1)).withForce();
-
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.removeImageCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.removeImageCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
index 0c61c4a..65a27ef 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerEventsConsumerTest.java
@@ -27,10 +27,11 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.anyString;
/**
* Consumer test for events on Docker Platform
@@ -50,7 +51,7 @@ public class DockerEventsConsumerTest extends CamelTestSupport {
public void setupMocks() {
Mockito.when(dockerClient.eventsCmd()).thenReturn(eventsCmd);
- Mockito.when(eventsCmd.withSince(Matchers.anyString())).thenReturn(eventsCmd);
+ Mockito.when(eventsCmd.withSince(anyString())).thenReturn(eventsCmd);
}
@Test
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
index 9e1961f..ae68455 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/consumer/DockerStatsConsumerTest.java
@@ -27,10 +27,11 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.mockito.ArgumentMatchers.anyString;
/**
* Consumer test for statistics on Docker Platform
@@ -50,7 +51,7 @@ public class DockerStatsConsumerTest extends CamelTestSupport {
private DockerClient dockerClient;
public void setupMocks() {
- Mockito.when(dockerClient.statsCmd(Matchers.anyString())).thenReturn(statsCmd);
+ Mockito.when(dockerClient.statsCmd(anyString())).thenReturn(statsCmd);
}
@Test
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
index 587f053..e40c378 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AttachContainerCmdHeaderTest.java
@@ -23,10 +23,13 @@ import com.github.dockerjava.core.command.AttachContainerResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Attach Container Request headers are applied properly
*/
@@ -59,18 +62,18 @@ public class AttachContainerCmdHeaderTest extends BaseDockerHeaderTest<AttachCon
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).attachContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withFollowStream(Matchers.eq(followStream));
- Mockito.verify(mockObject, Mockito.times(1)).withLogs(Matchers.eq(logs));
- Mockito.verify(mockObject, Mockito.times(1)).withStdErr(Matchers.eq(stdErr));
- Mockito.verify(mockObject, Mockito.times(1)).withStdOut(Matchers.eq(stdOut));
- Mockito.verify(mockObject, Mockito.times(1)).withTimestamps(Matchers.eq(timestamps));
+ Mockito.verify(mockObject, Mockito.times(1)).withFollowStream(eq(followStream));
+ Mockito.verify(mockObject, Mockito.times(1)).withLogs(eq(logs));
+ Mockito.verify(mockObject, Mockito.times(1)).withStdErr(eq(stdErr));
+ Mockito.verify(mockObject, Mockito.times(1)).withStdOut(eq(stdOut));
+ Mockito.verify(mockObject, Mockito.times(1)).withTimestamps(eq(timestamps));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.attachContainerCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
+ Mockito.when(dockerClient.attachContainerCmd(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
try {
Mockito.when(callback.awaitCompletion()).thenReturn(callback);
} catch (InterruptedException e) {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
index cf4b0e9..fe355d4 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java
@@ -25,10 +25,11 @@ import org.apache.camel.component.docker.DockerClientProfile;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+
/**
* Validates Authentication Request headers are parsed properly
*/
@@ -58,7 +59,7 @@ public class AuthCmdHeaderTest extends BaseDockerHeaderTest<AuthCmd> {
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).authCmd();
- Mockito.verify(mockObject, Mockito.times(1)).withAuthConfig((AuthConfig) Matchers.anyObject());
+ Mockito.verify(mockObject, Mockito.times(1)).withAuthConfig((AuthConfig) any());
}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
index f43d20e..aa11659 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
index dee3e88..ca3d167 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java
@@ -26,10 +26,12 @@ import com.github.dockerjava.core.command.BuildImageResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Build Image Request headers are parsed properly
*/
@@ -58,7 +60,7 @@ public class BuildImageCmdHeaderTest extends BaseDockerHeaderTest<BuildImageCmd>
template.sendBodyAndHeaders("direct:in", inputStream, getHeaders());
- Mockito.verify(dockerClient, Mockito.times(1)).buildImageCmd(Matchers.any(InputStream.class));
+ Mockito.verify(dockerClient, Mockito.times(1)).buildImageCmd(any(InputStream.class));
Mockito.verify(mockObject, Mockito.times(1)).withQuiet(quiet);
Mockito.verify(mockObject, Mockito.times(1)).withNoCache(noCache);
Mockito.verify(mockObject, Mockito.times(1)).withRemove(remove);
@@ -71,7 +73,7 @@ public class BuildImageCmdHeaderTest extends BaseDockerHeaderTest<BuildImageCmd>
template.sendBodyAndHeaders("direct:in", file, getHeaders());
- Mockito.verify(dockerClient, Mockito.times(1)).buildImageCmd(Matchers.any(File.class));
+ Mockito.verify(dockerClient, Mockito.times(1)).buildImageCmd(any(File.class));
Mockito.verify(mockObject, Mockito.times(1)).withQuiet(quiet);
Mockito.verify(mockObject, Mockito.times(1)).withNoCache(noCache);
Mockito.verify(mockObject, Mockito.times(1)).withRemove(remove);
@@ -81,11 +83,11 @@ public class BuildImageCmdHeaderTest extends BaseDockerHeaderTest<BuildImageCmd>
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.buildImageCmd(Matchers.any(InputStream.class))).thenReturn(mockObject);
- Mockito.when(dockerClient.buildImageCmd(Matchers.any(File.class))).thenReturn(mockObject);
+ Mockito.when(dockerClient.buildImageCmd(any(InputStream.class))).thenReturn(mockObject);
+ Mockito.when(dockerClient.buildImageCmd(any(File.class))).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
- Mockito.when(callback.awaitImageId()).thenReturn(Matchers.anyString());
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
+ Mockito.when(callback.awaitImageId()).thenReturn(anyString());
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
index 4488303..132ae54 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CommitContainerCmdHeaderTest.java
@@ -27,10 +27,11 @@ import com.github.dockerjava.api.model.Volumes;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Commit Container Request headers are parsed properly
*/
@@ -123,7 +124,7 @@ public class CommitContainerCmdHeaderTest extends BaseDockerHeaderTest<CommitCmd
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.commitCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.commitCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
index cbfc98d..7e37c7f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CopyFileContainerCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Copy File from Container Request headers are applied properly
*/
@@ -51,13 +53,13 @@ public class CopyFileContainerCmdHeaderTest extends BaseDockerHeaderTest<CopyFil
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).copyFileFromContainerCmd(containerId, resource);
- Mockito.verify(mockObject, Mockito.times(1)).withHostPath(Matchers.eq(hostPath));
+ Mockito.verify(mockObject, Mockito.times(1)).withHostPath(eq(hostPath));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.copyFileFromContainerCmd(Matchers.anyString(), Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.copyFileFromContainerCmd(anyString(), anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
index 8a5317c..c8d5b0f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateContainerCmdHeaderTest.java
@@ -28,10 +28,12 @@ import com.github.dockerjava.api.model.VolumesFrom;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Create Container Request headers are parsed properly
*/
@@ -106,9 +108,9 @@ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateCon
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).createContainerCmd(image);
- Mockito.verify(mockObject, Mockito.times(1)).withExposedPorts(Matchers.eq(exposedPort));
- Mockito.verify(mockObject, Mockito.times(1)).withTty(Matchers.eq(tty));
- Mockito.verify(mockObject, Mockito.times(1)).withName(Matchers.eq(name));
+ Mockito.verify(mockObject, Mockito.times(1)).withExposedPorts(eq(exposedPort));
+ Mockito.verify(mockObject, Mockito.times(1)).withTty(eq(tty));
+ Mockito.verify(mockObject, Mockito.times(1)).withName(eq(name));
Mockito.verify(mockObject, Mockito.times(1)).withWorkingDir(workingDir);
Mockito.verify(mockObject, Mockito.times(1)).withNetworkDisabled(disableNetwork);
Mockito.verify(mockObject, Mockito.times(1)).withHostName(hostname);
@@ -138,7 +140,7 @@ public class CreateContainerCmdHeaderTest extends BaseDockerHeaderTest<CreateCon
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.createContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.createContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
index bc332ce..c4a6e09 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateImageCmdHeaderTest.java
@@ -24,10 +24,13 @@ import com.github.dockerjava.api.command.CreateImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Create Image Request headers are parsed properly
*/
@@ -49,13 +52,13 @@ public class CreateImageCmdHeaderTest extends BaseDockerHeaderTest<CreateImageCm
template.sendBodyAndHeaders("direct:in", inputStream, headers);
- Mockito.verify(dockerClient, Mockito.times(1)).createImageCmd(Matchers.eq(repository), Matchers.any(InputStream.class));
+ Mockito.verify(dockerClient, Mockito.times(1)).createImageCmd(eq(repository), any(InputStream.class));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.createImageCmd(Matchers.anyString(), Matchers.any(InputStream.class))).thenReturn(mockObject);
+ Mockito.when(dockerClient.createImageCmd(anyString(), any(InputStream.class))).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
index cab1df4..a1a95bc 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/DiffContainerCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.ContainerDiffCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Container Diff Request headers are parsed properly
*/
@@ -54,7 +55,7 @@ public class DiffContainerCmdHeaderTest extends BaseDockerHeaderTest<ContainerDi
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.containerDiffCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.containerDiffCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
index 385ed4c..29d933d 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecCreateCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.ExecCreateCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Exec Create Request headers are parsed properly
*/
@@ -56,11 +58,11 @@ public class ExecCreateCmdHeaderTest extends BaseDockerHeaderTest<ExecCreateCmd>
template.sendBodyAndHeaders("direct:in", "", headers);
- Mockito.verify(dockerClient, Mockito.times(1)).execCreateCmd(Matchers.eq(containerId));
- Mockito.verify(mockObject, Mockito.times(1)).withTty(Matchers.eq(tty));
- Mockito.verify(mockObject, Mockito.times(1)).withAttachStderr(Matchers.eq(stdErr));
- Mockito.verify(mockObject, Mockito.times(1)).withAttachStdout(Matchers.eq(stdOut));
- Mockito.verify(mockObject, Mockito.times(1)).withAttachStdin(Matchers.eq(stdIn));
+ Mockito.verify(dockerClient, Mockito.times(1)).execCreateCmd(eq(containerId));
+ Mockito.verify(mockObject, Mockito.times(1)).withTty(eq(tty));
+ Mockito.verify(mockObject, Mockito.times(1)).withAttachStderr(eq(stdErr));
+ Mockito.verify(mockObject, Mockito.times(1)).withAttachStdout(eq(stdOut));
+ Mockito.verify(mockObject, Mockito.times(1)).withAttachStdin(eq(stdIn));
Mockito.verify(mockObject, Mockito.times(1)).withCmd(new String[]{"date", "whoami"});
@@ -68,7 +70,7 @@ public class ExecCreateCmdHeaderTest extends BaseDockerHeaderTest<ExecCreateCmd>
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.execCreateCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.execCreateCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
index cce61ef..23ff776 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ExecStartCmdHeaderTest.java
@@ -23,10 +23,13 @@ import com.github.dockerjava.core.command.ExecStartResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Exec Start Request headers are parsed properly
*/
@@ -50,15 +53,15 @@ public class ExecStartCmdHeaderTest extends BaseDockerHeaderTest<ExecStartCmd> {
template.sendBodyAndHeaders("direct:in", "", headers);
- Mockito.verify(dockerClient, Mockito.times(1)).execStartCmd(Matchers.eq(id));
- Mockito.verify(mockObject, Mockito.times(1)).withTty(Matchers.eq(tty));
+ Mockito.verify(dockerClient, Mockito.times(1)).execStartCmd(eq(id));
+ Mockito.verify(mockObject, Mockito.times(1)).withTty(eq(tty));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.execStartCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
+ Mockito.when(dockerClient.execStartCmd(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
try {
Mockito.when(callback.awaitCompletion()).thenReturn(callback);
} catch (InterruptedException e) {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
index ae1f280..6d8bc57 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectContainerCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.InspectContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Inspect Container Request headers are applied properly
*/
@@ -52,7 +53,7 @@ public class InspectContainerCmdHeaderTest extends BaseDockerHeaderTest<InspectC
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.inspectContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.inspectContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
index ee06d4e..d2d05d5 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/InspectImageCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.InspectImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Inspect Image Request headers are parsed properly
*/
@@ -45,13 +47,13 @@ public class InspectImageCmdHeaderTest extends BaseDockerHeaderTest<InspectImage
template.sendBodyAndHeaders("direct:in", "", headers);
- Mockito.verify(dockerClient, Mockito.times(1)).inspectImageCmd(Matchers.eq(imageId));
+ Mockito.verify(dockerClient, Mockito.times(1)).inspectImageCmd(eq(imageId));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.inspectImageCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.inspectImageCmd(anyString())).thenReturn(mockObject);
}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
index ca05642..edd676a 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/KillContainerCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.KillContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Kill Container Request headers are applied properly
*/
@@ -48,13 +50,13 @@ public class KillContainerCmdHeaderTest extends BaseDockerHeaderTest<KillContain
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).killContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withSignal(Matchers.eq(signal));
+ Mockito.verify(mockObject, Mockito.times(1)).withSignal(eq(signal));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.killContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.killContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
index ec43e31..b6a6706 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListContainersCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.ListContainersCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates List Containers Request headers are applied properly
*/
@@ -55,11 +56,11 @@ public class ListContainersCmdHeaderTest extends BaseDockerHeaderTest<ListContai
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).listContainersCmd();
- Mockito.verify(mockObject, Mockito.times(1)).withShowAll(Matchers.eq(showAll));
- Mockito.verify(mockObject, Mockito.times(1)).withShowSize(Matchers.eq(showSize));
- Mockito.verify(mockObject, Mockito.times(1)).withLimit(Matchers.eq(limit));
- Mockito.verify(mockObject, Mockito.times(1)).withSince(Matchers.eq(since));
- Mockito.verify(mockObject, Mockito.times(1)).withBefore(Matchers.eq(before));
+ Mockito.verify(mockObject, Mockito.times(1)).withShowAll(eq(showAll));
+ Mockito.verify(mockObject, Mockito.times(1)).withShowSize(eq(showSize));
+ Mockito.verify(mockObject, Mockito.times(1)).withLimit(eq(limit));
+ Mockito.verify(mockObject, Mockito.times(1)).withSince(eq(since));
+ Mockito.verify(mockObject, Mockito.times(1)).withBefore(eq(before));
}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
index 0ae7b3e..e4024ea 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ListImagesCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.ListImagesCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates List Image Request headers are parsed properly
*/
@@ -50,8 +51,7 @@ public class ListImagesCmdHeaderTest extends BaseDockerHeaderTest<ListImagesCmd>
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).listImagesCmd();
-// Mockito.verify(mockObject, Mockito.times(1)).withFilters(Matchers.eq(filter));
- Mockito.verify(mockObject, Mockito.times(1)).withShowAll(Matchers.eq(showAll));
+ Mockito.verify(mockObject, Mockito.times(1)).withShowAll(eq(showAll));
}
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
index 0cb3b62..ddefaa1 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
@@ -23,10 +23,13 @@ import com.github.dockerjava.core.command.LogContainerResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Log Container Request headers are applied properly
*/
@@ -61,19 +64,19 @@ public class LogContainerCmdHeaderTest extends BaseDockerHeaderTest<LogContainer
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).logContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withFollowStream(Matchers.eq(followStream));
- Mockito.verify(mockObject, Mockito.times(1)).withTail(Matchers.eq(tail));
+ Mockito.verify(mockObject, Mockito.times(1)).withFollowStream(eq(followStream));
+ Mockito.verify(mockObject, Mockito.times(1)).withTail(eq(tail));
Mockito.verify(mockObject, Mockito.times(1)).withTailAll();
- Mockito.verify(mockObject, Mockito.times(1)).withStdErr(Matchers.eq(stdErr));
- Mockito.verify(mockObject, Mockito.times(1)).withStdOut(Matchers.eq(stdOut));
- Mockito.verify(mockObject, Mockito.times(1)).withTimestamps(Matchers.eq(timestamps));
+ Mockito.verify(mockObject, Mockito.times(1)).withStdErr(eq(stdErr));
+ Mockito.verify(mockObject, Mockito.times(1)).withStdOut(eq(stdOut));
+ Mockito.verify(mockObject, Mockito.times(1)).withTimestamps(eq(timestamps));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.logContainerCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
+ Mockito.when(dockerClient.logContainerCmd(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
try {
Mockito.when(callback.awaitCompletion()).thenReturn(callback);
} catch (InterruptedException e) {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
index 7f6681b..d981cf3 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PauseContainerCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.PauseContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Pause Container Request headers are applied properly
*/
@@ -52,7 +53,7 @@ public class PauseContainerCmdHeaderTest extends BaseDockerHeaderTest<PauseConta
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.pauseContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.pauseContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
index 0504685..76eb1c7 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PullImageCmdHeaderTest.java
@@ -23,10 +23,13 @@ import com.github.dockerjava.core.command.PullImageResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Pull Image Request headers are applied properly
*/
@@ -54,15 +57,15 @@ public class PullImageCmdHeaderTest extends BaseDockerHeaderTest<PullImageCmd> {
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).pullImageCmd(repository);
- Mockito.verify(mockObject, Mockito.times(1)).withTag(Matchers.eq(tag));
- Mockito.verify(mockObject, Mockito.times(1)).withRegistry(Matchers.eq(registry));
+ Mockito.verify(mockObject, Mockito.times(1)).withTag(eq(tag));
+ Mockito.verify(mockObject, Mockito.times(1)).withRegistry(eq(registry));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.pullImageCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
+ Mockito.when(dockerClient.pullImageCmd(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
try {
Mockito.when(callback.awaitCompletion()).thenReturn(callback);
} catch (InterruptedException e) {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
index edec5e3..efecb66 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.component.docker.DockerClientProfile;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Push Image Request headers are applied properly
*/
@@ -69,8 +71,8 @@ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> {
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.pushImageCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
+ Mockito.when(dockerClient.pushImageCmd(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
try {
Mockito.when(callback.awaitCompletion()).thenReturn(callback);
} catch (InterruptedException e) {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
index 9a5fb6d..4a3f65f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveContainerCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.RemoveContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Remove Container Request headers are applied properly
*/
@@ -51,15 +53,15 @@ public class RemoveContainerCmdHeaderTest extends BaseDockerHeaderTest<RemoveCon
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).removeContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withForce(Matchers.eq(force));
- Mockito.verify(mockObject, Mockito.times(1)).withRemoveVolumes(Matchers.eq(removeVolumes));
+ Mockito.verify(mockObject, Mockito.times(1)).withForce(eq(force));
+ Mockito.verify(mockObject, Mockito.times(1)).withRemoveVolumes(eq(removeVolumes));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.removeContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.removeContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
index 50adede..c313113 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveImageCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.RemoveImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Remove Image Request headers are applied properly
*/
@@ -47,19 +48,14 @@ public class RemoveImageCmdHeaderTest extends BaseDockerHeaderTest<RemoveImageCm
headers.put(DockerConstants.DOCKER_NO_PRUNE, noPrune);
headers.put(DockerConstants.DOCKER_FORCE, force);
-
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).removeImageCmd(imageId);
-// Mockito.verify(mockObject, Mockito.times(0)).withNoPrune();
-// Mockito.verify(mockObject, Mockito.times(1)).withForce();
-
-
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.removeImageCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.removeImageCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
index 6ea145e..0b78bd2 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RestartContainerCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.RestartContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Restart Container Request headers are applied properly
*/
@@ -49,13 +51,13 @@ public class RestartContainerCmdHeaderTest extends BaseDockerHeaderTest<RestartC
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).restartContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withtTimeout(Matchers.eq(timeout));
+ Mockito.verify(mockObject, Mockito.times(1)).withtTimeout(eq(timeout));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.restartContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.restartContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
index e2b86d6..9225d3c 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/SearchImagesCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.SearchImagesCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Search Image Request headers are applied properly
*/
@@ -45,14 +47,14 @@ public class SearchImagesCmdHeaderTest extends BaseDockerHeaderTest<SearchImages
template.sendBodyAndHeaders("direct:in", "", headers);
- Mockito.verify(dockerClient, Mockito.times(1)).searchImagesCmd(Matchers.eq(term));
+ Mockito.verify(dockerClient, Mockito.times(1)).searchImagesCmd(eq(term));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.searchImagesCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.searchImagesCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
index 3542805..d013111 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StartContainerCmdHeaderTest.java
@@ -24,10 +24,11 @@ import com.github.dockerjava.api.model.ExposedPort;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Start Container Request headers are applied properly
*/
@@ -55,7 +56,7 @@ public class StartContainerCmdHeaderTest extends BaseDockerHeaderTest<StartConta
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.startContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.startContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
index 0951619..b6dace0 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.StopContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Stop Container Request headers are applied properly
*/
@@ -49,13 +51,13 @@ public class StopContainerCmdHeaderTest extends BaseDockerHeaderTest<StopContain
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).stopContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withTimeout(Matchers.eq(timeout));
+ Mockito.verify(mockObject, Mockito.times(1)).withTimeout(eq(timeout));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.stopContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.stopContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
index c8cef45..7ab0002 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TagImageCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.TagImageCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Tag Image Request headers are applied properly
*/
@@ -60,7 +61,7 @@ public class TagImageCmdHeaderTest extends BaseDockerHeaderTest<TagImageCmd> {
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.tagImageCmd(Matchers.anyString(), Matchers.anyString(), Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.tagImageCmd(anyString(), anyString(), anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
index 4a3492a..43ba7b9 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/TopContainerCmdHeaderTest.java
@@ -23,10 +23,12 @@ import com.github.dockerjava.api.command.TopContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Validates Top Container Request headers are applied properly
*/
@@ -49,13 +51,13 @@ public class TopContainerCmdHeaderTest extends BaseDockerHeaderTest<TopContainer
template.sendBodyAndHeaders("direct:in", "", headers);
Mockito.verify(dockerClient, Mockito.times(1)).topContainerCmd(containerId);
- Mockito.verify(mockObject, Mockito.times(1)).withPsArgs(Matchers.eq(psArgs));
+ Mockito.verify(mockObject, Mockito.times(1)).withPsArgs(eq(psArgs));
}
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.topContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.topContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
index 736a1de..cc0d653 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/UnpauseContainerCmdHeaderTest.java
@@ -23,10 +23,11 @@ import com.github.dockerjava.api.command.UnpauseContainerCmd;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Unpause Container Request headers are applied properly
*/
@@ -52,7 +53,7 @@ public class UnpauseContainerCmdHeaderTest extends BaseDockerHeaderTest<UnpauseC
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.unpauseContainerCmd(Matchers.anyString())).thenReturn(mockObject);
+ Mockito.when(dockerClient.unpauseContainerCmd(anyString())).thenReturn(mockObject);
}
@Override
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
index ca0acde..38c803c 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/WaitContainerCmdHeaderTest.java
@@ -23,10 +23,13 @@ import com.github.dockerjava.core.command.WaitContainerResultCallback;
import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerOperation;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+
/**
* Validates Wait Container Request headers are applied properly
*/
@@ -55,9 +58,9 @@ public class WaitContainerCmdHeaderTest extends BaseDockerHeaderTest<WaitContain
@Override
protected void setupMocks() {
- Mockito.when(dockerClient.waitContainerCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
- Mockito.when(callback.awaitStatusCode()).thenReturn(Matchers.anyInt());
+ Mockito.when(dockerClient.waitContainerCmd(anyString())).thenReturn(mockObject);
+ Mockito.when(mockObject.exec(any())).thenReturn(callback);
+ Mockito.when(callback.awaitStatusCode()).thenReturn(anyInt());
}
@Override
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index 56cd263..eceaeef 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -56,7 +56,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -74,8 +74,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-version}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index eb7dd5a..85cfb6a 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -67,13 +67,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
index cd56393..fd8a6c1 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
@@ -28,7 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertSame;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
index 894c076..50508eb 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppDataSmCommandTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
index 9afd28b..4a38b45 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerLazySessionCreationTest.java
@@ -27,7 +27,7 @@ import org.jsmpp.session.SessionStateListener;
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
index ff3da7b..be4e6f1 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
@@ -27,7 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertSame;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
index 8d8a6fa..9b549ab 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppReplaceSmCommandTest.java
@@ -35,8 +35,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitMultiCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitMultiCommandTest.java
index d9b1a35..e3f7145 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitMultiCommandTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitMultiCommandTest.java
@@ -48,8 +48,8 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -71,7 +71,7 @@ public class SmppSubmitMultiCommandTest {
@AfterClass
public static void tearDownAfterClass() {
if (defaultTimeZone != null) {
- TimeZone.setDefault(defaultTimeZone);
+ TimeZone.setDefault(defaultTimeZone);
}
}
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
index 76fbd27..80a9f5a 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
@@ -45,11 +45,11 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
public class SmppSubmitSmCommandTest {
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 9ce225a..88b0a0e 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -73,6 +73,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -87,14 +88,9 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-spring-javaconfig</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
index 36a8822..b079f85 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
@@ -68,7 +68,6 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
Job dynamicMockjob;
// Camel fixtures
-
@EndpointInject(uri = "mock:test")
MockEndpoint mockEndpoint;
@@ -88,7 +87,7 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
from("direct:dynamicWithJobRegistry").
to("spring-batch:fake?jobFromHeader=true&jobRegistry=#jobRegistry").
errorHandler(deadLetterChannel("mock:error")).
- to("mock:test");
+ to("mock:test");
}
};
}
@@ -105,7 +104,6 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
}
// Tests
-
@Test
public void dynamicJobFailsIfHeaderNotPressent() throws Exception {
@@ -159,7 +157,7 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
final Map<String, Object> headers = new HashMap<>();
headers.put(SpringBatchConstants.JOB_NAME, "dyanmicMockJobFromJobRegistry");
headers.put("jobRegistry", "#jobRegistry");
-
+
sendBody("direct:dynamicWithJobRegistry", "Start the job, please.", headers);
mockEndpoint.assertIsSatisfied();
@@ -224,7 +222,7 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
@Test
public void setNullValueToJobParams() throws Exception {
- // Given
+ // Given
String headerKey = "headerKey";
Date headerValue = null;
@@ -446,6 +444,6 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
// Then
SpringBatchEndpoint batchEndpoint = context().getEndpoint("spring-batch:mockJobFromJobRegistry?jobRegistry=#jobRegistry", SpringBatchEndpoint.class);
Job batchEndpointJob = (Job) FieldUtils.readField(batchEndpoint, "job", true);
- assertSame(mockJobFromJobRegistry, batchEndpointJob);
+ assertSame(mockJobFromJobRegistry, batchEndpointJob);
}
}
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java
index 50960fd..81389b6 100755
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java
@@ -127,18 +127,18 @@ public class SpringBatchJobRegistryTest extends AbstractJUnit4SpringContextTests
ProducerTemplate producerTemplate;
@Bean
- protected ItemReader reader() throws Exception {
- return new CamelItemReader(consumerTemplate, "seda:inputQueue");
+ protected ItemReader<Object> reader() throws Exception {
+ return new CamelItemReader<Object>(consumerTemplate, "seda:inputQueue");
}
@Bean
- protected ItemWriter writer() throws Exception {
- return new CamelItemWriter(producerTemplate, "mock:output");
+ protected ItemWriter<Object> writer() throws Exception {
+ return new CamelItemWriter<Object>(producerTemplate, "mock:output");
}
@Bean
- protected ItemProcessor processor() throws Exception {
- return new CamelItemProcessor(producerTemplate, "direct:processor");
+ protected ItemProcessor<Object, Object> processor() throws Exception {
+ return new CamelItemProcessor<Object, Object>(producerTemplate, "direct:processor");
}
@Bean
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
index 844c931..a59d33d 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java
@@ -21,28 +21,25 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.batch.core.JobExecution;
@RunWith(MockitoJUnitRunner.class)
public class CamelJobExecutionListenerTest extends CamelTestSupport {
// Fixtures
-
@Mock
JobExecution jobExecution;
CamelJobExecutionListener jobExecutionListener;
// Camel fixtures
-
@Override
protected void doPostSetup() throws Exception {
jobExecutionListener = new CamelJobExecutionListener(template(), "seda:eventQueue");
}
// Tests
-
@Test
public void shouldSendBeforeJobEvent() throws Exception {
// When
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].