Skip to content

S
spring-boot
Commit 7f608131 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Avoid limitation of javac's type inferencing

parent 19a61c65
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View file @ 7f608131
...@@ -60,7 +60,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean; ...@@ -60,7 +60,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import static org.assertj.core.api.Assertions.assertThat; 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.Matchers.anyObject;
import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
...@@ -337,7 +337,7 @@ public class JettyEmbeddedServletContainerFactoryTests ...@@ -337,7 +337,7 @@ public class JettyEmbeddedServletContainerFactoryTests
} }
}); });
this.thrown.expectCause(instanceOf(IllegalStateException.class)); this.thrown.expectCause(any(IllegalStateException.class));
factory.getEmbeddedServletContainer().start(); factory.getEmbeddedServletContainer().start();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment