From 7f6081318faa8f9ae723dd500018230159f099b1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 23 May 2017 22:10:57 +0100 Subject: [PATCH] Avoid limitation of javac's type inferencing --- .../jetty/JettyEmbeddedServletContainerFactoryTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index c59e3202f8c..42407da6169 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -60,7 +60,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.http.HttpHeaders; import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -337,7 +337,7 @@ public class JettyEmbeddedServletContainerFactoryTests } }); - this.thrown.expectCause(instanceOf(IllegalStateException.class)); + this.thrown.expectCause(any(IllegalStateException.class)); factory.getEmbeddedServletContainer().start(); }