From 35fa8383e9fa3fdb18b13dc7eec4f5ed954ec4bc Mon Sep 17 00:00:00 2001
From: Alba Herrerias <albaherreriasdev@gmail.com>
Date: Thu, 19 Sep 2024 14:37:54 +0100
Subject: [PATCH] Migrate log4j-jdbc-dbcp2 to JUnit 5.

Co-authored-by: James Coglan <james@neighbourhood.ie>
---
 log4j-jdbc-dbcp2/pom.xml                       |  6 ------
 .../db/jdbc/PoolableConnectionFactoryTest.java | 18 ++++++++----------
 .../PoolingDriverConnectionSourceTest.java     | 10 ++++++----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index 95522b7c1fc..468129183c8 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -69,12 +69,6 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryTest.java b/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryTest.java
index a2bd4559502..2d73acb60a2 100644
--- a/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryTest.java
+++ b/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolableConnectionFactoryTest.java
@@ -16,22 +16,20 @@
  */
 package org.apache.logging.log4j.core.appender.db.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.core.test.junit.Named;
+import org.junit.jupiter.api.Test;
 
+@LoggerContextSource(value = "log4j2-jdbc-dbcp2.xml", timeout = 10)
 public class PoolableConnectionFactoryTest {
 
     private static final String REL_PATH = "src/test/resources/log4j2-jdbc-dbcp2.xml";
 
-    @ClassRule
-    public static final LoggerContextRule LCR = LoggerContextRule.createShutdownTimeoutLoggerContextRule(REL_PATH);
-
     @Test
-    public void test() {
-        final Appender appender = LCR.getAppender("databaseAppender");
-        Assert.assertNotNull("Problem loading configuration from " + REL_PATH, appender);
+    public void test(@Named("databaseAppender") final Appender appender) {
+        assertNotNull(appender, "Problem loading configuration from " + REL_PATH);
     }
 }
diff --git a/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSourceTest.java b/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSourceTest.java
index 4c61b963c37..9883f89bba2 100644
--- a/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSourceTest.java
+++ b/log4j-jdbc-dbcp2/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/PoolingDriverConnectionSourceTest.java
@@ -16,12 +16,14 @@
  */
 package org.apache.logging.log4j.core.appender.db.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import org.apache.logging.log4j.core.config.Property;
 import org.apache.logging.log4j.core.test.appender.db.jdbc.JdbcH2TestHelper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PoolingDriverConnectionSourceTest {
 
@@ -75,9 +77,9 @@ public void testH2UserAndPassword() throws SQLException {
     }
 
     private void openAndClose(final PoolingDriverConnectionSource source) throws SQLException {
-        Assert.assertNotNull("PoolingDriverConnectionSource is null", source);
+        assertNotNull(source, "PoolingDriverConnectionSource is null");
         try (final Connection conn = source.getConnection()) {
-            Assert.assertFalse(conn.isClosed());
+            assertFalse(conn.isClosed());
         } finally {
             source.stop();
         }