root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-05-23 22:18:35 +01:00
parent 233ef67a04 7f6081318f
commit db9ec87b14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
View File

@ -52,7 +52,7 @@ import org.springframework.boot.web.servlet.server.AbstractServletWebServerFacto
import org.springframework.http.HttpHeaders;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.isA;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
@ -292,7 +292,7 @@ public class JettyServletWebServerFactoryTests
}
});
this.thrown.expectCause(instanceOf(IllegalStateException.class));
this.thrown.expectCause(isA(IllegalStateException.class));
factory.getWebServer().start();
}