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

Polish

This commit is contained in:
Andy Wilkinson 2018-01-29 20:10:29 +00:00
parent f8b4018f44
commit 4ecc7b9211
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@ -68,9 +68,9 @@ import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@ -153,7 +153,7 @@ public class TomcatEmbeddedServletContainerFactoryTests
public void contextIsAddedToHostBeforeCustomizersAreCalled() throws Exception { public void contextIsAddedToHostBeforeCustomizersAreCalled() throws Exception {
TomcatEmbeddedServletContainerFactory factory = getFactory(); TomcatEmbeddedServletContainerFactory factory = getFactory();
TomcatContextCustomizer customizer = mock(TomcatContextCustomizer.class); TomcatContextCustomizer customizer = mock(TomcatContextCustomizer.class);
doAnswer(new Answer<Void>() { willAnswer(new Answer<Void>() {
@Override @Override
public Void answer(InvocationOnMock invocation) throws Throwable { public Void answer(InvocationOnMock invocation) throws Throwable {
@ -162,7 +162,7 @@ public class TomcatEmbeddedServletContainerFactoryTests
return null; return null;
} }
}).when(customizer).customize(any(Context.class)); }).given(customizer).customize(any(Context.class));
factory.addContextCustomizers(customizer); factory.addContextCustomizers(customizer);
this.container = factory.getEmbeddedServletContainer(); this.container = factory.getEmbeddedServletContainer();
verify(customizer).customize(any(Context.class)); verify(customizer).customize(any(Context.class));