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/04 03:54:10 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
2.11.0 for camel-atmosphere-websocket,
camel-salesforce-component and camel-script
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 42389a0 CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-atmosphere-websocket, camel-salesforce-component and camel-script
42389a0 is described below
commit 42389a0730989158c62610976ccac42593dd22e7
Author: aldettinger <al...@gmail.com>
AuthorDate: Sat Nov 4 04:44:20 2017 +0100
CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-atmosphere-websocket, camel-salesforce-component and camel-script
---
components/camel-atmosphere-websocket/pom.xml | 1 +
components/camel-salesforce/camel-salesforce-component/pom.xml | 1 +
.../camel/component/salesforce/SalesforceMetaDataExtensionTest.java | 4 ++--
.../camel/component/salesforce/internal/SalesforceSessionTest.java | 6 +++---
components/camel-script/pom.xml | 1 +
.../org/apache/camel/builder/script/JRubyScriptThreadSafeTest.java | 4 ++--
.../src/test/java/org/apache/camel/script/osgi/ActivatorTest.java | 4 ++--
7 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index d393290..9594611 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -89,6 +89,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index ab36d7c..5cd71eb 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -179,6 +179,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceMetaDataExtensionTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceMetaDataExtensionTest.java
index 179ac91..5a8ddb0 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceMetaDataExtensionTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceMetaDataExtensionTest.java
@@ -41,8 +41,8 @@ import org.junit.Test;
import org.mockito.stubbing.Answer;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java
index bbddb5a..22a1168 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SalesforceSessionTest.java
@@ -31,9 +31,9 @@ import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 51b64f8..a9047b7 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -130,6 +130,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/JRubyScriptThreadSafeTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/JRubyScriptThreadSafeTest.java
index 795f3d4..94fbf48 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/JRubyScriptThreadSafeTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/JRubyScriptThreadSafeTest.java
@@ -57,9 +57,9 @@ public class JRubyScriptThreadSafeTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
- context.getProperties().put(Exchange.REUSE_SCRIPT_ENGINE, "true");
+ context.getGlobalOptions().put(Exchange.REUSE_SCRIPT_ENGINE, "true");
// Now the default the value is not use the compiled script, as it could introduce some concurrent issue
- context.getProperties().put(Exchange.COMPILE_SCRIPT, "false");
+ context.getGlobalOptions().put(Exchange.COMPILE_SCRIPT, "false");
from("seda:parallel?concurrentConsumers=5")
diff --git a/components/camel-script/src/test/java/org/apache/camel/script/osgi/ActivatorTest.java b/components/camel-script/src/test/java/org/apache/camel/script/osgi/ActivatorTest.java
index 3c89036..e8ca40d 100644
--- a/components/camel-script/src/test/java/org/apache/camel/script/osgi/ActivatorTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/script/osgi/ActivatorTest.java
@@ -34,7 +34,7 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
public class ActivatorTest {
@@ -46,7 +46,7 @@ public class ActivatorTest {
@Before
public void mockBundle() throws ClassNotFoundException {
mockBundle = Mockito.mock(Bundle.class);
- when(mockBundle.loadClass(anyString())).thenAnswer(new Answer() {
+ when(mockBundle.loadClass(anyString())).thenAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
return ActivatorTest.class.getClassLoader().loadClass(invocation.getArguments()[0].toString());
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].