You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/08 09:24:02 UTC
[camel] branch master updated: Fixed test due mockito upgrade
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 b9e77f5 Fixed test due mockito upgrade
b9e77f5 is described below
commit b9e77f530e26ceb15e50395a9d0c301e8f8455ac
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 8 10:20:20 2020 +0100
Fixed test due mockito upgrade
---
.../java/org/apache/camel/component/ganglia/GangliaProducerTest.java | 1 -
.../org/apache/camel/component/openstack/glance/GlanceProducerTest.java | 2 +-
.../org/apache/camel/component/openstack/nova/KeypairProducerTest.java | 2 +-
.../org/apache/camel/component/openstack/nova/ServerProducerTest.java | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProducerTest.java b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProducerTest.java
index c191b1c..a45aab9 100644
--- a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProducerTest.java
+++ b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProducerTest.java
@@ -73,7 +73,6 @@ public class GangliaProducerTest {
public void setup() {
when(mockEndpoint.getConfiguration()).thenReturn(mockConf);
- when(mockConf.getPrefix()).thenReturn(null);
when(mockConf.getGroupName()).thenReturn(CONF_GROUP_NAME);
when(mockConf.getMetricName()).thenReturn(CONF_METRIC_NAME);
when(mockConf.getType()).thenReturn(CONF_TYPE);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
index f81a889..09b2543 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
@@ -53,7 +53,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Mock
private GlanceEndpoint endpoint;
- @Mock
+ @Mock(lenient = true)
private ImageService imageService;
@Captor
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
index a0e9e8d..2fada71 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.when;
public class KeypairProducerTest extends NovaProducerTestSupport {
private static final String KEYPAIR_NAME = "keypairName";
- @Mock
+ @Mock(lenient = true)
private Keypair osTestKeypair;
private Keypair dummyKeypair;
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
index c0c26df..ab27c1a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/ServerProducerTest.java
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class ServerProducerTest extends NovaProducerTestSupport {
- @Mock
+ @Mock(lenient = true)
private org.openstack4j.model.compute.Server testOSServer;
@Mock