[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    (tomee) branch main updated: Fix BasicSlf4jWebappTest after upgrade to SLF4J2 2.0.12
From:       rzo1 () apache ! org
Date:       2024-03-31 16:51:46
Message-ID: 171190390657.199763.11632396736601646146 () gitbox2-he-fi ! apache ! org
[Download RAW message or body]

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

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/main by this push:
     new 7d8d2f1a3a Fix BasicSlf4jWebappTest after upgrade to SLF4J2 2.0.12
7d8d2f1a3a is described below

commit 7d8d2f1a3a11313dcf1a2e3cb79dfe463c127047
Author: Richard Zowalla <rzo1@apache.org>
AuthorDate: Sun Mar 31 18:51:37 2024 +0200

    Fix BasicSlf4jWebappTest after upgrade to SLF4J2 2.0.12
---
 .../apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java  | 5 +++--
 .../src/test/resources/slf4j2x-pom.xml                               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java \
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
 index d1d168f4a7..881dadcba2 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
                
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
 @@ -28,6 +28,7 @@ import org.junit.runner.RunWith;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -66,10 +67,10 @@ public class BasicSlf4jWebappTest {
         is.close();
         os.close();
 
-        final String output = new String(os.toByteArray(), "UTF-8");
+        final String output = os.toString(StandardCharsets.UTF_8);
         assertNotNull("Response shouldn't be null", output);
         assertTrue("Output should contain: " + "It works!" + "\n" + output, \
output.contains("It works!"));  assertTrue("Output should contain: " + "Logger \
Factory: org.slf4j.jul.JDK14LoggerFactory" + "\n" + output, output.contains("Logger \
                Factory: org.slf4j.jul.JDK14LoggerFactory"));
-        assertTrue("Output should contain: " + "slf4j-jdk14-2.0.9.jar" + "\n" + \
output, output.contains("slf4j-jdk14-2.0.9.jar")); +        assertTrue("Output should \
contain: " + "slf4j-jdk14-2.0.12.jar" + "\n" + output, \
output.contains("slf4j-jdk14-2.0.12.jar"));  }
 }
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml \
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml
 index 84bee8c7e8..cc3942e543 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml
                
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml
 @@ -25,7 +25,7 @@
 
     <properties>
         <logback.version>1.4.11</logback.version>
-        <slf4j.version>2.0.9</slf4j.version>
+        <slf4j.version>2.0.12</slf4j.version>
     </properties>
     <dependencies>
         <dependency>


[prev in list] [next in list] [prev in thread] [next in thread]