Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missed merge changes from last commit

Browse Source 
See gh-32342
This commit is contained in:
rstoyanchev
2024-03-05 12:28:54 +00:00
parent 99e38ecf41
commit b8b1f5b6be
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-web/src/test/java/org/springframework/web/context/request/async/AsyncRequestNotUsableTests.java
View File

@@ -20,9 +20,10 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.concurrent.atomic.AtomicInteger;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.AsyncEvent;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
@@ -51,11 +52,11 @@ public class AsyncRequestNotUsableTests {
private final MockHttpServletRequest request = new MockHttpServletRequest();
private final HttpServletResponse response = mock();
private final HttpServletResponse response = mock(HttpServletResponse.class);
private final ServletOutputStream outputStream = mock();
private final ServletOutputStream outputStream = mock(ServletOutputStream.class);
private final PrintWriter writer = mock();
private final PrintWriter writer = mock(PrintWriter.class);
private StandardServletAsyncWebRequest asyncRequest;

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
View File

@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import jakarta.servlet.AsyncEvent;
import javax.servlet.AsyncEvent;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;