(tomcat) branch 10.1.x updated: API compat

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new e504e8abbe API compat
e504e8abbe is described below

commit e504e8abbea7d44e4cddc254ac6246e83721ebc8
Author: remm <r...@apache.org>
AuthorDate: Wed Dec 11 11:44:12 2024 +0100

    API compat
---
 .../catalina/servlets/TestDefaultServletRfc9110Section13.java       | 6 +++---
 .../servlets/TestDefaultServletRfc9110Section13Parameterized.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java 
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
index f191e6f027..f06543df0b 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
@@ -650,9 +650,9 @@ public class TestDefaultServletRfc9110Section13 extends 
TomcatBaseTest {
         }
         String scExpectation = usePredicate ? "IntPredicate" : 
Arrays.toString(scExpected);
         Assert.assertTrue(
-                "Failure - sc expected:%s, sc actual:%d, %s, task:%s, \ntarget 
resource:(%s,%s), \nreq headers: %s, \nresp headers: %s"
-                        .formatted(scExpectation, sc, message, task, etag, 
FastHttpDateFormat.formatDate(lastModified),
-                                requestHeaders.toString(), 
responseHeaders.toString()),
+                "Failure - sc expected:" + scExpectation + ", sc actual:" + 
String.valueOf(sc) + ", " + message
+                + ", task:" + task + ", \ntarget resource:(" + etag + "," + 
FastHttpDateFormat.formatDate(lastModified)
+                + "), \nreq headers: " + requestHeaders.toString() + ", \nresp 
headers: " + responseHeaders.toString(),
                 test);
     }
 
diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
 
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
index 192b9ffc75..018ad1ef5a 100644
--- 
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
+++ 
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
@@ -425,9 +425,9 @@ public class 
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
         }
         String scExpectation = usePredicate ? "IntPredicate" : 
Arrays.toString(scExpected);
         Assert.assertTrue(
-                "Failure - sc expected:%s, sc actual:%d, task:%s, \ntarget 
resource:(%s,%s), \nreq headers: %s, \nresp headers: %s"
-                        .formatted(scExpectation, sc, task, etag, 
FastHttpDateFormat.formatDate(lastModified),
-                                requestHeaders.toString(), 
responseHeaders.toString()),
+                "Failure - sc expected:" + scExpectation + ", sc actual:" + 
String.valueOf(sc)
+                + ", task:" + task + ", \ntarget resource:(" + etag + "," + 
FastHttpDateFormat.formatDate(lastModified)
+                + "), \nreq headers: " + requestHeaders.toString() + ", \nresp 
headers: " + responseHeaders.toString(),
                 test);
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org