Skip to content

Polish argument capturing in two Tomcat tests #12203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Polish argument capturing in two Tomcat tests #12203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions ...ava/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@
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;
Expand Down Expand Up @@ -69,22 +67,14 @@ public void tomcatCustomizers() {
}

@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
Expand Down
20 changes: 5 additions & 15 deletions ...java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@
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;
Expand All @@ -63,7 +62,6 @@
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;
Expand Down Expand Up @@ -147,22 +145,14 @@ public void tomcatCustomizers() {
}

@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
Expand Down