From e504e8abbea7d44e4cddc254ac6246e83721ebc8 Mon Sep 17 00:00:00 2001 From: remm Date: Wed, 11 Dec 2024 11:44:12 +0100 Subject: [PATCH] API compat --- .../servlets/TestDefaultServletRfc9110Section13.java | 6 +++--- .../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 f191e6f0275d..f06543df0b31 100644 --- a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java +++ b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java @@ -650,9 +650,9 @@ public boolean isResponseBodyOK() { } 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 192b9ffc75a6..018ad1ef5ac4 100644 --- a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java +++ b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java @@ -425,9 +425,9 @@ public boolean isResponseBodyOK() { } 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); } }