You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/27 15:39:00 UTC
[camel] 13/43: [CAMEL-11807] Upgrade camel-openstack to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e061d3e0fa059f9023f19433af4ec6fde4a4ba2c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:40:49 2020 +0200
[CAMEL-11807] Upgrade camel-openstack to junit5
---
components/camel-openstack/pom.xml | 6 +++---
.../component/openstack/AbstractProducerTestSupport.java | 10 +++++-----
.../openstack/cinder/CinderProducerTestSupport.java | 10 +++++-----
.../camel/component/openstack/cinder/VolumeProducerTest.java | 12 ++++++------
.../openstack/cinder/VolumeSnapshotProducerTest.java | 12 ++++++------
.../camel/component/openstack/glance/GlanceProducerTest.java | 12 ++++++------
.../component/openstack/keystone/DomainProducerTest.java | 12 ++++++------
.../component/openstack/keystone/GroupProducerTest.java | 12 ++++++------
.../openstack/keystone/KeystoneProducerTestSupport.java | 10 +++++-----
.../component/openstack/keystone/ProjectProducerTest.java | 12 ++++++------
.../component/openstack/keystone/RegionProducerTest.java | 12 ++++++------
.../camel/component/openstack/keystone/UserProducerTest.java | 12 ++++++------
.../component/openstack/neutron/NetworkProducerTest.java | 12 ++++++------
.../openstack/neutron/NeutronProducerTestSupport.java | 10 +++++-----
.../camel/component/openstack/neutron/PortProducerTest.java | 12 ++++++------
.../component/openstack/neutron/RouterProducerTest.java | 12 ++++++------
.../component/openstack/neutron/SubnetProducerTest.java | 12 ++++++------
.../camel/component/openstack/nova/FlavorProducerTest.java | 12 ++++++------
.../camel/component/openstack/nova/KeypairProducerTest.java | 12 ++++++------
.../component/openstack/nova/NovaProducerTestSupport.java | 10 +++++-----
.../camel/component/openstack/nova/ServerProducerTest.java | 12 ++++++------
.../component/openstack/swift/ContainerProducerTest.java | 12 ++++++------
.../camel/component/openstack/swift/ObjectProducerTest.java | 12 ++++++------
.../component/openstack/swift/SwiftProducerTestSupport.java | 10 +++++-----
24 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 0e8a909..33b1937 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -55,13 +55,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
index 78a1b1e..b14dc8b 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
@@ -24,15 +24,15 @@ import org.apache.camel.Message;
import org.apache.camel.Producer;
import org.apache.camel.impl.engine.DefaultHeadersMapFactory;
import org.apache.camel.support.DefaultMessage;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.OSClient.OSClientV3;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public abstract class AbstractProducerTestSupport {
@Mock
@@ -48,7 +48,7 @@ public abstract class AbstractProducerTestSupport {
protected Producer producer;
- @Before
+ @BeforeEach
public void before() throws IOException {
msg = new DefaultMessage(camelContext);
when(exchange.getIn()).thenReturn(msg);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
index 9de4e65..f302cce 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.cinder;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.BlockStorageService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class CinderProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class CinderProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected BlockStorageService blockStorageService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.blockStorage()).thenReturn(blockStorageService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
index 6b26652..0bfe8ca 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeProducerTest.java
@@ -20,13 +20,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.cinder.producer.VolumeProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.storage.BlockVolumeService;
import org.openstack4j.model.common.ActionResponse;
@@ -41,7 +41,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class VolumeProducerTest extends CinderProducerTestSupport {
@Mock
@@ -64,7 +64,7 @@ public class VolumeProducerTest extends CinderProducerTestSupport {
private Volume dummyVolume;
- @Before
+ @BeforeEach
public void setUp() {
when(blockStorageService.volumes()).thenReturn(volumeService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
index d099400..1b0dc11 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/VolumeSnapshotProducerTest.java
@@ -20,13 +20,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.cinder.producer.SnapshotProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.storage.BlockVolumeSnapshotService;
import org.openstack4j.model.common.ActionResponse;
@@ -40,7 +40,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
@Mock
@@ -63,7 +63,7 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport {
private VolumeSnapshot dummyVolumeSnapshot;
- @Before
+ @BeforeEach
public void setUp() {
when(blockStorageService.snapshots()).thenReturn(snapshotService);
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 09b2543..cc2aa59 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
@@ -23,14 +23,14 @@ import java.util.UUID;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.image.ImageService;
import org.openstack4j.model.common.Payload;
@@ -47,7 +47,7 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class GlanceProducerTest extends AbstractProducerTestSupport {
@Mock
@@ -73,7 +73,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Spy
private Image osImage = Builders.image().build();
- @Before
+ @BeforeEach
public void setUp() {
producer = new GlanceProducer(endpoint, client);
when(client.images()).thenReturn(imageService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
index a1ab71b..4261d7f 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/DomainProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.DomainProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.DomainService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class DomainProducerTest extends KeystoneProducerTestSupport {
private Domain dummyDomain;
@@ -60,7 +60,7 @@ public class DomainProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> domainIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.domains()).thenReturn(domainService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
index 89bc885..fd33015 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.GroupProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.GroupService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class GroupProducerTest extends KeystoneProducerTestSupport {
private Group dummyGroup;
@@ -60,7 +60,7 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> groupIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.groups()).thenReturn(groupService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java
index 731a278..e10d095 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/KeystoneProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.keystone;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.identity.v3.IdentityService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class KeystoneProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class KeystoneProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected IdentityService identityService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.identity()).thenReturn(identityService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
index 9577915..4c84521 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/ProjectProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.ProjectProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.ProjectService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ProjectProducerTest extends KeystoneProducerTestSupport {
private Project dummyProject;
@@ -60,7 +60,7 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> projectIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.projects()).thenReturn(projectService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
index 2874d2a..e8d65c3 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/RegionProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.RegionProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.RegionService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RegionProducerTest extends KeystoneProducerTestSupport {
private Region dummyRegion;
@@ -60,7 +60,7 @@ public class RegionProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> regionIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.regions()).thenReturn(regionService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
index 73299c7..856da1a 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/UserProducerTest.java
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.UserProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.identity.v3.UserService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class UserProducerTest extends KeystoneProducerTestSupport {
private User dummyUser;
@@ -60,7 +60,7 @@ public class UserProducerTest extends KeystoneProducerTestSupport {
@Captor
private ArgumentCaptor<String> userIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(identityService.users()).thenReturn(userService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
index 6501467..78389bf 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NetworkProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.NetworkProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.NetworkService;
import org.openstack4j.model.common.ActionResponse;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class NetworkProducerTest extends NeutronProducerTestSupport {
private Network dummyNetwork;
@@ -61,7 +61,7 @@ public class NetworkProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<String> networkIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.network()).thenReturn(networkService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java
index a4bb766..2387cab 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/NeutronProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.neutron;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.networking.NetworkingService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class NeutronProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class NeutronProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected NetworkingService networkingService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.networking()).thenReturn(networkingService);
}
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
index 0075acc..92efe72 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/PortProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.PortProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.PortService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class PortProducerTest extends NeutronProducerTestSupport {
private Port dummyPort;
@@ -60,7 +60,7 @@ public class PortProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<String> portIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.port()).thenReturn(portService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
index 0767267..e5ce385 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/RouterProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.RouterProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.RouterService;
import org.openstack4j.model.common.ActionResponse;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class RouterProducerTest extends NeutronProducerTestSupport {
private Router dummyRouter;
@@ -72,7 +72,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<AttachInterfaceType> itfTypeCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.router()).thenReturn(routerService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
index 3e9601b..01415a3 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/neutron/SubnetProducerTest.java
@@ -22,13 +22,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.producer.SubnetProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.networking.SubnetService;
import org.openstack4j.model.common.ActionResponse;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SubnetProducerTest extends NeutronProducerTestSupport {
private Subnet dummySubnet;
@@ -61,7 +61,7 @@ public class SubnetProducerTest extends NeutronProducerTestSupport {
@Captor
private ArgumentCaptor<String> subnetIdCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(networkingService.subnet()).thenReturn(subnetService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
index f261b1b..29e4cc1 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/FlavorProducerTest.java
@@ -24,13 +24,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.FlavorsProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.compute.FlavorService;
import org.openstack4j.model.common.ActionResponse;
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class FlavorProducerTest extends NovaProducerTestSupport {
@Mock
@@ -64,7 +64,7 @@ public class FlavorProducerTest extends NovaProducerTestSupport {
private Flavor dummyFlavor;
- @Before
+ @BeforeEach
public void setUp() {
when(computeService.flavors()).thenReturn(flavorService);
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 2fada71..851268e 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
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.KeypairProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.compute.KeypairService;
import org.openstack4j.model.compute.Keypair;
import org.openstack4j.openstack.compute.domain.NovaKeypair;
@@ -39,7 +39,7 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class KeypairProducerTest extends NovaProducerTestSupport {
private static final String KEYPAIR_NAME = "keypairName";
@@ -57,7 +57,7 @@ public class KeypairProducerTest extends NovaProducerTestSupport {
@Captor
private ArgumentCaptor<String> keypairCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(computeService.keypairs()).thenReturn(keypairService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java
index f719236..766d0a9 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/NovaProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.nova;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.compute.ComputeService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class NovaProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class NovaProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected ComputeService computeService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.compute()).thenReturn(computeService);
}
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 ab27c1a..012421d 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
@@ -20,13 +20,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.ServerProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.Builders;
import org.openstack4j.api.compute.ServerService;
import org.openstack4j.model.common.ActionResponse;
@@ -43,7 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ServerProducerTest extends NovaProducerTestSupport {
@Mock(lenient = true)
@@ -66,7 +66,7 @@ public class ServerProducerTest extends NovaProducerTestSupport {
private ServerCreate dummyServer;
- @Before
+ @BeforeEach
public void setUp() {
when(computeService.servers()).thenReturn(serverService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
index 6717c09..67e1fca 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ContainerProducerTest.java
@@ -23,13 +23,13 @@ import java.util.Map;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.swift.producer.ContainerProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.ObjectStorageContainerService;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.storage.object.SwiftContainer;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ContainerProducerTest extends SwiftProducerTestSupport {
private static final String CONTAINER_NAME = "containerName";
@@ -71,7 +71,7 @@ public class ContainerProducerTest extends SwiftProducerTestSupport {
@Captor
private ArgumentCaptor<ContainerListOptions> containerListOptionsCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(objectStorageService.containers()).thenReturn(containerService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
index cf6929a..7708143 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/ObjectProducerTest.java
@@ -26,13 +26,13 @@ import java.util.UUID;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.swift.producer.ObjectProducer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.ObjectStorageObjectService;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.common.Payload;
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class ObjectProducerTest extends SwiftProducerTestSupport {
private static final String CONTAINER_NAME = "containerName";
@@ -75,7 +75,7 @@ public class ObjectProducerTest extends SwiftProducerTestSupport {
@Captor
private ArgumentCaptor<Map<String, String>> dataCaptor;
- @Before
+ @BeforeEach
public void setUp() {
when(objectStorageService.objects()).thenReturn(objectService);
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java
index 2954d34..6d4a11d 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/swift/SwiftProducerTestSupport.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.openstack.swift;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
import org.openstack4j.api.storage.ObjectStorageService;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
public class SwiftProducerTestSupport extends AbstractProducerTestSupport {
@Mock
@@ -34,7 +34,7 @@ public class SwiftProducerTestSupport extends AbstractProducerTestSupport {
@Mock
protected ObjectStorageService objectStorageService;
- @Before
+ @BeforeEach
public void setUpComputeService() {
when(client.objectStorage()).thenReturn(objectStorageService);
}