Move Servlet Mocks to Web

Issue gh-13551

config/src/test/java/org/springframework/security/config/MockServletContext.java

@@ -1,149 +0,0 @@
-/*
- * Copyright 2002-2022 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.config;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import jakarta.servlet.MultipartConfigElement;
-import jakarta.servlet.Servlet;
-import jakarta.servlet.ServletRegistration;
-import jakarta.servlet.ServletSecurityElement;
-
-import org.springframework.lang.NonNull;
-import org.springframework.web.servlet.DispatcherServlet;
-
-public class MockServletContext extends org.springframework.mock.web.MockServletContext {
-
-	private final Map<String, ServletRegistration> registrations = new LinkedHashMap<>();
-
-	public static MockServletContext mvc() {
-		MockServletContext servletContext = new MockServletContext();
-		servletContext.addServlet("dispatcherServlet", DispatcherServlet.class).addMapping("/");
-		return servletContext;
-	}
-
-	@NonNull
-	@Override
-	public ServletRegistration.Dynamic addServlet(@NonNull String servletName, Class<? extends Servlet> clazz) {
-		ServletRegistration.Dynamic dynamic = new MockServletRegistration(servletName, clazz);
-		this.registrations.put(servletName, dynamic);
-		return dynamic;
-	}
-
-	@NonNull
-	@Override
-	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-		return this.registrations;
-	}
-
-	@Override
-	public ServletRegistration getServletRegistration(String servletName) {
-		return this.registrations.get(servletName);
-	}
-
-	private static class MockServletRegistration implements ServletRegistration.Dynamic {
-
-		private final String name;
-
-		private final Class<?> clazz;
-
-		private final Set<String> mappings = new LinkedHashSet<>();
-
-		MockServletRegistration(String name, Class<?> clazz) {
-			this.name = name;
-			this.clazz = clazz;
-		}
-
-		@Override
-		public void setLoadOnStartup(int loadOnStartup) {
-
-		}
-
-		@Override
-		public Set<String> setServletSecurity(ServletSecurityElement constraint) {
-			return null;
-		}
-
-		@Override
-		public void setMultipartConfig(MultipartConfigElement multipartConfig) {
-
-		}
-
-		@Override
-		public void setRunAsRole(String roleName) {
-
-		}
-
-		@Override
-		public void setAsyncSupported(boolean isAsyncSupported) {
-
-		}
-
-		@Override
-		public Set<String> addMapping(String... urlPatterns) {
-			this.mappings.addAll(Arrays.asList(urlPatterns));
-			return this.mappings;
-		}
-
-		@Override
-		public Collection<String> getMappings() {
-			return this.mappings;
-		}
-
-		@Override
-		public String getRunAsRole() {
-			return null;
-		}
-
-		@Override
-		public String getName() {
-			return this.name;
-		}
-
-		@Override
-		public String getClassName() {
-			return this.clazz.getName();
-		}
-
-		@Override
-		public boolean setInitParameter(String name, String value) {
-			return false;
-		}
-
-		@Override
-		public String getInitParameter(String name) {
-			return null;
-		}
-
-		@Override
-		public Set<String> setInitParameters(Map<String, String> initParameters) {
-			return null;
-		}
-
-		@Override
-		public Map<String, String> getInitParameters() {
-			return null;
-		}
-
-	}
-
-}

config/src/test/java/org/springframework/security/config/TestMockHttpServletMappings.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.config;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.MappingMatch;
-
-import org.springframework.mock.web.MockHttpServletMapping;
-
-public final class TestMockHttpServletMappings {
-
-	private TestMockHttpServletMappings() {
-
-	}
-
-	public static MockHttpServletMapping extension(HttpServletRequest request, String extension) {
-		String uri = request.getRequestURI();
-		String matchValue = uri.substring(0, uri.lastIndexOf(extension));
-		return new MockHttpServletMapping(matchValue, "*" + extension, "extension", MappingMatch.EXTENSION);
-	}
-
-	public static MockHttpServletMapping path(HttpServletRequest request, String path) {
-		String uri = request.getRequestURI();
-		String matchValue = uri.substring(path.length());
-		return new MockHttpServletMapping(matchValue, path + "/*", "path", MappingMatch.PATH);
-	}
-
-	public static MockHttpServletMapping defaultMapping() {
-		return new MockHttpServletMapping("", "/", "default", MappingMatch.DEFAULT);
-	}
-
-}

config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java

@@ -31,12 +31,12 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.ResolvableType;
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.security.config.MockServletContext;
 import org.springframework.security.config.ObjectPostProcessor;
-import org.springframework.security.config.TestMockHttpServletMappings;
 import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry.DispatcherServletDelegatingRequestMatcher;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.test.SpringTestContext;
+import org.springframework.security.web.servlet.MockServletContext;
+import org.springframework.security.web.servlet.TestMockHttpServletMappings;
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.DispatcherTypeRequestMatcher;

config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java

@@ -31,7 +31,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.config.MockServletContext;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.authority.AuthorityUtils;
@@ -42,6 +41,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.FilterChainProxy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
+import org.springframework.security.web.servlet.MockServletContext;
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.web.bind.annotation.RequestMapping;

config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecuritySecurityMatchersTests.java

@@ -32,7 +32,6 @@ import org.springframework.core.annotation.Order;
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.security.config.MockServletContext;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.User;
@@ -42,6 +41,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.DefaultSecurityFilterChain;
 import org.springframework.security.web.FilterChainProxy;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.servlet.MockServletContext;
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.test.util.ReflectionTestUtils;

config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java

@@ -31,7 +31,6 @@ import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.config.Customizer;
-import org.springframework.security.config.MockServletContext;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.PasswordEncodedUser;
@@ -41,6 +40,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.FilterChainProxy;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.servlet.MockServletContext;
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

config/src/test/java/org/springframework/security/config/test/SpringTestContext.java

@@ -29,8 +29,8 @@ import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
 import org.springframework.mock.web.MockServletConfig;
 import org.springframework.security.config.BeanIds;
-import org.springframework.security.config.MockServletContext;
 import org.springframework.security.config.util.InMemoryXmlWebApplicationContext;
+import org.springframework.security.web.servlet.MockServletContext;
 import org.springframework.test.context.web.GenericXmlWebContextLoader;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;