diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java index 39c37b96..579fdf32 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationFailFastTests.java @@ -31,6 +31,8 @@ import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; +import static org.hamcrest.Matchers.isA; + /** * @author Spencer Gibb * @author Venil Noronha @@ -43,7 +45,7 @@ public class ConsulAutoServiceRegistrationFailFastTests { @Test public void testFailFastEnabled() { - this.exception.expect(ConsulException.class); + this.exception.expectCause(isA(ConsulException.class)); new SpringApplicationBuilder(TestConfig.class) .properties("spring.application.name=testregistrationfails-fast", "spring.jmx.default-domain=testautoregfailfast", "server.port=0", diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java index 66bcdc85..b968e96b 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationRetryTests.java @@ -34,6 +34,8 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; +import static org.hamcrest.Matchers.isA; + /** * @author Spencer Gibb * @author Venil Noronha @@ -49,7 +51,7 @@ public class ConsulAutoServiceRegistrationRetryTests { @Test public void testRetry() { - this.exception.expect(ConsulException.class); + this.exception.expectCause(isA(ConsulException.class)); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestConfig.class) .properties("spring.application.name=testregistrationretry",