Replace test FilterRegistration with the one in testFixtures

See gh-33252
spring-projects · Jul 30, 2024 · 5ac7e74 · 5ac7e74
1 parent 24ab6f6
commit 5ac7e74
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 117 deletions.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterRegistration.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterRegistration.java
@@ -38,7 +38,7 @@
  * @author Rossen Stoyanchev
  * @since 6.2
  */
-public class MockFilterRegistration implements FilterRegistration {
+public class MockFilterRegistration implements FilterRegistration.Dynamic {
 
 	private final String name;
 
@@ -50,6 +50,8 @@ public class MockFilterRegistration implements FilterRegistration {
 
 	private final List<String> urlPatterns = new ArrayList<>();
 
+	private boolean asyncSupported;
+
 
 	public MockFilterRegistration(String className) {
 		this(className, "");
@@ -126,4 +128,13 @@ public Collection<String> getUrlPatternMappings() {
 		return Collections.unmodifiableCollection(this.urlPatterns);
 	}
 
+	@Override
+	public void setAsyncSupported(boolean asyncSupported) {
+		this.asyncSupported = asyncSupported;
+	}
+
+	public boolean isAsyncSupported() {
+		return this.asyncSupported;
+	}
+
 }
diff --git a/...testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterRegistration.java b/...testFixtures/java/org/springframework/web/testfixture/servlet/MockFilterRegistration.java
@@ -38,7 +38,7 @@
  * @author Rossen Stoyanchev
  * @since 6.2
  */
-public class MockFilterRegistration implements FilterRegistration {
+public class MockFilterRegistration implements FilterRegistration.Dynamic {
 
 	private final String name;
 
@@ -50,6 +50,8 @@ public class MockFilterRegistration implements FilterRegistration {
 
 	private final List<String> urlPatterns = new ArrayList<>();
 
+	private boolean asyncSupported;
+
 
 	public MockFilterRegistration(String className) {
 		this(className, "");
@@ -126,4 +128,13 @@ public Collection<String> getUrlPatternMappings() {
 		return Collections.unmodifiableCollection(this.urlPatterns);
 	}
 
+	@Override
+	public void setAsyncSupported(boolean asyncSupported) {
+		this.asyncSupported = asyncSupported;
+	}
+
+	public boolean isAsyncSupported() {
+		return this.asyncSupported;
+	}
+
 }
diff --git a/...pringframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java b/...pringframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
@@ -17,12 +17,10 @@
 package org.springframework.web.servlet.support;
 
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.EventListener;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterRegistration.Dynamic;
 import jakarta.servlet.Servlet;
@@ -40,6 +38,7 @@
 import org.springframework.web.filter.DelegatingFilterProxy;
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.DispatcherServlet;
+import org.springframework.web.testfixture.servlet.MockFilterRegistration;
 import org.springframework.web.testfixture.servlet.MockServletConfig;
 import org.springframework.web.testfixture.servlet.MockServletContext;
 
@@ -112,11 +111,9 @@ void register() throws ServletException {
 		assertThat(filterRegistrations.get("delegatingFilterProxy#0")).isNotNull();
 		assertThat(filterRegistrations.get("delegatingFilterProxy#1")).isNotNull();
 
-		for (MockFilterRegistration filterRegistration : filterRegistrations.values()) {
-			assertThat(filterRegistration.isAsyncSupported()).isTrue();
-			EnumSet<DispatcherType> enumSet = EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD,
-					DispatcherType.INCLUDE, DispatcherType.ASYNC);
-			assertThat(filterRegistration.getMappings().get(SERVLET_NAME)).isEqualTo(enumSet);
+		for (MockFilterRegistration registration : filterRegistrations.values()) {
+			assertThat(registration.isAsyncSupported()).isTrue();
+			assertThat(registration.getServletNameMappings().iterator().next()).isEqualTo(SERVLET_NAME);
 		}
 
 	}
@@ -135,9 +132,9 @@ protected boolean isAsyncSupported() {
 		MockServletRegistration servletRegistration = servletRegistrations.get(SERVLET_NAME);
 		assertThat(servletRegistration.isAsyncSupported()).isFalse();
 
-		for (MockFilterRegistration filterRegistration : filterRegistrations.values()) {
-			assertThat(filterRegistration.isAsyncSupported()).isFalse();
-			assertThat(filterRegistration.getMappings().get(SERVLET_NAME)).isEqualTo(EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE));
+		for (MockFilterRegistration registration : filterRegistrations.values()) {
+			assertThat(registration.isAsyncSupported()).isFalse();
+			assertThat(registration.getServletNameMappings().iterator().next()).isEqualTo(SERVLET_NAME);
 		}
 	}
 
@@ -209,7 +206,7 @@ public Dynamic addFilter(String filterName, Filter filter) {
 				return null;
 			}
 			filters.put(filterName, filter);
-			MockFilterRegistration registration = new MockFilterRegistration();
+			MockFilterRegistration registration = new MockFilterRegistration(filter.getClass().getName(), filterName);
 			filterRegistrations.put(filterName, registration);
 			return registration;
 		}

diff --git a/...-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java b/...-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java