From a1ba2a3be1145fc95d727e4b1537bbc7fd61cffc Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 9 Sep 2019 15:13:14 +0200 Subject: [PATCH] Fixes broken tests --- .../messaging/jms/ContractVerifierJmsConfiguration.java | 9 +++++---- .../com/example/JmsMessagingApplicationSpec.groovy | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java index d56ea8cf9d..feeda83d41 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java @@ -35,6 +35,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; +import org.springframework.cloud.contract.verifier.messaging.integration.ContractVerifierIntegrationConfiguration; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration; @@ -47,9 +48,9 @@ import org.springframework.jms.core.JmsTemplate; */ @Configuration @ConditionalOnClass(JmsTemplate.class) -@ConditionalOnProperty(name = "stubrunner.jms.enabled", havingValue = "true", - matchIfMissing = true) -@AutoConfigureBefore(NoOpContractVerifierAutoConfiguration.class) +@ConditionalOnProperty(name = "stubrunner.jms.enabled", havingValue = "true", matchIfMissing = true) +@AutoConfigureBefore({ ContractVerifierIntegrationConfiguration.class, + NoOpContractVerifierAutoConfiguration.class }) public class ContractVerifierJmsConfiguration { @Bean @@ -62,7 +63,7 @@ public class ContractVerifierJmsConfiguration { @Bean @ConditionalOnMissingBean - public ContractVerifierMessaging contractVerifierJmsMessaging( + ContractVerifierMessaging contractVerifierJmsMessaging( MessageVerifier exchange) { return new ContractVerifierJmsHelper(exchange); } diff --git a/tests/samples-messaging-jms/src/test/groovy/com/example/JmsMessagingApplicationSpec.groovy b/tests/samples-messaging-jms/src/test/groovy/com/example/JmsMessagingApplicationSpec.groovy index df67ff15d8..b621ed9db4 100644 --- a/tests/samples-messaging-jms/src/test/groovy/com/example/JmsMessagingApplicationSpec.groovy +++ b/tests/samples-messaging-jms/src/test/groovy/com/example/JmsMessagingApplicationSpec.groovy @@ -60,6 +60,7 @@ class JmsMessagingApplicationSpec extends Specification { @BeforeClass static void init() { System.setProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", "*") + System.setProperty("debug", "true") } def "should work for triggered based messaging"() {