diff --git a/framework-docs/modules/ROOT/pages/testing/unit.adoc b/framework-docs/modules/ROOT/pages/testing/unit.adoc index 2b360936eaf..5645587d64e 100644 --- a/framework-docs/modules/ROOT/pages/testing/unit.adoc +++ b/framework-docs/modules/ROOT/pages/testing/unit.adoc @@ -46,8 +46,8 @@ mock objects that are useful for testing web contexts, controllers, and filters. mock objects are targeted at usage with Spring's Web MVC framework and are generally more convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock]). -TIP: Since Spring Framework 6.0, the mock objects in `org.springframework.mock.web` are -based on the Servlet 6.0 API. +TIP: Since Spring Framework 7.0, the mock objects in `org.springframework.mock.web` are +based on the Servlet 6.1 API. MockMvc builds on the mock Servlet API objects to provide an integration testing framework for Spring MVC. See xref:testing/mockmvc.adoc[MockMvc]. diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java index 153c337b681..b0dab61bf8e 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockCookie.java @@ -31,7 +31,7 @@ import org.springframework.util.StringUtils; * Extension of {@code Cookie} with extra attributes, as defined in * RFC 6265. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * * @author Vedran Pavic * @author Juergen Hoeller diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index e9c4e400f57..e0074b2b889 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -81,7 +81,7 @@ import org.springframework.web.util.UrlPathHelper; * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale} * or {@link #setPreferredLocales}. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * * @author Juergen Hoeller * @author Rod Johnson diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java index 9ff384e59e3..962dec2e859 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java @@ -36,7 +36,7 @@ import org.springframework.util.Assert; /** * Mock implementation of the {@link jakarta.servlet.http.HttpSession} interface. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * * @author Juergen Hoeller * @author Rod Johnson diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java index 8515fed2bc1..85868cdeac3 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java @@ -43,7 +43,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; * Mock implementation of the * {@link org.springframework.web.multipart.MultipartHttpServletRequest} interface. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * *

Useful for testing application controllers that access multipart uploads. * {@link MockMultipartFile} can be used to populate these mock requests with files. diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java index 63aa8f550f5..c1149c5700f 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java @@ -61,11 +61,11 @@ import org.springframework.web.util.WebUtils; /** * Mock implementation of the {@link jakarta.servlet.ServletContext} interface. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * - *

Compatible with Servlet 3.1 but can be configured to expose a specific version - * through {@link #setMajorVersion}/{@link #setMinorVersion}; default is 3.1. - * Note that Servlet 3.1 support is limited: servlet, filter and listener + *

Compatible with Servlet 6.1 but can be configured to expose a specific version + * through {@link #setMajorVersion}/{@link #setMinorVersion}; default is 6.1. + * Note that some Servlet SPI support is limited: servlet, filter and listener * registration methods are not supported; neither is JSP configuration. * We generally do not recommend to unit test your ServletContainerInitializers and * WebApplicationInitializers which is where those registration methods would be used. @@ -114,11 +114,11 @@ public class MockServletContext implements ServletContext { private int majorVersion = 6; - private int minorVersion = 0; + private int minorVersion = 1; private int effectiveMajorVersion = 6; - private int effectiveMinorVersion = 0; + private int effectiveMinorVersion = 1; private final Map namedRequestDispatchers = new HashMap<>(); diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java index 551acb9dca2..d33e9ff11a9 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockCookie.java @@ -31,7 +31,7 @@ import org.springframework.util.StringUtils; * Extension of {@code Cookie} with extra attributes, as defined in * RFC 6265. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * * @author Vedran Pavic * @author Juergen Hoeller diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java index 8560a8d7775..1aea58fc9f6 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java @@ -81,7 +81,7 @@ import org.springframework.web.util.UrlPathHelper; * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale} * or {@link #setPreferredLocales}. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * * @author Juergen Hoeller * @author Rod Johnson diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java index 8a6f0b878f3..45e6ef1ee90 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpSession.java @@ -36,7 +36,7 @@ import org.springframework.util.Assert; /** * Mock implementation of the {@link jakarta.servlet.http.HttpSession} interface. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * * @author Juergen Hoeller * @author Rod Johnson diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java index 59625855d05..bfe321c6b54 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java @@ -43,7 +43,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; * Mock implementation of the * {@link org.springframework.web.multipart.MultipartHttpServletRequest} interface. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * *

Useful for testing application controllers that access multipart uploads. * {@link MockMultipartFile} can be used to populate these mock requests with files. diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java index a0292ef0808..3732c4c8505 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java @@ -61,11 +61,11 @@ import org.springframework.web.util.WebUtils; /** * Mock implementation of the {@link jakarta.servlet.ServletContext} interface. * - *

As of Spring 6.0, this set of mocks is designed on a Servlet 6.0 baseline. + *

As of Spring 7.0, this set of mocks is designed on a Servlet 6.1 baseline. * - *

Compatible with Servlet 3.1 but can be configured to expose a specific version - * through {@link #setMajorVersion}/{@link #setMinorVersion}; default is 3.1. - * Note that Servlet 3.1 support is limited: servlet, filter and listener + *

Compatible with Servlet 6.1 but can be configured to expose a specific version + * through {@link #setMajorVersion}/{@link #setMinorVersion}; default is 6.1. + * Note that some Servlet SPI support is limited: servlet, filter and listener * registration methods are not supported; neither is JSP configuration. * We generally do not recommend to unit test your ServletContainerInitializers and * WebApplicationInitializers which is where those registration methods would be used. @@ -114,11 +114,11 @@ public class MockServletContext implements ServletContext { private int majorVersion = 6; - private int minorVersion = 0; + private int minorVersion = 1; private int effectiveMajorVersion = 6; - private int effectiveMinorVersion = 0; + private int effectiveMinorVersion = 1; private final Map namedRequestDispatchers = new HashMap<>();