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/05 12:09:06 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
2.11.0 for camel-google-bigquery, camel-jaxb and camel-spark-rest
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 d71e701 CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-google-bigquery, camel-jaxb and camel-spark-rest
d71e701 is described below
commit d71e70198940cf769549f370804d3eab011f500c
Author: aldettinger <al...@gmail.com>
AuthorDate: Sun Nov 5 12:50:28 2017 +0100
CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-google-bigquery, camel-jaxb and camel-spark-rest
---
components/camel-google-bigquery/pom.xml | 1 +
.../google/bigquery/unit/BaseBigQueryTest.java | 1 -
.../bigquery/unit/GoogleBigQueryProducerTest.java | 4 +--
components/camel-jaxb/pom.xml | 32 ++++++++++------------
.../jaxb/FilteringXmlStreamWriterTest.java | 6 ++--
.../converter/jaxb/NonXmlCharFiltererTest.java | 13 ++++-----
.../converter/jaxb/NonXmlFilterReaderTest.java | 17 ++++++------
...backTypeConverterObjectFactoryDisabledTest.java | 2 +-
...lbackTypeConverterObjectFactoryEnabledTest.java | 2 +-
components/camel-spark-rest/pom.xml | 4 +--
10 files changed, 38 insertions(+), 44 deletions(-)
diff --git a/components/camel-google-bigquery/pom.xml b/components/camel-google-bigquery/pom.xml
index fa3fdf9..ce9a174 100644
--- a/components/camel-google-bigquery/pom.xml
+++ b/components/camel-google-bigquery/pom.xml
@@ -68,6 +68,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
index 0a26322..7bb4b75 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/BaseBigQueryTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.google.bigquery.unit;
import com.google.api.services.bigquery.Bigquery;
import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
-import org.apache.camel.component.google.bigquery.GoogleBigQueryComponent;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConfiguration;
import org.apache.camel.component.google.bigquery.GoogleBigQueryEndpoint;
import org.apache.camel.component.google.bigquery.GoogleBigQueryProducer;
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
index 14c2b72..7f983ae 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/GoogleBigQueryProducerTest.java
@@ -22,14 +22,12 @@ import java.util.List;
import java.util.Map;
import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
-import com.google.common.collect.Lists;
import org.apache.camel.Exchange;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
public class GoogleBigQueryProducerTest extends BaseBigQueryTest {
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index f8d5588..0ea2b04 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -67,16 +67,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-javaconfig</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
@@ -92,18 +82,24 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
index 4c30263..b8b3801 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/FilteringXmlStreamWriterTest.java
@@ -23,10 +23,10 @@ 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.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
index 4ae728f..549c90d 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlCharFiltererTest.java
@@ -22,18 +22,18 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyChar;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyChar;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -110,7 +110,6 @@ public class NonXmlCharFiltererTest {
@Test
public void testFilter1ArgNullArg() {
- when(nonXmlCharFiltererMock.filter(anyString())).thenCallRealMethod();
nonXmlCharFiltererMock.filter(null);
verify(nonXmlCharFiltererMock, never()).filter(any(char[].class), anyInt(), anyInt());
}
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
index e1f5ed0..b75d8ef 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/NonXmlFilterReaderTest.java
@@ -24,15 +24,15 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -57,9 +57,10 @@ public class NonXmlFilterReaderTest {
when(readerMock.read(same(buffer), eq(3), eq(5))).thenAnswer(new Answer<Integer>() {
public Integer answer(InvocationOnMock invocation) throws Throwable {
- ConstantReader reader = new ConstantReader(new char[] {'a', 'b', 'c'});
- Object[] args = invocation.getArguments();
- return reader.read((char[]) args[0], (Integer) args[1], (Integer)args[2]);
+ try (ConstantReader reader = new ConstantReader(new char[] {'a', 'b', 'c'})) {
+ Object[] args = invocation.getArguments();
+ return reader.read((char[])args[0], (Integer)args[1], (Integer)args[2]);
+ }
}
});
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
index 4e5e690..cc617cd 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryDisabledTest.java
@@ -38,7 +38,7 @@ public class FallbackTypeConverterObjectFactoryDisabledTest extends CamelTestSup
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- context.getProperties().put(FallbackTypeConverter.OBJECT_FACTORY, "false");
+ context.getGlobalOptions().put(FallbackTypeConverter.OBJECT_FACTORY, "false");
return new RouteBuilder(context) {
@Override
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
index 741213a..c53bf89 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/FallbackTypeConverterObjectFactoryEnabledTest.java
@@ -37,7 +37,7 @@ public class FallbackTypeConverterObjectFactoryEnabledTest extends CamelTestSupp
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- context.getProperties().put(FallbackTypeConverter.OBJECT_FACTORY, "true");
+ context.getGlobalOptions().put(FallbackTypeConverter.OBJECT_FACTORY, "true");
return new RouteBuilder(context) {
@Override
diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml
index 71a6d60..764a985 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -104,8 +104,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>
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].