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 b811422 CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-asterisk, camel-cassandraql and camel-openstack b811422 is described below commit b811422ae62e315191caf6548fbe79c5e3d9a407 Author: aldettinger <aldettin...@gmail.com> AuthorDate: Thu Nov 23 21:39:11 2017 +0100 CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-asterisk, camel-cassandraql and camel-openstack --- components/camel-asterisk/pom.xml | 7 +- components/camel-cassandraql/pom.xml | 1 + .../cassandra/CassandraComponentProducerTest.java | 15 ++-- .../CassandraComponentProducerUnpreparedTest.java | 9 ++- .../NamedCassandraIdempotentRepositoryTest.java | 2 +- components/camel-openstack/pom.xml | 5 +- .../openstack/AbstractProducerTestSupport.java | 6 +- .../cinder/CinderProducerTestSupport.java | 13 +--- .../openstack/cinder/VolumeProducerTest.java | 34 +++++++--- .../cinder/VolumeSnapshotProducerTest.java | 34 +++++++--- .../openstack/glance/GlanceProducerTest.java | 44 ++++++------ .../openstack/keystone/DomainProducerTest.java | 48 +++++++------ .../openstack/keystone/GroupProducerTest.java | 48 +++++++------ .../keystone/KeystoneProducerTestSupport.java | 28 +------- .../openstack/keystone/ProjectProducerTest.java | 47 ++++++++----- .../openstack/keystone/RegionProducerTest.java | 47 ++++++++----- .../openstack/keystone/UserProducerTest.java | 47 ++++++++----- .../openstack/neutron/NetworkProducerTest.java | 37 ++++++---- .../neutron/NeutronProducerTestSupport.java | 23 +------ .../openstack/neutron/PortProducerTest.java | 46 ++++++++----- .../openstack/neutron/RouterProducerTest.java | 79 +++++++++++++--------- .../openstack/neutron/SubnetProducerTest.java | 37 ++++++---- .../openstack/nova/FlavorProducerTest.java | 40 +++++++---- .../openstack/nova/KeypairProducerTest.java | 29 +++++--- .../openstack/nova/NovaProducerTestSupport.java | 18 +---- .../openstack/nova/ServerProducerTest.java | 38 ++++++++--- .../openstack/swift/ContainerProducerTest.java | 50 +++++++++----- .../openstack/swift/ObjectProducerTest.java | 43 ++++++++---- .../openstack/swift/SwiftProducerTestSupport.java | 13 +--- 29 files changed, 520 insertions(+), 368 deletions(-) diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml index e151034..d3fb9e5 100644 --- a/components/camel-asterisk/pom.xml +++ b/components/camel-asterisk/pom.xml @@ -79,13 +79,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test</artifactId> <scope>test</scope> </dependency> diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml index 8841491..72a8ffc 100644 --- a/components/camel-cassandraql/pom.xml +++ b/components/camel-cassandraql/pom.xml @@ -108,6 +108,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java index 1578982..de318f3 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java @@ -87,7 +87,7 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { return; } - Object response = producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang")); + producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang")); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); @@ -132,8 +132,8 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { return; } - Object response = producerTemplate.requestBodyAndHeader(new Object[]{"Claus 2", "Ibsen 2", "c_ibsen"}, - CassandraConstants.CQL_QUERY, "update camel_user set first_name=?, last_name=? where login=?"); + producerTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, + "update camel_user set first_name=?, last_name=? where login=?"); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); @@ -152,8 +152,8 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { return; } - Object response = loadBalancingPolicyTemplate.requestBodyAndHeader(new Object[]{"Claus 2", "Ibsen 2", "c_ibsen"}, - CassandraConstants.CQL_QUERY, "update camel_user set first_name=?, last_name=? where login=?"); + loadBalancingPolicyTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, + "update camel_user set first_name=?, last_name=? where login=?"); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); @@ -179,8 +179,7 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { .with(set("first_name", bindMarker())) .and(set("last_name", bindMarker())) .where(eq("login", bindMarker())); - Object response = producerTemplate.requestBodyAndHeader(new Object[]{"Claus 2", "Ibsen 2", "c_ibsen"}, - CassandraConstants.CQL_QUERY, update); + producerTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, update); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); @@ -243,6 +242,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest { CassandraEndpoint endpoint = getMandatoryEndpoint(NOT_CONSISTENT_URI, CassandraEndpoint.class); assertEquals(ConsistencyLevel.ANY, endpoint.getConsistencyLevel()); - Object response = notConsistentProducerTemplate.requestBody(Arrays.asList("j_anstey", "Jonathan", "Anstey")); + notConsistentProducerTemplate.requestBody(Arrays.asList("j_anstey", "Jonathan", "Anstey")); } } diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java index 348b6a4..402d6d0 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java @@ -64,7 +64,7 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest @Test public void testRequestUriCql() throws Exception { - Object response = producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang")); + producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem", "Jiang")); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); @@ -97,8 +97,8 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest @Test public void testRequestMessageCql() throws Exception { - Object response = producerTemplate.requestBodyAndHeader(new Object[]{"Claus 2", "Ibsen 2", "c_ibsen"}, - CassandraConstants.CQL_QUERY, "update camel_user set first_name=?, last_name=? where login=?"); + producerTemplate.requestBodyAndHeader(new Object[] {"Claus 2", "Ibsen 2", "c_ibsen"}, CassandraConstants.CQL_QUERY, + "update camel_user set first_name=?, last_name=? where login=?"); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); @@ -120,8 +120,7 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest .with(set("first_name", "Claus 2")) .and(set("last_name", "Ibsen 2")) .where(eq("login", "c_ibsen")); - Object response = producerTemplate.requestBodyAndHeader(null, - CassandraConstants.CQL_QUERY, update); + producerTemplate.requestBodyAndHeader(null, CassandraConstants.CQL_QUERY, update); Cluster cluster = CassandraUnitUtils.cassandraCluster(); Session session = cluster.connect(CassandraUnitUtils.KEYSPACE); diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java index 199f366..d345025 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java @@ -138,7 +138,7 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest { // When boolean result = idempotentRepository.contains(key); // Then - // assertFalse(result); + assertFalse(result); } @Test diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml index 93cbb14..75e7421 100644 --- a/components/camel-openstack/pom.xml +++ b/components/camel-openstack/pom.xml @@ -52,13 +52,14 @@ <!-- testing --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>${mockito2-version}</version> <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 6caeddb..4d175a3 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 @@ -27,8 +27,8 @@ import org.apache.camel.impl.DefaultMessage; import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; -import org.openstack4j.api.OSClient; +import org.mockito.junit.MockitoJUnitRunner; +import org.openstack4j.api.OSClient.OSClientV3; import static org.mockito.Mockito.when; @@ -36,7 +36,7 @@ import static org.mockito.Mockito.when; public abstract class AbstractProducerTestSupport { @Mock - protected OSClient.OSClientV3 client; + protected OSClientV3 client; @Mock protected Exchange exchange; 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 f62e2ca..eea4476 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 @@ -18,13 +18,14 @@ 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.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.storage.BlockStorageService; -import org.openstack4j.api.storage.BlockVolumeService; -import org.openstack4j.api.storage.BlockVolumeSnapshotService; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class CinderProducerTestSupport extends AbstractProducerTestSupport { @Mock @@ -33,16 +34,8 @@ public class CinderProducerTestSupport extends AbstractProducerTestSupport { @Mock protected BlockStorageService blockStorageService; - @Mock - protected BlockVolumeService volumeService; - - @Mock - protected BlockVolumeSnapshotService snapshotService; - @Before public void setUpComputeService() { when(client.blockStorage()).thenReturn(blockStorageService); - when(blockStorageService.volumes()).thenReturn(volumeService); - when(blockStorageService.snapshots()).thenReturn(snapshotService); } } 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 cc46a11..b7a70c7 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 @@ -22,10 +22,13 @@ 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.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.storage.BlockVolumeService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.storage.block.Volume; import org.openstack4j.model.storage.block.builder.VolumeBuilder; @@ -35,23 +38,42 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class VolumeProducerTest extends CinderProducerTestSupport { @Mock + private BlockVolumeService volumeService; + + @Mock private Volume testOSVolume; + @Captor + private ArgumentCaptor<String> idCaptor; + + @Captor + private ArgumentCaptor<String> nameCaptor; + + @Captor + private ArgumentCaptor<String> descCaptor; + + @Captor + private ArgumentCaptor<String> captor; + private Volume dummyVolume; @Before public void setUp() { + when(blockStorageService.volumes()).thenReturn(volumeService); + producer = new VolumeProducer(endpoint, client); - when(volumeService.create(Matchers.any(org.openstack4j.model.storage.block.Volume.class))).thenReturn(testOSVolume); - when(volumeService.get(Matchers.anyString())).thenReturn(testOSVolume); + when(volumeService.create(any())).thenReturn(testOSVolume); + when(volumeService.get(anyString())).thenReturn(testOSVolume); dummyVolume = createTestVolume(); when(testOSVolume.getId()).thenReturn(UUID.randomUUID().toString()); @@ -83,9 +105,6 @@ public class VolumeProducerTest extends CinderProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> idCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> nameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> descCaptor = ArgumentCaptor.forClass(String.class); verify(volumeService).update(idCaptor.capture(), nameCaptor.capture(), descCaptor.capture()); assertEquals(id, idCaptor.getValue()); @@ -129,7 +148,6 @@ public class VolumeProducerTest extends CinderProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(volumeService).delete(captor.capture()); assertEquals(id, captor.getValue()); 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 4212f33..5c7ffa9 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 @@ -22,10 +22,13 @@ 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.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.storage.BlockVolumeSnapshotService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.storage.block.VolumeSnapshot; @@ -33,23 +36,42 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class VolumeSnapshotProducerTest extends CinderProducerTestSupport { @Mock + private BlockVolumeSnapshotService snapshotService; + + @Mock private VolumeSnapshot testOSVolumeSnapshot; + @Captor + private ArgumentCaptor<String> idCaptor; + + @Captor + private ArgumentCaptor<String> nameCaptor; + + @Captor + private ArgumentCaptor<String> descCaptor; + + @Captor + private ArgumentCaptor<String> captor; + private VolumeSnapshot dummyVolumeSnapshot; @Before public void setUp() { + when(blockStorageService.snapshots()).thenReturn(snapshotService); + producer = new SnapshotProducer(endpoint, client); - when(snapshotService.create(Matchers.any(VolumeSnapshot.class))).thenReturn(testOSVolumeSnapshot); - when(snapshotService.get(Matchers.anyString())).thenReturn(testOSVolumeSnapshot); + when(snapshotService.create(any())).thenReturn(testOSVolumeSnapshot); + when(snapshotService.get(anyString())).thenReturn(testOSVolumeSnapshot); dummyVolumeSnapshot = createTestVolume(); when(testOSVolumeSnapshot.getId()).thenReturn(UUID.randomUUID().toString()); @@ -81,9 +103,6 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> idCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> nameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> descCaptor = ArgumentCaptor.forClass(String.class); verify(snapshotService).update(idCaptor.capture(), nameCaptor.capture(), descCaptor.capture()); assertEquals(id, idCaptor.getValue()); @@ -112,7 +131,6 @@ public class VolumeSnapshotProducerTest extends CinderProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(snapshotService).delete(captor.capture()); assertEquals(id, captor.getValue()); assertFalse(msg.isFault()); 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 2c28e60..4dad931 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 @@ -25,25 +25,29 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Spy; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; import org.openstack4j.api.image.ImageService; import org.openstack4j.model.common.Payload; import org.openstack4j.model.image.ContainerFormat; import org.openstack4j.model.image.DiskFormat; import org.openstack4j.model.image.Image; -import org.openstack4j.openstack.image.domain.GlanceImage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class GlanceProducerTest extends AbstractProducerTestSupport { @Mock @@ -52,6 +56,18 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { @Mock private ImageService imageService; + @Captor + private ArgumentCaptor<Image> captor; + + @Captor + private ArgumentCaptor<Payload<?>> payloadCaptor; + + @Captor + private ArgumentCaptor<String> imageIdCaptor; + + @Captor + private ArgumentCaptor<org.openstack4j.model.image.Image> imageCaptor; + private Image dummyImage; @Spy @@ -63,10 +79,10 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { when(client.images()).thenReturn(imageService); dummyImage = createImage(); - when(imageService.get(anyString())).thenReturn(osImage); - when(imageService.create(any(org.openstack4j.model.image.Image.class), any(Payload.class))).thenReturn(osImage); - when(imageService.reserve(any(org.openstack4j.model.image.Image.class))).thenReturn(osImage); - when(imageService.upload(anyString(), any(Payload.class), any(GlanceImage.class))).thenReturn(osImage); + when(imageService.create(any(), any())).thenReturn(osImage); + when(imageService.reserve(any())).thenReturn(osImage); + when(imageService.upload(anyString(), any(), isNull())).thenReturn(osImage); + when(imageService.upload(anyString(), any(), any())).thenReturn(osImage); when(osImage.getContainerFormat()).thenReturn(ContainerFormat.BARE); when(osImage.getDiskFormat()).thenReturn(DiskFormat.ISO); @@ -83,7 +99,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { when(endpoint.getOperation()).thenReturn(GlanceConstants.RESERVE); msg.setBody(dummyImage); producer.process(exchange); - ArgumentCaptor<Image> captor = ArgumentCaptor.forClass(Image.class); + verify(imageService).reserve(captor.capture()); assertEquals(dummyImage, captor.getValue()); @@ -104,7 +120,6 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { msg.setHeader(GlanceConstants.OWNER, dummyImage.getOwner()); producer.process(exchange); - final ArgumentCaptor<Image> captor = ArgumentCaptor.forClass(Image.class); verify(imageService).reserve(captor.capture()); assertEqualsImages(dummyImage, captor.getValue()); @@ -128,8 +143,6 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { msg.setBody(is); producer.process(exchange); - final ArgumentCaptor<Payload> payloadCaptor = ArgumentCaptor.forClass(Payload.class); - final ArgumentCaptor<org.openstack4j.model.image.Image> imageCaptor = ArgumentCaptor.forClass(org.openstack4j.model.image.Image.class); verify(imageService).create(imageCaptor.capture(), payloadCaptor.capture()); assertEquals(is, payloadCaptor.getValue().open()); @@ -148,9 +161,6 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { msg.setBody(file); producer.process(exchange); - final ArgumentCaptor<Payload> payloadCaptor = ArgumentCaptor.forClass(Payload.class); - final ArgumentCaptor<String> imageIdCaptor = ArgumentCaptor.forClass(String.class); - final ArgumentCaptor<org.openstack4j.model.image.Image> imageCaptor = ArgumentCaptor.forClass(org.openstack4j.model.image.Image.class); verify(imageService).upload(imageIdCaptor.capture(), payloadCaptor.capture(), imageCaptor.capture()); assertEquals(file, payloadCaptor.getValue().getRaw()); assertEquals(id, imageIdCaptor.getValue()); @@ -181,9 +191,6 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { msg.setBody(file); producer.process(exchange); - ArgumentCaptor<Payload> payloadCaptor = ArgumentCaptor.forClass(Payload.class); - ArgumentCaptor<String> imageIdCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<org.openstack4j.model.image.Image> imageCaptor = ArgumentCaptor.forClass(org.openstack4j.model.image.Image.class); verify(imageService).upload(imageIdCaptor.capture(), payloadCaptor.capture(), imageCaptor.capture()); assertEquals(id, imageIdCaptor.getValue()); assertEquals(file, payloadCaptor.getValue().getRaw()); @@ -197,7 +204,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { @Test public void updateTest() throws Exception { msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE); - when(imageService.update(any(Image.class))).thenReturn(osImage); + when(imageService.update(any())).thenReturn(osImage); final String newName = "newName"; when(osImage.getName()).thenReturn(newName); dummyImage.setName(newName); @@ -205,7 +212,6 @@ public class GlanceProducerTest extends AbstractProducerTestSupport { msg.setBody(dummyImage); producer.process(exchange); - final ArgumentCaptor<org.openstack4j.model.image.Image> imageCaptor = ArgumentCaptor.forClass(org.openstack4j.model.image.Image.class); verify(imageService).update(imageCaptor.capture()); assertEquals(dummyImage, imageCaptor.getValue()); 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 bf8bfbd..15a0576 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,12 +21,15 @@ import java.util.List; import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.keystone.producer.DomainProducer; -import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.identity.v3.DomainService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.identity.v3.Domain; import org.openstack4j.model.network.Network; @@ -35,12 +38,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class DomainProducerTest extends KeystoneProducerTestSupport { private Domain dummyDomain; @@ -48,11 +52,22 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { @Mock private Domain testOSdomain; + @Mock + private DomainService domainService; + + @Captor + private ArgumentCaptor<Domain> domainCaptor; + + @Captor + private ArgumentCaptor<String> domainIdCaptor; + @Before public void setUp() { + when(identityService.domains()).thenReturn(domainService); + producer = new DomainProducer(endpoint, client); - when(domainService.create(any(Domain.class))).thenReturn(testOSdomain); + when(domainService.create(any())).thenReturn(testOSdomain); when(domainService.get(anyString())).thenReturn(testOSdomain); List<Domain> getAllList = new ArrayList<>(); @@ -72,13 +87,11 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { msg.setHeader(OpenstackConstants.NAME, dummyDomain.getName()); msg.setHeader(KeystoneConstants.DESCRIPTION, dummyDomain.getDescription()); - producer.process(exchange); - ArgumentCaptor<Domain> captor = ArgumentCaptor.forClass(Domain.class); - verify(domainService).create(captor.capture()); + verify(domainService).create(domainCaptor.capture()); - assertEqualsDomain(dummyDomain, captor.getValue()); + assertEqualsDomain(dummyDomain, domainCaptor.getValue()); } @Test @@ -89,10 +102,9 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(domainService).get(captor.capture()); + verify(domainService).get(domainIdCaptor.capture()); - assertEquals(id, captor.getValue()); + assertEquals(id, domainIdCaptor.getValue()); assertEqualsDomain(testOSdomain, msg.getBody(Domain.class)); } @@ -117,16 +129,15 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { when(testOSdomain.getName()).thenReturn(newName); when(testOSdomain.getDescription()).thenReturn("desc"); - when(domainService.update(any(Domain.class))).thenReturn(testOSdomain); + when(domainService.update(any())).thenReturn(testOSdomain); msg.setBody(testOSdomain); producer.process(exchange); - ArgumentCaptor<Domain> captor = ArgumentCaptor.forClass(Domain.class); - verify(domainService).update(captor.capture()); + verify(domainService).update(domainCaptor.capture()); - assertEqualsDomain(testOSdomain, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsDomain(testOSdomain, domainCaptor.getValue()); + assertNotNull(domainCaptor.getValue().getId()); assertEquals(newName, msg.getBody(Domain.class).getName()); } @@ -139,9 +150,8 @@ public class DomainProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(domainService).delete(captor.capture()); - assertEquals(networkID, captor.getValue()); + verify(domainService).delete(domainIdCaptor.capture()); + assertEquals(networkID, domainIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 fbc548c..f0e3cd9 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,12 +21,15 @@ import java.util.List; import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.keystone.producer.GroupProducer; -import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.identity.v3.GroupService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.identity.v3.Group; import org.openstack4j.model.network.Network; @@ -35,12 +38,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class GroupProducerTest extends KeystoneProducerTestSupport { private Group dummyGroup; @@ -48,11 +52,22 @@ public class GroupProducerTest extends KeystoneProducerTestSupport { @Mock private Group testOSgroup; + @Mock + private GroupService groupService; + + @Captor + private ArgumentCaptor<Group> groupCaptor; + + @Captor + private ArgumentCaptor<String> groupIdCaptor; + @Before public void setUp() { + when(identityService.groups()).thenReturn(groupService); + producer = new GroupProducer(endpoint, client); - when(groupService.create(any(Group.class))).thenReturn(testOSgroup); + when(groupService.create(any())).thenReturn(testOSgroup); when(groupService.get(anyString())).thenReturn(testOSgroup); List<Group> getAllList = new ArrayList<>(); @@ -73,13 +88,11 @@ public class GroupProducerTest extends KeystoneProducerTestSupport { msg.setHeader(KeystoneConstants.DESCRIPTION, dummyGroup.getDescription()); msg.setHeader(KeystoneConstants.DOMAIN_ID, dummyGroup.getDomainId()); - producer.process(exchange); - ArgumentCaptor<Group> captor = ArgumentCaptor.forClass(Group.class); - verify(groupService).create(captor.capture()); + verify(groupService).create(groupCaptor.capture()); - assertEqualsGroup(dummyGroup, captor.getValue()); + assertEqualsGroup(dummyGroup, groupCaptor.getValue()); } @Test @@ -90,10 +103,9 @@ public class GroupProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(groupService).get(captor.capture()); + verify(groupService).get(groupIdCaptor.capture()); - assertEquals(id, captor.getValue()); + assertEquals(id, groupIdCaptor.getValue()); assertEqualsGroup(testOSgroup, msg.getBody(Group.class)); } @@ -118,16 +130,15 @@ public class GroupProducerTest extends KeystoneProducerTestSupport { when(testOSgroup.getName()).thenReturn(newName); when(testOSgroup.getDescription()).thenReturn("desc"); - when(groupService.update(any(Group.class))).thenReturn(testOSgroup); + when(groupService.update(any())).thenReturn(testOSgroup); msg.setBody(testOSgroup); producer.process(exchange); - ArgumentCaptor<Group> captor = ArgumentCaptor.forClass(Group.class); - verify(groupService).update(captor.capture()); + verify(groupService).update(groupCaptor.capture()); - assertEqualsGroup(testOSgroup, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsGroup(testOSgroup, groupCaptor.getValue()); + assertNotNull(groupCaptor.getValue().getId()); assertEquals(newName, msg.getBody(Group.class).getName()); } @@ -140,9 +151,8 @@ public class GroupProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(groupService).delete(captor.capture()); - assertEquals(networkID, captor.getValue()); + verify(groupService).delete(groupIdCaptor.capture()); + assertEquals(networkID, groupIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 53051a69..dc01917 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 @@ -18,16 +18,14 @@ 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.mockito.Mock; -import org.openstack4j.api.identity.v3.DomainService; -import org.openstack4j.api.identity.v3.GroupService; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.identity.v3.IdentityService; -import org.openstack4j.api.identity.v3.ProjectService; -import org.openstack4j.api.identity.v3.RegionService; -import org.openstack4j.api.identity.v3.UserService; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class KeystoneProducerTestSupport extends AbstractProducerTestSupport { @Mock @@ -36,28 +34,8 @@ public class KeystoneProducerTestSupport extends AbstractProducerTestSupport { @Mock protected IdentityService identityService; - @Mock - protected DomainService domainService; - - @Mock - protected GroupService groupService; - - @Mock - protected ProjectService projectService; - - @Mock - protected RegionService regionService; - - @Mock - protected UserService userService; - @Before public void setUpComputeService() { when(client.identity()).thenReturn(identityService); - when(identityService.domains()).thenReturn(domainService); - when(identityService.groups()).thenReturn(groupService); - when(identityService.projects()).thenReturn(projectService); - when(identityService.regions()).thenReturn(regionService); - when(identityService.users()).thenReturn(userService); } } 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 d8c5731..83f1efc 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,12 +21,15 @@ import java.util.List; import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.keystone.producer.ProjectProducer; -import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.identity.v3.ProjectService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.identity.v3.Project; import org.openstack4j.model.network.Network; @@ -35,12 +38,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class ProjectProducerTest extends KeystoneProducerTestSupport { private Project dummyProject; @@ -48,11 +52,22 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport { @Mock private Project testOSproject; + @Mock + private ProjectService projectService; + + @Captor + private ArgumentCaptor<Project> projectCaptor; + + @Captor + private ArgumentCaptor<String> projectIdCaptor; + @Before public void setUp() { + when(identityService.projects()).thenReturn(projectService); + producer = new ProjectProducer(endpoint, client); - when(projectService.create(any(Project.class))).thenReturn(testOSproject); + when(projectService.create(any())).thenReturn(testOSproject); when(projectService.get(anyString())).thenReturn(testOSproject); List<Project> getAllList = new ArrayList<>(); @@ -77,10 +92,9 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<Project> captor = ArgumentCaptor.forClass(Project.class); - verify(projectService).create(captor.capture()); + verify(projectService).create(projectCaptor.capture()); - assertEqualsProject(dummyProject, captor.getValue()); + assertEqualsProject(dummyProject, projectCaptor.getValue()); } @Test @@ -91,10 +105,9 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(projectService).get(captor.capture()); + verify(projectService).get(projectIdCaptor.capture()); - assertEquals(id, captor.getValue()); + assertEquals(id, projectIdCaptor.getValue()); assertEqualsProject(testOSproject, msg.getBody(Project.class)); } @@ -119,16 +132,15 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport { when(testOSproject.getName()).thenReturn(newName); when(testOSproject.getDescription()).thenReturn("desc"); - when(projectService.update(any(Project.class))).thenReturn(testOSproject); + when(projectService.update(any())).thenReturn(testOSproject); msg.setBody(testOSproject); producer.process(exchange); - ArgumentCaptor<Project> captor = ArgumentCaptor.forClass(Project.class); - verify(projectService).update(captor.capture()); + verify(projectService).update(projectCaptor.capture()); - assertEqualsProject(testOSproject, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsProject(testOSproject, projectCaptor.getValue()); + assertNotNull(projectCaptor.getValue().getId()); assertEquals(newName, msg.getBody(Project.class).getName()); } @@ -141,9 +153,8 @@ public class ProjectProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(projectService).delete(captor.capture()); - assertEquals(networkID, captor.getValue()); + verify(projectService).delete(projectIdCaptor.capture()); + assertEquals(networkID, projectIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 9b9df53..f1864b4 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,12 +21,15 @@ import java.util.List; import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.keystone.producer.RegionProducer; -import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.identity.v3.RegionService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.identity.v3.Region; import org.openstack4j.model.network.Network; @@ -35,12 +38,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class RegionProducerTest extends KeystoneProducerTestSupport { private Region dummyRegion; @@ -48,11 +52,22 @@ public class RegionProducerTest extends KeystoneProducerTestSupport { @Mock private Region testOSregion; + @Mock + private RegionService regionService; + + @Captor + private ArgumentCaptor<Region> regionCaptor; + + @Captor + private ArgumentCaptor<String> regionIdCaptor; + @Before public void setUp() { + when(identityService.regions()).thenReturn(regionService); + producer = new RegionProducer(endpoint, client); - when(regionService.create(any(Region.class))).thenReturn(testOSregion); + when(regionService.create(any())).thenReturn(testOSregion); when(regionService.get(anyString())).thenReturn(testOSregion); List<Region> getAllList = new ArrayList<>(); @@ -72,10 +87,9 @@ public class RegionProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<Region> captor = ArgumentCaptor.forClass(Region.class); - verify(regionService).create(captor.capture()); + verify(regionService).create(regionCaptor.capture()); - assertEqualsRegion(dummyRegion, captor.getValue()); + assertEqualsRegion(dummyRegion, regionCaptor.getValue()); } @Test @@ -86,10 +100,9 @@ public class RegionProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(regionService).get(captor.capture()); + verify(regionService).get(regionIdCaptor.capture()); - assertEquals(id, captor.getValue()); + assertEquals(id, regionIdCaptor.getValue()); assertEqualsRegion(testOSregion, msg.getBody(Region.class)); } @@ -113,16 +126,15 @@ public class RegionProducerTest extends KeystoneProducerTestSupport { final String newDescription = "ndesc"; when(testOSregion.getDescription()).thenReturn(newDescription); - when(regionService.update(any(Region.class))).thenReturn(testOSregion); + when(regionService.update(any())).thenReturn(testOSregion); msg.setBody(testOSregion); producer.process(exchange); - ArgumentCaptor<Region> captor = ArgumentCaptor.forClass(Region.class); - verify(regionService).update(captor.capture()); + verify(regionService).update(regionCaptor.capture()); - assertEqualsRegion(testOSregion, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsRegion(testOSregion, regionCaptor.getValue()); + assertNotNull(regionCaptor.getValue().getId()); assertEquals(newDescription, msg.getBody(Region.class).getDescription()); } @@ -135,9 +147,8 @@ public class RegionProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(regionService).delete(captor.capture()); - assertEquals(networkID, captor.getValue()); + verify(regionService).delete(regionIdCaptor.capture()); + assertEquals(networkID, regionIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 7af7c71..bac8362 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,12 +21,15 @@ import java.util.List; import org.apache.camel.component.openstack.common.OpenstackConstants; import org.apache.camel.component.openstack.keystone.producer.UserProducer; -import org.apache.camel.component.openstack.neutron.NeutronConstants; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.identity.v3.UserService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.identity.v3.User; import org.openstack4j.model.network.Network; @@ -35,12 +38,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class UserProducerTest extends KeystoneProducerTestSupport { private User dummyUser; @@ -48,11 +52,22 @@ public class UserProducerTest extends KeystoneProducerTestSupport { @Mock private User testOSuser; + @Mock + private UserService userService; + + @Captor + private ArgumentCaptor<User> userCaptor; + + @Captor + private ArgumentCaptor<String> userIdCaptor; + @Before public void setUp() { + when(identityService.users()).thenReturn(userService); + producer = new UserProducer(endpoint, client); - when(userService.create(any(User.class))).thenReturn(testOSuser); + when(userService.create(any())).thenReturn(testOSuser); when(userService.get(anyString())).thenReturn(testOSuser); List<User> getAllList = new ArrayList<>(); @@ -80,10 +95,9 @@ public class UserProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<User> captor = ArgumentCaptor.forClass(User.class); - verify(userService).create(captor.capture()); + verify(userService).create(userCaptor.capture()); - assertEqualsUser(dummyUser, captor.getValue()); + assertEqualsUser(dummyUser, userCaptor.getValue()); } @Test @@ -94,10 +108,9 @@ public class UserProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(userService).get(captor.capture()); + verify(userService).get(userIdCaptor.capture()); - assertEquals(id, captor.getValue()); + assertEquals(id, userIdCaptor.getValue()); assertEqualsUser(testOSuser, msg.getBody(User.class)); } @@ -121,16 +134,15 @@ public class UserProducerTest extends KeystoneProducerTestSupport { final String newDescription = "ndesc"; when(testOSuser.getDescription()).thenReturn(newDescription); - when(userService.update(any(User.class))).thenReturn(testOSuser); + when(userService.update(any())).thenReturn(testOSuser); msg.setBody(testOSuser); producer.process(exchange); - ArgumentCaptor<User> captor = ArgumentCaptor.forClass(User.class); - verify(userService).update(captor.capture()); + verify(userService).update(userCaptor.capture()); - assertEqualsUser(testOSuser, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsUser(testOSuser, userCaptor.getValue()); + assertNotNull(userCaptor.getValue().getId()); assertEquals(newDescription, msg.getBody(User.class).getDescription()); } @@ -143,9 +155,8 @@ public class UserProducerTest extends KeystoneProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(userService).delete(captor.capture()); - assertEquals(networkID, captor.getValue()); + verify(userService).delete(userIdCaptor.capture()); + assertEquals(networkID, userIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 4d52baf..2f0f011 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 @@ -24,9 +24,13 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.networking.NetworkService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.network.Network; import org.openstack4j.model.network.NetworkType; @@ -35,12 +39,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class NetworkProducerTest extends NeutronProducerTestSupport { private Network dummyNetwork; @@ -48,10 +53,21 @@ public class NetworkProducerTest extends NeutronProducerTestSupport { @Mock private Network testOSnetwork; + @Mock + private NetworkService networkService; + + @Captor + private ArgumentCaptor<Network> networkCaptor; + + @Captor + private ArgumentCaptor<String> networkIdCaptor; + @Before public void setUp() { + when(networkingService.network()).thenReturn(networkService); + producer = new NetworkProducer(endpoint, client); - when(networkService.create(any(Network.class))).thenReturn(testOSnetwork); + when(networkService.create(any())).thenReturn(testOSnetwork); when(networkService.get(anyString())).thenReturn(testOSnetwork); List<Network> getAllList = new ArrayList<>(); @@ -75,10 +91,9 @@ public class NetworkProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<Network> captor = ArgumentCaptor.forClass(Network.class); - verify(networkService).create(captor.capture()); + verify(networkService).create(networkCaptor.capture()); - assertEqualsNetwork(dummyNetwork, captor.getValue()); + assertEqualsNetwork(dummyNetwork, networkCaptor.getValue()); assertNotNull(msg.getBody(Network.class).getId()); } @@ -90,10 +105,9 @@ public class NetworkProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(networkService).get(captor.capture()); + verify(networkService).get(networkIdCaptor.capture()); - assertEquals(networkID, captor.getValue()); + assertEquals(networkID, networkIdCaptor.getValue()); assertEqualsNetwork(testOSnetwork, msg.getBody(Network.class)); } @@ -117,9 +131,8 @@ public class NetworkProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(networkService).delete(captor.capture()); - assertEquals(networkID, captor.getValue()); + verify(networkService).delete(networkIdCaptor.capture()); + assertEquals(networkID, networkIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 2d58054..8031280 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 @@ -18,15 +18,14 @@ 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.mockito.Mock; -import org.openstack4j.api.networking.NetworkService; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.networking.NetworkingService; -import org.openstack4j.api.networking.PortService; -import org.openstack4j.api.networking.RouterService; -import org.openstack4j.api.networking.SubnetService; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class NeutronProducerTestSupport extends AbstractProducerTestSupport { @Mock @@ -35,24 +34,8 @@ public class NeutronProducerTestSupport extends AbstractProducerTestSupport { @Mock protected NetworkingService networkingService; - @Mock - PortService portService; - - @Mock - RouterService routerService; - - @Mock - SubnetService subnetService; - - @Mock - NetworkService networkService; - @Before public void setUpComputeService() { when(client.networking()).thenReturn(networkingService); - when(networkingService.port()).thenReturn(portService); - when(networkingService.router()).thenReturn(routerService); - when(networkingService.subnet()).thenReturn(subnetService); - when(networkingService.network()).thenReturn(networkService); } } 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 feb4385..cf6378c 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 @@ -24,9 +24,13 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.networking.PortService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.network.Port; @@ -34,12 +38,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class PortProducerTest extends NeutronProducerTestSupport { private Port dummyPort; @@ -47,10 +52,21 @@ public class PortProducerTest extends NeutronProducerTestSupport { @Mock private Port testOSport; + @Mock + private PortService portService; + + @Captor + private ArgumentCaptor<Port> portCaptor; + + @Captor + private ArgumentCaptor<String> portIdCaptor; + @Before public void setUp() { + when(networkingService.port()).thenReturn(portService); + producer = new PortProducer(endpoint, client); - when(portService.create(any(Port.class))).thenReturn(testOSport); + when(portService.create(any())).thenReturn(testOSport); when(portService.get(anyString())).thenReturn(testOSport); List<Port> getAllList = new ArrayList<>(); @@ -77,10 +93,9 @@ public class PortProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<Port> captor = ArgumentCaptor.forClass(Port.class); - verify(portService).create(captor.capture()); + verify(portService).create(portCaptor.capture()); - assertEqualsPort(dummyPort, captor.getValue()); + assertEqualsPort(dummyPort, portCaptor.getValue()); assertNotNull(msg.getBody(Port.class).getId()); } @@ -92,10 +107,9 @@ public class PortProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(portService).get(captor.capture()); + verify(portService).get(portIdCaptor.capture()); - assertEquals(portID, captor.getValue()); + assertEquals(portID, portIdCaptor.getValue()); assertEqualsPort(testOSport, msg.getBody(Port.class)); } @@ -117,17 +131,16 @@ public class PortProducerTest extends NeutronProducerTestSupport { final String newDevId = "dev"; when(testOSport.getDeviceId()).thenReturn(newDevId); when(testOSport.getId()).thenReturn(portID); - when(portService.update(any(Port.class))).thenReturn(testOSport); + when(portService.update(any())).thenReturn(testOSport); msg.setBody(testOSport); producer.process(exchange); - ArgumentCaptor<Port> captor = ArgumentCaptor.forClass(Port.class); - verify(portService).update(captor.capture()); + verify(portService).update(portCaptor.capture()); - assertEqualsPort(testOSport, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsPort(testOSport, portCaptor.getValue()); + assertNotNull(portCaptor.getValue().getId()); } @Test @@ -139,9 +152,8 @@ public class PortProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(portService).delete(captor.capture()); - assertEquals(portID, captor.getValue()); + verify(portService).delete(portIdCaptor.capture()); + assertEquals(portID, portIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 227d5d6..e166a8d 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 @@ -24,9 +24,13 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.networking.RouterService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.network.AttachInterfaceType; import org.openstack4j.model.network.Router; @@ -37,12 +41,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class RouterProducerTest extends NeutronProducerTestSupport { private Router dummyRouter; @@ -50,10 +55,30 @@ public class RouterProducerTest extends NeutronProducerTestSupport { @Mock private Router testOSrouter; + @Mock + private RouterService routerService; + + @Captor + private ArgumentCaptor<Router> routerCaptor; + + @Captor + private ArgumentCaptor<String> routerIdCaptor; + + @Captor + private ArgumentCaptor<String> subnetIdCaptor; + + @Captor + private ArgumentCaptor<String> portIdCaptor; + + @Captor + private ArgumentCaptor<AttachInterfaceType> itfTypeCaptor; + @Before public void setUp() { + when(networkingService.router()).thenReturn(routerService); + producer = new RouterProducer(endpoint, client); - when(routerService.create(any(Router.class))).thenReturn(testOSrouter); + when(routerService.create(any())).thenReturn(testOSrouter); when(routerService.get(anyString())).thenReturn(testOSrouter); List<Router> getAllList = new ArrayList<>(); @@ -75,10 +100,9 @@ public class RouterProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<Router> captor = ArgumentCaptor.forClass(Router.class); - verify(routerService).create(captor.capture()); + verify(routerService).create(routerCaptor.capture()); - assertEqualsRouter(dummyRouter, captor.getValue()); + assertEqualsRouter(dummyRouter, routerCaptor.getValue()); assertNotNull(msg.getBody(Router.class).getId()); } @@ -90,10 +114,9 @@ public class RouterProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(routerService).get(captor.capture()); + verify(routerService).get(routerIdCaptor.capture()); - assertEquals(routerID, captor.getValue()); + assertEquals(routerID, routerIdCaptor.getValue()); assertEqualsRouter(testOSrouter, msg.getBody(Router.class)); } @@ -115,17 +138,16 @@ public class RouterProducerTest extends NeutronProducerTestSupport { final Router tmp = createRouter(); final String newName = "newName"; tmp.setName(newName); - when(routerService.update(any(Router.class))).thenReturn(tmp); + when(routerService.update(any())).thenReturn(tmp); dummyRouter.setId(routerID); msg.setBody(dummyRouter); producer.process(exchange); - ArgumentCaptor<Router> captor = ArgumentCaptor.forClass(Router.class); - verify(routerService).update(captor.capture()); + verify(routerService).update(routerCaptor.capture()); - assertEqualsRouter(dummyRouter, captor.getValue()); - assertNotNull(captor.getValue().getId()); + assertEqualsRouter(dummyRouter, routerCaptor.getValue()); + assertNotNull(routerCaptor.getValue().getId()); assertEquals(newName, msg.getBody(Router.class).getName()); } @@ -138,9 +160,8 @@ public class RouterProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(routerService).delete(captor.capture()); - assertEquals(routerID, captor.getValue()); + verify(routerService).delete(routerIdCaptor.capture()); + assertEquals(routerID, routerIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure @@ -166,14 +187,11 @@ public class RouterProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> routerC = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> portC = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> subnetC = ArgumentCaptor.forClass(String.class); - verify(routerService).detachInterface(routerC.capture(), subnetC.capture(), portC.capture()); + verify(routerService).detachInterface(routerIdCaptor.capture(), subnetIdCaptor.capture(), portIdCaptor.capture()); - assertEquals(routerID, routerC.getValue()); - assertEquals(subnetId, subnetC.getValue()); - assertEquals(portId, portC.getValue()); + assertEquals(routerID, routerIdCaptor.getValue()); + assertEquals(subnetId, subnetIdCaptor.getValue()); + assertEquals(portId, portIdCaptor.getValue()); assertEquals(ifce, msg.getBody(RouterInterface.class)); } @@ -183,7 +201,7 @@ public class RouterProducerTest extends NeutronProducerTestSupport { final String routerID = "myRouterID"; final String subnetId = "subnet"; final RouterInterface ifce = new NeutronRouterInterface(subnetId, null); - when(routerService.attachInterface(anyString(), any(AttachInterfaceType.class), anyString())).thenReturn(ifce); + when(routerService.attachInterface(anyString(), any(), anyString())).thenReturn(ifce); msg.setHeader(OpenstackConstants.OPERATION, NeutronConstants.ATTACH_INTERFACE); msg.setHeader(NeutronConstants.ROUTER_ID, routerID); @@ -192,14 +210,11 @@ public class RouterProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> routerC = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<AttachInterfaceType> itfType = ArgumentCaptor.forClass(AttachInterfaceType.class); - ArgumentCaptor<String> subnetC = ArgumentCaptor.forClass(String.class); - verify(routerService).attachInterface(routerC.capture(), itfType.capture(), subnetC.capture()); + verify(routerService).attachInterface(routerIdCaptor.capture(), itfTypeCaptor.capture(), subnetIdCaptor.capture()); - assertEquals(routerID, routerC.getValue()); - assertEquals(AttachInterfaceType.SUBNET, itfType.getValue()); - assertEquals(subnetId, subnetC.getValue()); + assertEquals(routerID, routerIdCaptor.getValue()); + assertEquals(AttachInterfaceType.SUBNET, itfTypeCaptor.getValue()); + assertEquals(subnetId, subnetIdCaptor.getValue()); assertEquals(ifce, msg.getBody(RouterInterface.class)); } 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 948b0c4..425eb00 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 @@ -24,9 +24,13 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.networking.SubnetService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.network.IPVersionType; import org.openstack4j.model.network.Subnet; @@ -35,12 +39,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class SubnetProducerTest extends NeutronProducerTestSupport { private Subnet dummySubnet; @@ -48,10 +53,21 @@ public class SubnetProducerTest extends NeutronProducerTestSupport { @Mock private Subnet testOSsubnet; + @Mock + private SubnetService subnetService; + + @Captor + private ArgumentCaptor<Subnet> subnetCaptor; + + @Captor + private ArgumentCaptor<String> subnetIdCaptor; + @Before public void setUp() { + when(networkingService.subnet()).thenReturn(subnetService); + producer = new SubnetProducer(endpoint, client); - when(subnetService.create(any(Subnet.class))).thenReturn(testOSsubnet); + when(subnetService.create(any())).thenReturn(testOSsubnet); when(subnetService.get(anyString())).thenReturn(testOSsubnet); List<Subnet> getAllList = new ArrayList<>(); @@ -74,10 +90,9 @@ public class SubnetProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<Subnet> captor = ArgumentCaptor.forClass(Subnet.class); - verify(subnetService).create(captor.capture()); + verify(subnetService).create(subnetCaptor.capture()); - assertEqualsSubnet(dummySubnet, captor.getValue()); + assertEqualsSubnet(dummySubnet, subnetCaptor.getValue()); assertNotNull(msg.getBody(Subnet.class).getId()); } @@ -89,10 +104,9 @@ public class SubnetProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(subnetService).get(captor.capture()); + verify(subnetService).get(subnetIdCaptor.capture()); - assertEquals(subnetID, captor.getValue()); + assertEquals(subnetID, subnetIdCaptor.getValue()); assertEqualsSubnet(testOSsubnet, msg.getBody(Subnet.class)); } @@ -116,9 +130,8 @@ public class SubnetProducerTest extends NeutronProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); - verify(subnetService).delete(captor.capture()); - assertEquals(subnetID, captor.getValue()); + verify(subnetService).delete(subnetIdCaptor.capture()); + assertEquals(subnetID, subnetIdCaptor.getValue()); assertFalse(msg.isFault()); //in case of failure 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 181de95..69daf1d 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 @@ -26,10 +26,13 @@ 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.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.compute.FlavorService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.compute.Flavor; import org.openstack4j.model.compute.builder.FlavorBuilder; @@ -39,23 +42,37 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class FlavorProducerTest extends NovaProducerTestSupport { @Mock private Flavor testOSFlavor; + @Mock + private FlavorService flavorService; + + @Captor + private ArgumentCaptor<Flavor> flavorCaptor; + + @Captor + private ArgumentCaptor<String> flavorIdCaptor; + private Flavor dummyFlavor; @Before public void setUp() { + when(computeService.flavors()).thenReturn(flavorService); + producer = new FlavorsProducer(endpoint, client); - when(flavorService.create(Matchers.any(org.openstack4j.model.compute.Flavor.class))).thenReturn(testOSFlavor); - when(flavorService.get(Matchers.anyString())).thenReturn(testOSFlavor); + when(flavorService.create(any())).thenReturn(testOSFlavor); + when(flavorService.get(anyString())).thenReturn(testOSFlavor); List<org.openstack4j.model.compute.Flavor> getAllList = new ArrayList<>(); getAllList.add(testOSFlavor); @@ -69,7 +86,6 @@ public class FlavorProducerTest extends NovaProducerTestSupport { when(testOSFlavor.getRam()).thenReturn(dummyFlavor.getRam()); when(testOSFlavor.getVcpus()).thenReturn(dummyFlavor.getVcpus()); when(testOSFlavor.getDisk()).thenReturn(dummyFlavor.getDisk()); - when(testOSFlavor.getSwap()).thenReturn(dummyFlavor.getSwap()); } @Test @@ -82,7 +98,6 @@ public class FlavorProducerTest extends NovaProducerTestSupport { msg.setBody(dummyFlavor); producer.process(exchange); - ArgumentCaptor<Flavor> flavorCaptor = ArgumentCaptor.forClass(Flavor.class); verify(flavorService).create(flavorCaptor.capture()); assertEquals(dummyFlavor, flavorCaptor.getValue()); @@ -103,7 +118,6 @@ public class FlavorProducerTest extends NovaProducerTestSupport { msg.setHeaders(headers); producer.process(exchange); - ArgumentCaptor<Flavor> flavorCaptor = ArgumentCaptor.forClass(Flavor.class); verify(flavorService).create(flavorCaptor.capture()); assertEqualsFlavors(dummyFlavor, flavorCaptor.getValue()); @@ -141,15 +155,14 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void deleteSuccess() throws Exception { - when(flavorService.delete(Matchers.anyString())).thenReturn(ActionResponse.actionSuccess()); + when(flavorService.delete(anyString())).thenReturn(ActionResponse.actionSuccess()); when(endpoint.getOperation()).thenReturn(OpenstackConstants.DELETE); String id = "myID"; msg.setHeader(OpenstackConstants.ID, id); producer.process(exchange); - ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class); - verify(flavorService).delete(argumentCaptor.capture()); - assertEquals(id, argumentCaptor.getValue()); + verify(flavorService).delete(flavorIdCaptor.capture()); + assertEquals(id, flavorIdCaptor.getValue()); assertFalse(msg.isFault()); assertNull(msg.getBody()); @@ -158,15 +171,14 @@ public class FlavorProducerTest extends NovaProducerTestSupport { @Test public void deleteFailure() throws Exception { final String failReason = "unknown"; - when(flavorService.delete(Matchers.anyString())).thenReturn(ActionResponse.actionFailed(failReason, 401)); + when(flavorService.delete(anyString())).thenReturn(ActionResponse.actionFailed(failReason, 401)); when(endpoint.getOperation()).thenReturn(OpenstackConstants.DELETE); String id = "myID"; msg.setHeader(OpenstackConstants.ID, id); producer.process(exchange); - ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class); - verify(flavorService).delete(argumentCaptor.capture()); - assertEquals(id, argumentCaptor.getValue()); + verify(flavorService).delete(flavorIdCaptor.capture()); + assertEquals(id, flavorIdCaptor.getValue()); assertTrue(msg.isFault()); assertTrue(msg.getBody(String.class).contains(failReason)); 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 ba4813e..264a715 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 @@ -23,18 +23,23 @@ 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.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.openstack4j.api.compute.KeypairService; import org.openstack4j.model.compute.Keypair; import org.openstack4j.openstack.compute.domain.NovaKeypair; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.doReturn; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class KeypairProducerTest extends NovaProducerTestSupport { private static final String KEYPAIR_NAME = "keypairName"; @@ -43,18 +48,28 @@ public class KeypairProducerTest extends NovaProducerTestSupport { private Keypair dummyKeypair; + @Mock + private KeypairService keypairService; + + @Captor + private ArgumentCaptor<String> nameCaptor; + + @Captor + private ArgumentCaptor<String> keypairCaptor; + @Before public void setUp() { + when(computeService.keypairs()).thenReturn(keypairService); + producer = new KeypairProducer(endpoint, client); dummyKeypair = createDummyKeypair(); - when(keypairService.get(Matchers.anyString())).thenReturn(osTestKeypair); - when(keypairService.create(Matchers.anyString(), Matchers.anyString())).thenReturn(osTestKeypair); + when(keypairService.create(anyString(), anyString())).thenReturn(osTestKeypair); + when(keypairService.create(anyString(), isNull())).thenReturn(osTestKeypair); List<org.openstack4j.model.compute.Keypair> getAllList = new ArrayList<>(); getAllList.add(osTestKeypair); getAllList.add(osTestKeypair); - doReturn(getAllList).when(keypairService).list(); when(osTestKeypair.getName()).thenReturn(dummyKeypair.getName()); when(osTestKeypair.getPublicKey()).thenReturn(dummyKeypair.getPublicKey()); @@ -74,8 +89,6 @@ public class KeypairProducerTest extends NovaProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> nameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> keypairCaptor = ArgumentCaptor.forClass(String.class); verify(keypairService).create(nameCaptor.capture(), keypairCaptor.capture()); assertEquals(KEYPAIR_NAME, nameCaptor.getValue()); @@ -99,8 +112,6 @@ public class KeypairProducerTest extends NovaProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> nameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> keypairCaptor = ArgumentCaptor.forClass(String.class); verify(keypairService).create(nameCaptor.capture(), keypairCaptor.capture()); assertEquals(KEYPAIR_NAME, nameCaptor.getValue()); 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 28e750c..c06c5e4 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 @@ -18,14 +18,14 @@ 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.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.compute.ComputeService; -import org.openstack4j.api.compute.FlavorService; -import org.openstack4j.api.compute.KeypairService; -import org.openstack4j.api.compute.ServerService; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class NovaProducerTestSupport extends AbstractProducerTestSupport { @Mock @@ -34,20 +34,8 @@ public class NovaProducerTestSupport extends AbstractProducerTestSupport { @Mock protected ComputeService computeService; - @Mock - FlavorService flavorService; - - @Mock - ServerService serverService; - - @Mock - KeypairService keypairService; - @Before public void setUpComputeService() { when(client.compute()).thenReturn(computeService); - when(computeService.flavors()).thenReturn(flavorService); - when(computeService.servers()).thenReturn(serverService); - when(computeService.keypairs()).thenReturn(keypairService); } } 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 1681292..470bb7c 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 @@ -22,36 +22,58 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.Builders; +import org.openstack4j.api.compute.ServerService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.compute.Action; import org.openstack4j.model.compute.Server; import org.openstack4j.model.compute.ServerCreate; -import org.openstack4j.openstack.compute.domain.NovaServerCreate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class ServerProducerTest extends NovaProducerTestSupport { + @Mock private org.openstack4j.model.compute.Server testOSServer; + @Mock + private ServerService serverService; + + @Captor + private ArgumentCaptor<Action> actionArgumentCaptor; + + @Captor + private ArgumentCaptor<String> idArgumentCaptor; + + @Captor + private ArgumentCaptor<String> snapshot; + + @Captor + private ArgumentCaptor<String> idCaptor; + private ServerCreate dummyServer; @Before public void setUp() { + when(computeService.servers()).thenReturn(serverService); + producer = new ServerProducer(endpoint, client); - when(serverService.boot(any(NovaServerCreate.class))).thenReturn(testOSServer); + when(serverService.boot(any())).thenReturn(testOSServer); dummyServer = createDummyServer(); initServerMock(); @@ -87,15 +109,13 @@ public class ServerProducerTest extends NovaProducerTestSupport { @Test public void serverAction() throws Exception { - when(serverService.action(anyString(), any(Action.class))).thenReturn(ActionResponse.actionSuccess()); + when(serverService.action(anyString(), any())).thenReturn(ActionResponse.actionSuccess()); when(endpoint.getOperation()).thenReturn(NovaConstants.ACTION); String id = "myID"; msg.setHeader(NovaConstants.ACTION, Action.PAUSE); msg.setHeader(OpenstackConstants.ID, id); producer.process(exchange); - ArgumentCaptor<Action> actionArgumentCaptor = ArgumentCaptor.forClass(Action.class); - ArgumentCaptor<String> idArgumentCaptor = ArgumentCaptor.forClass(String.class); verify(serverService).action(idArgumentCaptor.capture(), actionArgumentCaptor.capture()); assertEquals(id, idArgumentCaptor.getValue()); @@ -105,7 +125,7 @@ public class ServerProducerTest extends NovaProducerTestSupport { //test fail final String failReason = "fr"; - when(serverService.action(anyString(), any(Action.class))).thenReturn(ActionResponse.actionFailed(failReason, 401)); + when(serverService.action(anyString(), any())).thenReturn(ActionResponse.actionFailed(failReason, 401)); producer.process(exchange); assertTrue(msg.isFault()); assertTrue(msg.getBody(String.class).contains(failReason)); @@ -121,8 +141,6 @@ public class ServerProducerTest extends NovaProducerTestSupport { msg.setHeader(OpenstackConstants.ID, id); producer.process(exchange); - ArgumentCaptor<String> snapshot = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> idCaptor = ArgumentCaptor.forClass(String.class); verify(serverService).createSnapshot(idCaptor.capture(), snapshot.capture()); assertEquals(id, idCaptor.getValue()); 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 7ec2704..1ebcf3d 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 @@ -25,8 +25,12 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.openstack4j.api.storage.ObjectStorageContainerService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.storage.object.SwiftContainer; import org.openstack4j.model.storage.object.options.ContainerListOptions; @@ -36,12 +40,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class ContainerProducerTest extends SwiftProducerTestSupport { private static final String CONTAINER_NAME = "containerName"; @@ -49,22 +55,39 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { @Mock private SwiftContainer mockOsContainer; + @Mock + private ObjectStorageContainerService containerService; + + @Captor + private ArgumentCaptor<String> nameCaptor; + + @Captor + private ArgumentCaptor<Map<String, String>> dataCaptor; + + @Captor + private ArgumentCaptor<String> containerNameCaptor; + + @Captor + private ArgumentCaptor<CreateUpdateContainerOptions> optionsCaptor; + + @Captor + private ArgumentCaptor<ContainerListOptions> containerListOptionsCaptor; + @Before public void setUp() { + when(objectStorageService.containers()).thenReturn(containerService); + producer = new ContainerProducer(endpoint, client); } @Test public void createTestWithoutOptions() throws Exception { - when(containerService.create(anyString(), any(CreateUpdateContainerOptions.class))).thenReturn(ActionResponse.actionSuccess()); + when(containerService.create(anyString(), isNull())).thenReturn(ActionResponse.actionSuccess()); msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); producer.process(exchange); - ArgumentCaptor<String> containerNameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<CreateUpdateContainerOptions> optionsCaptor = ArgumentCaptor.forClass(CreateUpdateContainerOptions.class); - verify(containerService).create(containerNameCaptor.capture(), optionsCaptor.capture()); assertEquals(CONTAINER_NAME, containerNameCaptor.getValue()); assertNull(optionsCaptor.getValue()); @@ -74,16 +97,13 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { @Test public void createTestWithOptions() throws Exception { - when(containerService.create(anyString(), any(CreateUpdateContainerOptions.class))).thenReturn(ActionResponse.actionSuccess()); + when(containerService.create(anyString(), any())).thenReturn(ActionResponse.actionSuccess()); msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); final CreateUpdateContainerOptions options = CreateUpdateContainerOptions.create().accessAnybodyRead(); msg.setBody(options); producer.process(exchange); - ArgumentCaptor<String> containerNameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<CreateUpdateContainerOptions> optionsCaptor = ArgumentCaptor.forClass(CreateUpdateContainerOptions.class); - verify(containerService).create(containerNameCaptor.capture(), optionsCaptor.capture()); assertEquals(CONTAINER_NAME, containerNameCaptor.getValue()); assertEquals(options, optionsCaptor.getValue()); @@ -94,16 +114,15 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { public void getTest() throws Exception { List<SwiftContainer> list = new ArrayList<>(); list.add(mockOsContainer); - doReturn(list).when(containerService).list(any(ContainerListOptions.class)); + doReturn(list).when(containerService).list(any()); when(endpoint.getOperation()).thenReturn(OpenstackConstants.GET); msg.setHeader(SwiftConstants.LIMIT, 10); msg.setHeader(SwiftConstants.DELIMITER, 'x'); producer.process(exchange); - ArgumentCaptor<ContainerListOptions> optionsCaptor = ArgumentCaptor.forClass(ContainerListOptions.class); - verify(containerService).list(optionsCaptor.capture()); - Map<String, String> options = optionsCaptor.getValue().getOptions(); + verify(containerService).list(containerListOptionsCaptor.capture()); + Map<String, String> options = containerListOptionsCaptor.getValue().getOptions(); assertEquals(String.valueOf(10), options.get(SwiftConstants.LIMIT)); assertEquals("x", options.get(SwiftConstants.DELIMITER)); assertEquals(list, msg.getBody(List.class)); @@ -131,7 +150,6 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> containerNameCaptor = ArgumentCaptor.forClass(String.class); verify(containerService).delete(containerNameCaptor.capture()); assertEquals(CONTAINER_NAME, containerNameCaptor.getValue()); @@ -162,8 +180,6 @@ public class ContainerProducerTest extends SwiftProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> nameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<Map> dataCaptor = ArgumentCaptor.forClass(Map.class); verify(containerService).updateMetadata(nameCaptor.capture(), dataCaptor.capture()); assertEquals(CONTAINER_NAME, nameCaptor.getValue()); 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 955c963..83e9cf0 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 @@ -28,8 +28,12 @@ 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.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.openstack4j.api.storage.ObjectStorageObjectService; import org.openstack4j.model.common.ActionResponse; import org.openstack4j.model.common.Payload; import org.openstack4j.model.common.Payloads; @@ -39,12 +43,13 @@ import org.openstack4j.model.storage.object.options.ObjectLocation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class ObjectProducerTest extends SwiftProducerTestSupport { private static final String CONTAINER_NAME = "containerName"; @@ -54,8 +59,28 @@ public class ObjectProducerTest extends SwiftProducerTestSupport { @Mock private SwiftObject mockOsObject; + @Mock + private ObjectStorageObjectService objectService; + + @Captor + private ArgumentCaptor<String> containerNameCaptor; + + @Captor + private ArgumentCaptor<String> objectNameCaptor; + + @Captor + private ArgumentCaptor<Payload<?>> payloadArgumentCaptor; + + @Captor + private ArgumentCaptor<ObjectLocation> locationCaptor; + + @Captor + private ArgumentCaptor<Map<String, String>> dataCaptor; + @Before public void setUp() { + when(objectStorageService.objects()).thenReturn(objectService); + producer = new ObjectProducer(endpoint, client); when(mockOsObject.getETag()).thenReturn(ETAG); @@ -63,18 +88,15 @@ public class ObjectProducerTest extends SwiftProducerTestSupport { @Test public void createTest() throws Exception { - when(objectService.put(anyString(), anyString(), any(Payload.class))).thenReturn(ETAG); + when(objectService.put(anyString(), anyString(), any())).thenReturn(ETAG); msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); msg.setHeader(SwiftConstants.OBJECT_NAME, OBJECT_NAME); - final Payload payload = getTmpPayload(); + final Payload<?> payload = getTmpPayload(); msg.setBody(payload); producer.process(exchange); - ArgumentCaptor<String> containerNameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> objectNameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<Payload> payloadArgumentCaptor = ArgumentCaptor.forClass(Payload.class); verify(objectService).put(containerNameCaptor.capture(), objectNameCaptor.capture(), payloadArgumentCaptor.capture()); assertEquals(CONTAINER_NAME, containerNameCaptor.getValue()); assertEquals(OBJECT_NAME, objectNameCaptor.getValue()); @@ -113,7 +135,6 @@ public class ObjectProducerTest extends SwiftProducerTestSupport { @Test public void deleteObjectTest() throws Exception { - final String failMessage = "fail"; when(objectService.delete(anyString(), anyString())).thenReturn(ActionResponse.actionSuccess()); msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE); msg.setHeader(SwiftConstants.CONTAINER_NAME, CONTAINER_NAME); @@ -121,8 +142,6 @@ public class ObjectProducerTest extends SwiftProducerTestSupport { producer.process(exchange); - ArgumentCaptor<String> containerNameCaptor = ArgumentCaptor.forClass(String.class); - ArgumentCaptor<String> objectNameCaptor = ArgumentCaptor.forClass(String.class); verify(objectService).delete(containerNameCaptor.capture(), objectNameCaptor.capture()); assertEquals(CONTAINER_NAME, containerNameCaptor.getValue()); assertEquals(OBJECT_NAME, objectNameCaptor.getValue()); @@ -157,8 +176,6 @@ public class ObjectProducerTest extends SwiftProducerTestSupport { producer.process(exchange); - ArgumentCaptor<ObjectLocation> locationCaptor = ArgumentCaptor.forClass(ObjectLocation.class); - ArgumentCaptor<Map> dataCaptor = ArgumentCaptor.forClass(Map.class); verify(objectService).updateMetadata(locationCaptor.capture(), dataCaptor.capture()); ObjectLocation location = locationCaptor.getValue(); assertEquals(CONTAINER_NAME, location.getContainerName()); @@ -182,7 +199,7 @@ public class ObjectProducerTest extends SwiftProducerTestSupport { } - private Payload getTmpPayload() throws IOException { + private Payload<File> getTmpPayload() throws IOException { return Payloads.create(File.createTempFile("payloadPreffix", ".txt")); } } 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 354d7bc..f10a3b4 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 @@ -18,13 +18,14 @@ 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.mockito.Mock; -import org.openstack4j.api.storage.ObjectStorageContainerService; -import org.openstack4j.api.storage.ObjectStorageObjectService; +import org.mockito.junit.MockitoJUnitRunner; import org.openstack4j.api.storage.ObjectStorageService; import static org.mockito.Mockito.when; +@RunWith(MockitoJUnitRunner.class) public class SwiftProducerTestSupport extends AbstractProducerTestSupport { @Mock @@ -33,17 +34,9 @@ public class SwiftProducerTestSupport extends AbstractProducerTestSupport { @Mock protected ObjectStorageService objectStorageService; - @Mock - protected ObjectStorageContainerService containerService; - - @Mock - protected ObjectStorageObjectService objectService; - @Before public void setUpComputeService() { when(client.objectStorage()).thenReturn(objectStorageService); - when(objectStorageService.containers()).thenReturn(containerService); - when(objectStorageService.objects()).thenReturn(objectService); } -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" <commits@camel.apache.org>'].