From 2bbdcba70032831bc63c57353ac828ceef9abd14 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 14 Jul 2021 17:12:00 +0200 Subject: [PATCH] Changed Mockito usage --- .../messaging/amqp/AmqpStubRunnerRabbitListenerSpec.groovy | 6 +----- .../stubrunner/messaging/amqp/AmqpStubRunnerSpec.groovy | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerRabbitListenerSpec.groovy b/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerRabbitListenerSpec.groovy index e878783f4c..a606988c44 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerRabbitListenerSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerRabbitListenerSpec.groovy @@ -16,8 +16,7 @@ package org.springframework.cloud.contract.stubrunner.messaging.amqp -import org.mockito.ArgumentCaptor -import org.mockito.Captor + import spock.lang.Specification import org.springframework.beans.factory.annotation.Autowired @@ -37,9 +36,6 @@ class AmqpStubRunnerRabbitListenerSpec extends Specification { @Autowired MessageSubscriberRabbitListener messageSubscriber - @Captor - ArgumentCaptor personArgumentCaptor - def "should trigger stub amqp message consumed by annotated listener"() { when: stubTrigger.trigger("contract-test.person.created.event") diff --git a/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerSpec.groovy b/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerSpec.groovy index 8f5fb939ef..3088cb9226 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-amqp/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpStubRunnerSpec.groovy @@ -17,17 +17,14 @@ package org.springframework.cloud.contract.stubrunner.messaging.amqp import org.mockito.ArgumentCaptor -import org.mockito.Captor import spock.lang.Specification import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.mock.mockito.SpyBean import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.stubrunner.StubTrigger import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner -import org.springframework.test.context.ContextConfiguration import static org.mockito.BDDMockito.then @@ -41,8 +38,7 @@ class AmqpStubRunnerSpec extends Specification { @SpyBean MessageSubscriber messageSubscriber - @Captor - ArgumentCaptor personArgumentCaptor + ArgumentCaptor personArgumentCaptor = ArgumentCaptor.forClass(Person) def "should trigger stub amqp message"() { given: