This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2083768d6b Fix test failures on Windows server
2083768d6b is described below
commit 2083768d6b78d3bd4dd0df4338adb2249daa3949
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 24 11:28:50 2023 -0700
Fix test failures on Windows server
---
test/jakarta/servlet/ServletRequestParametersBaseTest.java | 3 ++-
test/jakarta/servlet/TestServletRequestParameters.java | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/test/jakarta/servlet/ServletRequestParametersBaseTest.java
b/test/jakarta/servlet/ServletRequestParametersBaseTest.java
index 6a045c0217..20db0c92e9 100644
--- a/test/jakarta/servlet/ServletRequestParametersBaseTest.java
+++ b/test/jakarta/servlet/ServletRequestParametersBaseTest.java
@@ -37,7 +37,8 @@ public class ServletRequestParametersBaseTest extends
TomcatBaseTest {
protected Map<String,List<String>>
parseReportedParameters(SimpleHttpClient client) {
Map<String,List<String>> parameters = new LinkedHashMap<>();
if (client.isResponse200()) {
- String[] lines =
client.getResponseBody().split(System.lineSeparator());
+ // Response is written using "\n" so need to split on that.
+ String[] lines = client.getResponseBody().split("\n");
for (String line : lines) {
// Every line should be name=value
int equalsPos = line.indexOf('=');
diff --git a/test/jakarta/servlet/TestServletRequestParameters.java
b/test/jakarta/servlet/TestServletRequestParameters.java
index 3354eb07fd..44f4f60955 100644
--- a/test/jakarta/servlet/TestServletRequestParameters.java
+++ b/test/jakarta/servlet/TestServletRequestParameters.java
@@ -16,6 +16,7 @@
*/
package jakarta.servlet;
+import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import org.junit.Assert;
@@ -54,7 +55,13 @@ public class TestServletRequestParameters extends
ServletRequestParametersBaseTe
client.setResponseBodyEncoding(StandardCharsets.UTF_8);
client.connect();
// Incomplete request will look timeout reading body and behave like a
client disconnect
- client.processRequest();
+ // What the client will see will vary by OS. Expect errors.
+
+ try {
+ client.processRequest();
+ } catch (SocketException e) {
+ // Likely a connection reset.
+ }
// Connection should be closed by the server.
//readLine() will receive an EOF reading the status line resuting in a
null
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
