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 c883e79 CAMEL-11869: Upgrade mockito-core to version 2.11.0 for
camel-gora
c883e79 is described below
commit c883e7988f92fe1d82a1cbd1aa0b9b3ac7ee4940
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Wed Nov 15 18:42:55 2017 +0100
CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-gora
---
components/camel-gora/pom.xml | 10 ++----
.../camel/component/gora/GoraConsumerTest.java | 36 ++++++++++------------
.../camel/component/gora/GoraProducerTest.java | 14 ++++++---
3 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 39ee76e..54434e8 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -72,8 +72,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>
<dependency>
@@ -81,11 +81,6 @@
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
- </dependency>
<!-- apache camel -->
<dependency>
@@ -155,7 +150,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
diff --git
a/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraConsumerTest.java
b/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraConsumerTest.java
index a00f865..62e61fd 100644
---
a/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraConsumerTest.java
+++
b/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraConsumerTest.java
@@ -19,71 +19,69 @@ package org.apache.camel.component.gora;
import java.lang.reflect.InvocationTargetException;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.gora.persistency.Persistent;
import org.apache.gora.query.Query;
import org.apache.gora.store.DataStore;
-import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* GORA Consumer Tests
*/
+@RunWith(MockitoJUnitRunner.class)
public class GoraConsumerTest extends GoraTestSupport {
/**
* Mock CamelExchange
*/
+ @Mock
private Exchange mockCamelExchange;
/**
* Mock Gora Endpoint
*/
+ @Mock
private GoraEndpoint mockGoraEndpoint;
/**
* Mock Gora Configuration
*/
+ @Mock
private GoraConfiguration mockGoraConfiguration;
/**
* Mock Camel Message
*/
+ @Mock
private Message mockCamelMessage;
/**
* Mock Gora DataStore
*/
- private DataStore mockDatastore;
+ @Mock
+ private DataStore<Object, Persistent> mockDatastore;
/**
* Mock Processor
*/
private Processor mockGoraProcessor;
-
- @Before
- public void setUp() {
- //setup mocks
- mockCamelExchange = mock(Exchange.class);
- mockGoraEndpoint = mock(GoraEndpoint.class);
- mockGoraConfiguration = mock(GoraConfiguration.class);
- mockCamelMessage = mock(Message.class);
- mockDatastore = mock(DataStore.class);
- //setup default conditions
- when(mockCamelExchange.getIn()).thenReturn(mockCamelMessage);
-
when(mockCamelExchange.getPattern()).thenReturn(ExchangePattern.InOnly);
- }
+ /**
+ * Mock Query
+ */
+ @Mock
+ private Query<Object, Persistent> mockQuery;
@Test
public void consumerInstantiationWithMocksShouldSucceed() throws
ClassNotFoundException, NoSuchMethodException, IllegalAccessException,
InvocationTargetException {
- final Query mockQuery = mock(Query.class);
when(mockDatastore.newQuery()).thenReturn(mockQuery);
- GoraConsumer goraConsumer = new GoraConsumer(mockGoraEndpoint,
mockGoraProcessor, mockGoraConfiguration, mockDatastore);
+ new GoraConsumer(mockGoraEndpoint, mockGoraProcessor,
mockGoraConfiguration, mockDatastore);
}
}
diff --git
a/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraProducerTest.java
b/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraProducerTest.java
index 4fd7203..53805fb 100644
---
a/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraProducerTest.java
+++
b/components/camel-gora/src/test/java/org/apache/camel/component/gora/GoraProducerTest.java
@@ -17,12 +17,14 @@
package org.apache.camel.component.gora;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.gora.persistency.Persistent;
import org.apache.gora.store.DataStore;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.atMost;
@@ -33,6 +35,7 @@ import static org.mockito.Mockito.when;
/**
* GORA Producer Tests
*/
+@RunWith(MockitoJUnitRunner.class)
public class GoraProducerTest extends GoraTestSupport {
// TODO: Query methods does not yet has tests
@@ -40,27 +43,32 @@ public class GoraProducerTest extends GoraTestSupport {
/**
* Mock CamelExchange
*/
+ @Mock
private Exchange mockCamelExchange;
/**
* Mock Gora Endpoint
*/
+ @Mock
private GoraEndpoint mockGoraEndpoint;
/**
* Mock Gora Configuration
*/
+ @Mock
private GoraConfiguration mockGoraConfiguration;
/**
* Mock Camel Message
*/
+ @Mock
private Message mockCamelMessage;
/**
* Mock Gora DataStore
*/
- private DataStore mockDatastore;
+ @Mock
+ private DataStore<Object, Persistent> mockDatastore;
@Before
public void setUp() {
@@ -69,11 +77,9 @@ public class GoraProducerTest extends GoraTestSupport {
mockGoraEndpoint = mock(GoraEndpoint.class);
mockGoraConfiguration = mock(GoraConfiguration.class);
mockCamelMessage = mock(Message.class);
- mockDatastore = mock(DataStore.class);
//setup default conditions
when(mockCamelExchange.getIn()).thenReturn(mockCamelMessage);
-
when(mockCamelExchange.getPattern()).thenReturn(ExchangePattern.InOnly);
}
@Test(expected = RuntimeException.class)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
