Polish MockHttpServletRequest Usage

This commit makes so that the requestURI is set to a value that makes
sense with the other properties being mocked.

Issue gh-16632

web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java

@@ -100,7 +100,7 @@ public class AbstractAuthenticationProcessingFilterTests {
 
 	@Test
 	public void testDefaultProcessesFilterUrlMatchesWithPathParameter() {
-		MockHttpServletRequest request = createMockAuthenticationRequest();
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/login;jsessionid=I8MIONOSTHOR");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		MockAuthenticationFilter filter = new MockAuthenticationFilter();
 		filter.setFilterProcessesUrl("/login");

web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java

@@ -39,9 +39,9 @@ public class LogoutHandlerTests {
 
 	@Test
 	public void testRequiresLogoutUrlWorksWithPathParams() {
-		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/context/logout;someparam=blah");
 		MockHttpServletResponse response = new MockHttpServletResponse();
-		request.setRequestURI("/context/logout;someparam=blah?param=blah");
+		request.setContextPath("/context");
 		request.setServletPath("/logout;someparam=blah");
 		request.setQueryString("otherparam=blah");
 		DefaultHttpFirewall fw = new DefaultHttpFirewall();
@@ -50,12 +50,11 @@ public class LogoutHandlerTests {
 
 	@Test
 	public void testRequiresLogoutUrlWorksWithQueryParams() {
-		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/logout");
 		request.setContextPath("/context");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		request.setServletPath("/logout");
-		request.setRequestURI("/context/logout?param=blah");
-		request.setQueryString("otherparam=blah");
+		request.setQueryString("param=blah");
 		assertThat(this.filter.requiresLogout(request, response)).isTrue();
 	}
 

web/src/test/java/org/springframework/security/web/authentication/ott/GenerateOneTimeTokenFilterTests.java

@@ -65,6 +65,7 @@ public class GenerateOneTimeTokenFilterTests {
 	void setup() {
 		this.request.setMethod("POST");
 		this.request.setServletPath("/ott/generate");
+		this.request.setRequestURI("/ott/generate");
 	}
 
 	@Test

web/src/test/java/org/springframework/security/web/authentication/ui/DefaultOneTimeTokenSubmitPageGeneratingFilterTests.java

@@ -37,7 +37,7 @@ class DefaultOneTimeTokenSubmitPageGeneratingFilterTests {
 
 	DefaultOneTimeTokenSubmitPageGeneratingFilter filter = new DefaultOneTimeTokenSubmitPageGeneratingFilter();
 
-	MockHttpServletRequest request = new MockHttpServletRequest();
+	MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login/ott");
 
 	MockHttpServletResponse response = new MockHttpServletResponse();
 
@@ -47,6 +47,7 @@ class DefaultOneTimeTokenSubmitPageGeneratingFilterTests {
 	void setup() {
 		this.request.setMethod("GET");
 		this.request.setServletPath("/login/ott");
+		this.request.setRequestURI("/login/ott");
 	}
 
 	@Test
@@ -80,6 +81,7 @@ class DefaultOneTimeTokenSubmitPageGeneratingFilterTests {
 	@Test
 	void setContextThenGenerates() throws Exception {
 		this.request.setContextPath("/context");
+		this.request.setRequestURI("/context/login/ott");
 		this.filter.setLoginProcessingUrl("/login/another");
 		this.filter.doFilterInternal(this.request, this.response, this.filterChain);
 		String response = this.response.getContentAsString();