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 c1b3a84 CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-core-xml c1b3a84 is described below commit c1b3a840e1ccdb4a5e982319e25620b56f0fa868 Author: aldettinger <aldettin...@gmail.com> AuthorDate: Mon Nov 6 19:56:20 2017 +0100 CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-core-xml --- components/camel-core-xml/pom.xml | 1 + .../apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml index 5b4ffb2..f06054a 100644 --- a/components/camel-core-xml/pom.xml +++ b/components/camel-core-xml/pom.xml @@ -49,6 +49,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java b/components/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java index bcccfca..61b53fd 100644 --- a/components/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java +++ b/components/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java @@ -43,7 +43,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.invocation.Invocation; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; @@ -83,7 +83,7 @@ public class AbstractCamelContextFactoryBeanTest { // program the property resolution in context mock when(context.resolvePropertyPlaceholders(anyString())).thenAnswer(invocation -> { - final String placeholder = invocation.getArgumentAt(0, String.class); + final String placeholder = invocation.getArgument(0); // we receive the argument and check if the method should return a // value that can be converted to boolean -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" <commits@camel.apache.org>'].