From 821c90f4f3526213041bd390c10ba588953eab2e Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Thu, 5 Dec 2024 14:37:51 +0000 Subject: [PATCH] Fix test on Windows. --- .../org/apache/catalina/valves/TestJDBCAccessLogValve.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java index d290f38cc286..689876fe942c 100644 --- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java +++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java @@ -33,6 +33,7 @@ import org.junit.runners.Parameterized.Parameter; import org.apache.catalina.Context; +import org.apache.catalina.startup.SimpleHttpClient; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; @@ -134,7 +135,11 @@ public void verify() throws Exception { Assert.assertTrue(rs.next()); Assert.assertEquals(HttpServletResponse.SC_OK, rs.getInt("status")); Assert.assertEquals("/test/index.html", rs.getString("query")); - Assert.assertTrue(rs.getLong("bytes") == 934); + if (System.lineSeparator().equals(SimpleHttpClient.CRLF)) { + Assert.assertEquals(957, rs.getLong("bytes")); + } else { + Assert.assertEquals(934, rs.getLong("bytes")); + } Assert.assertTrue(rs.next()); Assert.assertEquals(HttpServletResponse.SC_OK, rs.getInt("status")); Assert.assertEquals("/test/404.html", rs.getString("query"));