SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-11-18 22:26:43 +01:00
parent a5b97e6175
commit ff7cb6364a
6 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java
View File

@@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.cloud.contract.verifier.converter.YamlContract;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver;
import org.springframework.cloud.contract.verifier.messaging.amqp.AmqpMetadata;
import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
import org.springframework.cloud.contract.verifier.messaging.camel.StandaloneMetadata;
@@ -88,7 +88,7 @@ public abstract class ContractTestsBase {
String messagingType;
@Autowired
MessageVerifier messageVerifier;
MessageVerifierReceiver messageVerifier;
@BeforeEach
public void setup(TestInfo testInfo) {

19
docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java
View File

@@ -29,7 +29,6 @@ import org.springframework.amqp.core.MessageProperties;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.contract.verifier.converter.YamlContract;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender;
import org.springframework.cloud.contract.verifier.messaging.amqp.AmqpMetadata;
@@ -69,14 +68,13 @@ public class MessagingAutoConfig {
String springKafkaBootstrapServers;
@Bean
public ContractVerifierMessaging<Message> contractVerifierMessaging(
MessageVerifierSender<Message> sender, MessageVerifierReceiver<Message> receiver) {
return new ContractVerifierCamelHelper(sender, receiver);
public ContractVerifierMessaging<Message> contractVerifierMessaging(MessageVerifierReceiver<Message> receiver) {
return new ContractVerifierCamelHelper(new NoOpStubMessages<Message>(), receiver);
}
@Bean
MessageVerifier<Message> manualMessageVerifier(ConsumerTemplate consumerTemplate) {
return new MessageVerifier<Message>() {
MessageVerifierReceiver<Message> manualMessageVerifier(ConsumerTemplate consumerTemplate) {
return new MessageVerifierReceiver<Message>() {
private final Logger log = LoggerFactory.getLogger(MessageVerifier.class);
@@ -171,15 +169,6 @@ public class MessagingAutoConfig {
return receive(destination, 5, TimeUnit.SECONDS, yamlContract);
}
@Override
public void send(Message message, String destination, YamlContract yamlContract) {
throw new UnsupportedOperationException("Currently supports only receiving");
}
@Override
public void send(Object payload, Map headers, String destination, YamlContract yamlContract) {
throw new UnsupportedOperationException("Currently supports only receiving");
}
};
}

1
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy
View File

@@ -30,7 +30,6 @@ import org.springframework.cloud.contract.stubrunner.StubFinder
import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender
import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration

5
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java
View File

@@ -23,6 +23,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.contract.verifier.converter.YamlContract;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender;
import org.springframework.context.ApplicationContext;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -32,8 +34,7 @@ import org.springframework.messaging.PollableChannel;
* @author Marcin Grzejszczak
*/
public class SpringIntegrationStubMessages
implements org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender<Message<?>>,
org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver<Message<?>> {
implements MessageVerifierSender<Message<?>>, MessageVerifierReceiver<Message<?>> {
private static final Log log = LogFactory.getLog(SpringIntegrationStubMessages.class);

4
tests/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy
View File

@@ -32,7 +32,7 @@ import org.springframework.boot.test.context.SpringBootTest
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.stubrunner.StubFinder
import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner
import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver
import org.springframework.context.annotation.ComponentScan
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.ImportResource
@@ -49,7 +49,7 @@ class IntegrationStubRunnerSpec {
@Autowired
StubFinder stubFinder
@Autowired
ContractVerifierMessaging messaging
MessageVerifierReceiver<Message<?>> messaging
@BeforeEach
void setup() {

5
tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy
View File

@@ -32,14 +32,13 @@ import org.springframework.boot.test.context.SpringBootTest
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.stubrunner.StubFinder
import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver
import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier
import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging
import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.messaging.Message
import org.springframework.test.context.ContextConfiguration
/**
* @author Marcin Grzejszczak
*/
@@ -52,7 +51,7 @@ class StreamStubRunnerSpec {
@Autowired
StubFinder stubFinder
@Autowired
ContractVerifierMessaging<Message<?>> messaging
MessageVerifierReceiver<Message<?>> messaging
@Test
void 'should trigger a message by label'() {