From e4f8ae033864128f38464658c71e20bb169f2db1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Mon, 10 Nov 2025 17:10:08 +0100
Subject: [PATCH] Stop setting local port in HtmlUnitRequestBuilder

This commit picks up where commit a0baeae9cf left off.

Specifically, in order to align with the behavior of
AbstractMockHttpServletRequestBuilder, HtmlUnitRequestBuilder no longer
sets the local port in the MockHttpServletRequest.

See gh-35709
---
 .../web/servlet/htmlunit/HtmlUnitRequestBuilder.java     | 1 -
 .../servlet/htmlunit/HtmlUnitRequestBuilderTests.java    | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index c337589d71e..6c7351c6c81 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -216,7 +216,6 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
 		}
 		if (serverPort != -1) {
 			request.setServerPort(serverPort);
-			request.setLocalPort(serverPort);
 		}
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index c06f24b2e16..10cd5273182 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -897,11 +897,12 @@ public class HtmlUnitRequestBuilderTests {
 	private static void assertUrlAndPorts(HttpServletRequest request, String url, int serverPort, boolean secure) {
 		assertThat(request.getRequestURL()).asString().as("url").isEqualTo(url);
 		assertThat(request.getServerPort()).as("server port").isEqualTo(serverPort);
-		// In a mocked request, the local port is always the same as the server port.
-		assertThat(request.getLocalPort()).as("local port").isEqualTo(serverPort);
-		// Remote port is always 80 (MockHttpServletRequest.DEFAULT_SERVER_PORT),
+		// Local port is always MockHttpServletRequest.DEFAULT_SERVER_PORT,
+		// since a mocked request does not influence the local port.
+		assertThat(request.getLocalPort()).as("local port").isEqualTo(MockHttpServletRequest.DEFAULT_SERVER_PORT);
+		// Remote port is always MockHttpServletRequest.DEFAULT_SERVER_PORT,
 		// since a mocked request does not influence the remote host, port, or address.
-		assertThat(request.getRemotePort()).as("remote port").isEqualTo(80);
+		assertThat(request.getRemotePort()).as("remote port").isEqualTo(MockHttpServletRequest.DEFAULT_SERVER_PORT);
 
 		if (secure) {
 			assertThat(request.isSecure()).as("secure").isTrue();