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 0c4cd88 CAMEL-11869: Upgrade mockito-core to 2.11.0 for
camel-bean-validator and camel-cometd
0c4cd88 is described below
commit 0c4cd88be22d7cc1c052907bbc30a7d881b6ec29
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Wed Nov 8 18:43:37 2017 +0100
CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-bean-validator and
camel-cometd
---
components/camel-bean-validator/pom.xml | 1 +
.../bean/validator/BeanValidationException.java | 2 --
.../CustomValidationProviderResolverTest.java | 3 ++-
components/camel-cometd/pom.xml | 20 ++++++++++----------
.../camel/component/cometd/CometBindingTest.java | 2 +-
.../camel/component/cometd/CometdConsumerTest.java | 15 ++++-----------
.../cometd/CometdCrossOriginConsumerTest.java | 2 +-
.../camel/component/cometd/CometdProducerTest.java | 7 +++----
8 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/components/camel-bean-validator/pom.xml
b/components/camel-bean-validator/pom.xml
index 22f0567..28d4abd 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -82,6 +82,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
index 6e4ece2..537fc4a 100644
---
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
+++
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
@@ -25,8 +25,6 @@ import org.apache.camel.ValidationException;
/**
* A bean validation exception occurred
- *
- * @version
*/
public class BeanValidationException extends ValidationException {
diff --git
a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index aca697e..c6f74af 100644
---
a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++
b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -21,6 +21,7 @@ import java.util.List;
import static java.util.Arrays.asList;
import javax.validation.ValidationProviderResolver;
+import javax.validation.spi.ValidationProvider;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -41,7 +42,7 @@ public class CustomValidationProviderResolverTest extends
CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
- List validationProviders = asList(new HibernateValidator());
+ List<ValidationProvider<?>> validationProviders = asList(new
HibernateValidator());
given(validationProviderResolver.getValidationProviders()).willReturn(validationProviders);
super.doPreSetup();
}
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index ba96756..82ccf8e 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -81,6 +81,11 @@
<version>${cometd-java-server}</version>
</dependency>
<dependency>
+ <groupId>org.cometd.java</groupId>
+ <artifactId>bayeux-api</artifactId>
+ <version>${cometd-java-server}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
@@ -92,10 +97,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -116,12 +122,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <!-- stream is used for interactive test -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-stream</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
index de88b56..a382b02 100644
---
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
+++
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
@@ -30,7 +30,7 @@ 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.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
index c2fc987..85ca8ab 100644
---
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
+++
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
@@ -30,18 +30,17 @@ import org.eclipse.jetty.util.log.Logger;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class CometdConsumerTest {
private static final String USER_NAME = "userName";
- private static final String MEMEBER_USER_NAME = "bob";
private CometdConsumer testObj;
@Mock
private CometdEndpoint endpoint;
@@ -62,10 +61,8 @@ public class CometdConsumerTest {
@Before
public void before() {
-
when(bayeuxServerImpl.newLocalSession(anyString())).thenReturn(localSession);
- //when(bayeuxServerImpl.get).thenReturn(logger);
-
when(bayeuxServerImpl.getChannel(anyString())).thenReturn(serverChannel);
-
when(bayeuxServerImpl.createChannelIfAbsent(anyString())).thenReturn(markedReferenceServerChannel);
+
when(bayeuxServerImpl.newLocalSession(ArgumentMatchers.isNull())).thenReturn(localSession);
+
when(bayeuxServerImpl.createChannelIfAbsent(ArgumentMatchers.isNull())).thenReturn(markedReferenceServerChannel);
when(markedReferenceServerChannel.getReference()).thenReturn(serverChannel);
testObj = new CometdConsumer(endpoint, processor);
@@ -74,8 +71,6 @@ public class CometdConsumerTest {
Set<String> attributeNames = new HashSet<String>();
String attributeKey = USER_NAME;
attributeNames.add(attributeKey);
- when(remote.getAttributeNames()).thenReturn(attributeNames);
- when(remote.getAttribute(attributeKey)).thenReturn(MEMEBER_USER_NAME);
}
@Test
@@ -94,5 +89,3 @@ public class CometdConsumerTest {
}
-
-
diff --git
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdCrossOriginConsumerTest.java
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdCrossOriginConsumerTest.java
index 289da3f..7d4fd18 100644
---
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdCrossOriginConsumerTest.java
+++
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdCrossOriginConsumerTest.java
@@ -29,7 +29,7 @@ import org.eclipse.jetty.servlets.CrossOriginFilter;
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.Mockito.when;
diff --git
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerTest.java
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerTest.java
index c151b95..a0cb75d 100644
---
a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerTest.java
+++
b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerTest.java
@@ -22,11 +22,11 @@ import org.cometd.server.BayeuxServerImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
@@ -42,7 +42,7 @@ public class CometdProducerTest {
@Before
public void before() {
-
when(bayeuxServerImpl.newLocalSession(anyString())).thenReturn(localSession);
+
when(bayeuxServerImpl.newLocalSession(ArgumentMatchers.isNull())).thenReturn(localSession);
testObj = new CometdProducer(endpoint);
testObj.setBayeux(bayeuxServerImpl);
}
@@ -58,7 +58,6 @@ public class CometdProducerTest {
ProducerService result = testObj.getProducerService();
// assert
-
assertEquals(expectedService, result);
}
}
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
