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

Polish argument capturing in two Tomcat tests 

Closes gh-12203
This commit is contained in:
dreis2211 2018-02-23 20:03:38 +01:00 committed by Stephane Nicoll
parent c3ae02a476
commit cbabf5414c
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
View File

@ -24,16 +24,14 @@ import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.AprLifecycleListener;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactoryTests;
import org.springframework.http.server.reactive.HttpHandler;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@ -69,22 +67,14 @@ public class TomcatReactiveWebServerFactoryTests
}
@Test
public void contextIsAddedToHostBeforeCustomizersAreCalled() throws Exception {
public void contextIsAddedToHostBeforeCustomizersAreCalled() {
TomcatReactiveWebServerFactory factory = getFactory();
TomcatContextCustomizer customizer = mock(TomcatContextCustomizer.class);
willAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
assertThat(((Context) invocation.getArguments()[0]).getParent())
.isNotNull();
return null;
}
}).given(customizer).customize(any(Context.class));
factory.addContextCustomizers(customizer);
this.webServer = factory.getWebServer(mock(HttpHandler.class));
verify(customizer).customize(any(Context.class));
ArgumentCaptor<Context> contextCaptor = ArgumentCaptor.forClass(Context.class);
verify(customizer).customize(contextCaptor.capture());
assertThat(contextCaptor.getValue().getParent()).isNotNull();
}
@Test

20
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View File

@ -49,9 +49,8 @@ import org.apache.tomcat.JarScanFilter;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.boot.testsupport.rule.OutputCapture;
import org.springframework.boot.web.server.WebServerException;
@ -63,7 +62,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@ -147,22 +145,14 @@ public class TomcatServletWebServerFactoryTests
}
@Test
public void contextIsAddedToHostBeforeCustomizersAreCalled() throws Exception {
public void contextIsAddedToHostBeforeCustomizersAreCalled() {
TomcatServletWebServerFactory factory = getFactory();
TomcatContextCustomizer customizer = mock(TomcatContextCustomizer.class);
willAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
assertThat(((Context) invocation.getArguments()[0]).getParent())
.isNotNull();
return null;
}
}).given(customizer).customize(any(Context.class));
factory.addContextCustomizers(customizer);
this.webServer = factory.getWebServer();
verify(customizer).customize(any(Context.class));
ArgumentCaptor<Context> contextCaptor = ArgumentCaptor.forClass(Context.class);
verify(customizer).customize(contextCaptor.capture());
assertThat(contextCaptor.getValue().getParent()).isNotNull();
}
@Test