You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/06/07 18:55:20 UTC

(commons-dbcp) branch master updated: Use JUnit 5 convention for test method visibility

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git


The following commit(s) were added to refs/heads/master by this push:
     new d1d0825f Use JUnit 5 convention for test method visibility
d1d0825f is described below

commit d1d0825fb61b1b2fc18db58126035ff38f095e38
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 7 14:55:14 2025 -0400

    Use JUnit 5 convention for test method visibility
---
 .../org/apache/commons/dbcp2/Jdbc41BridgeTest.java |  22 +-
 .../dbcp2/TestAbandonedBasicDataSource.java        |  22 +-
 .../apache/commons/dbcp2/TestAbandonedTrace.java   |   2 +-
 .../apache/commons/dbcp2/TestBasicDataSource.java  | 102 +++---
 .../commons/dbcp2/TestBasicDataSourceFactory.java  |   8 +-
 .../commons/dbcp2/TestBasicDataSourceMXBean.java   |   4 +-
 .../apache/commons/dbcp2/TestConnectionPool.java   |  26 +-
 .../org/apache/commons/dbcp2/TestConstants.java    |   2 +-
 .../dbcp2/TestDataSourceConnectionFactory.java     |   8 +-
 .../dbcp2/TestDelegatingCallableStatement.java     | 248 ++++++-------
 .../commons/dbcp2/TestDelegatingConnection.java    |  76 ++--
 .../dbcp2/TestDelegatingDatabaseMetaData.java      | 362 +++++++++----------
 .../dbcp2/TestDelegatingPreparedStatement.java     | 122 +++----
 .../commons/dbcp2/TestDelegatingResultSet.java     | 392 ++++++++++-----------
 .../commons/dbcp2/TestDelegatingStatement.java     | 114 +++---
 .../commons/dbcp2/TestDriverConnectionFactory.java |   4 +-
 .../dbcp2/TestDriverManagerConnectionFactory.java  |  16 +-
 .../java/org/apache/commons/dbcp2/TestJndi.java    |   6 +-
 .../dbcp2/TestLifetimeExceededException.java       |   4 +-
 .../apache/commons/dbcp2/TestListException.java    |   4 +-
 .../org/apache/commons/dbcp2/TestPStmtKey.java     |  20 +-
 .../org/apache/commons/dbcp2/TestPStmtPooling.java |  10 +-
 .../dbcp2/TestPStmtPoolingBasicDataSource.java     |  14 +-
 .../dbcp2/TestParallelCreationWithNoIdle.java      |   2 +-
 .../commons/dbcp2/TestPoolableConnection.java      |  16 +-
 .../commons/dbcp2/TestPoolingConnection.java       |  20 +-
 .../commons/dbcp2/TestPoolingDataSource.java       |  20 +-
 .../apache/commons/dbcp2/TestPoolingDriver.java    |  14 +-
 .../apache/commons/dbcp2/TestSQLExceptionList.java |   4 +-
 .../java/org/apache/commons/dbcp2/TestUtils.java   |  18 +-
 .../dbcp2/cpdsadapter/TestDriverAdapterCPDS.java   |  46 +--
 .../commons/dbcp2/datasources/CharArrayTest.java   |  12 +-
 .../datasources/PooledConnectionManagerTest.java   |   4 +-
 .../datasources/TestCPDSConnectionFactory.java     |  10 +-
 .../commons/dbcp2/datasources/TestFactory.java     |   2 +-
 .../datasources/TestInstanceKeyDataSource.java     |  68 ++--
 .../TestKeyedCPDSConnectionFactory.java            |   6 +-
 .../datasources/TestPerUserPoolDataSource.java     | 248 ++++++-------
 .../commons/dbcp2/datasources/TestPoolKey.java     |   6 +-
 .../datasources/TestSharedPoolDataSource.java      |  30 +-
 .../commons/dbcp2/datasources/TestUserPassKey.java |  10 +-
 .../commons/dbcp2/datasources/UserPassKeyTest.java |   2 +-
 .../dbcp2/managed/TestBasicManagedDataSource.java  |  24 +-
 .../dbcp2/managed/TestConnectionWithNarayana.java  |   6 +-
 .../managed/TestDataSourceXAConnectionFactory.java |   2 +-
 .../commons/dbcp2/managed/TestLocalXaResource.java |  50 +--
 .../dbcp2/managed/TestManagedConnection.java       |   2 +-
 .../managed/TestManagedConnectionCachedState.java  |   2 +-
 .../dbcp2/managed/TestManagedDataSource.java       |  30 +-
 .../dbcp2/managed/TestManagedDataSourceInTx.java   |  12 +-
 .../managed/TestPoolableManagedConnection.java     |   6 +-
 .../dbcp2/managed/TestSynchronizationOrder.java    |   4 +-
 .../dbcp2/managed/TestTransactionContext.java      |   2 +-
 53 files changed, 1133 insertions(+), 1133 deletions(-)

diff --git a/src/test/java/org/apache/commons/dbcp2/Jdbc41BridgeTest.java b/src/test/java/org/apache/commons/dbcp2/Jdbc41BridgeTest.java
index a752a95b..0fe18949 100644
--- a/src/test/java/org/apache/commons/dbcp2/Jdbc41BridgeTest.java
+++ b/src/test/java/org/apache/commons/dbcp2/Jdbc41BridgeTest.java
@@ -45,7 +45,7 @@ public class Jdbc41BridgeTest {
 
     @SuppressWarnings("resource")
     @Test
-    public void testAbort() throws SQLException {
+    void testAbort() throws SQLException {
         // Normal
         try (Connection conn = getConnection()) {
             Jdbc41Bridge.abort(conn, r -> {
@@ -66,7 +66,7 @@ public class Jdbc41BridgeTest {
 
     @SuppressWarnings("resource")
     @Test
-    public void testCloseOnCompletion() throws SQLException {
+    void testCloseOnCompletion() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 Statement stmt = conn.createStatement()) {
@@ -83,7 +83,7 @@ public class Jdbc41BridgeTest {
 
     @SuppressWarnings("resource")
     @Test
-    public void testGeneratedKeyAlwaysReturned() throws SQLException {
+    void testGeneratedKeyAlwaysReturned() throws SQLException {
         // Normal
         try (Connection conn = getConnection()) {
             assertTrue(Jdbc41Bridge.generatedKeyAlwaysReturned(conn.getMetaData()));
@@ -98,7 +98,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testGetNetworkTimeout() throws SQLException {
+    void testGetNetworkTimeout() throws SQLException {
         // Normal
         try (Connection conn = getConnection()) {
             Jdbc41Bridge.setNetworkTimeout(conn, r -> {
@@ -109,7 +109,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testGetObjectIndex() throws SQLException {
+    void testGetObjectIndex() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 ResultSet rs = conn.getMetaData().getTypeInfo()) {
@@ -129,7 +129,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testGetObjectName() throws SQLException {
+    void testGetObjectName() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 ResultSet rs = conn.getMetaData().getTypeInfo()) {
@@ -149,7 +149,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testGetParentLogger() throws SQLException {
+    void testGetParentLogger() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 Statement stmt = conn.createStatement()) {
@@ -160,7 +160,7 @@ public class Jdbc41BridgeTest {
 
     @SuppressWarnings("resource")
     @Test
-    public void testGetSchema() throws SQLException {
+    void testGetSchema() throws SQLException {
         // Normal
         try (Connection conn = getConnection()) {
             assertNotNull(Jdbc41Bridge.getSchema(conn));
@@ -171,7 +171,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testIsCloseOnCompletion() throws SQLException {
+    void testIsCloseOnCompletion() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 Statement stmt = conn.createStatement()) {
@@ -180,7 +180,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testSetNetworkTimeout() throws SQLException {
+    void testSetNetworkTimeout() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 Statement stmt = conn.createStatement()) {
@@ -193,7 +193,7 @@ public class Jdbc41BridgeTest {
     }
 
     @Test
-    public void testSetSchema() throws SQLException {
+    void testSetSchema() throws SQLException {
         // Normal
         try (Connection conn = getConnection();
                 Statement stmt = conn.createStatement()) {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
index f86aea89..cc619c66 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
@@ -121,7 +121,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testAbandoned() throws Exception {
+    void testAbandoned() throws Exception {
         // force abandoned
         ds.setRemoveAbandonedTimeout(Duration.ZERO);
         ds.setMaxTotal(1);
@@ -132,7 +132,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testAbandonedClose() throws Exception {
+    void testAbandonedClose() throws Exception {
         // force abandoned
         ds.setRemoveAbandonedTimeout(Duration.ZERO);
         ds.setMaxTotal(1);
@@ -164,7 +164,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testAbandonedCloseWithExceptions() throws Exception {
+    void testAbandonedCloseWithExceptions() throws Exception {
         // force abandoned
         ds.setRemoveAbandonedTimeout(Duration.ZERO);
         ds.setMaxTotal(1);
@@ -202,7 +202,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testAbandonedStackTraces() throws Exception {
+    void testAbandonedStackTraces() throws Exception {
         // force abandoned
         ds.setRemoveAbandonedTimeout(Duration.ZERO);
         ds.setMaxTotal(1);
@@ -243,7 +243,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * DBCP-180 - verify that a GC can clean up an unused Statement when it is no longer referenced even when it is tracked via the AbandonedTrace mechanism.
      */
     @Test
-    public void testGarbageCollectorCleanUp01() throws Exception {
+    void testGarbageCollectorCleanUp01() throws Exception {
         try (DelegatingConnection<?> conn = (DelegatingConnection<?>) ds.getConnection()) {
             Assertions.assertEquals(0, conn.getTrace().size());
             createStatement(conn);
@@ -257,7 +257,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * DBCP-180 - things get more interesting with statement pooling.
      */
     @Test
-    public void testGarbageCollectorCleanUp02() throws Exception {
+    void testGarbageCollectorCleanUp02() throws Exception {
         ds.setPoolPreparedStatements(true);
         ds.setAccessToUnderlyingConnectionAllowed(true);
         final DelegatingConnection<?> conn = (DelegatingConnection<?>) ds.getConnection();
@@ -285,7 +285,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * Verify that lastUsed property is updated when a connection creates or prepares a statement
      */
     @Test
-    public void testLastUsed() throws Exception {
+    void testLastUsed() throws Exception {
         ds.setRemoveAbandonedTimeout(Duration.ofSeconds(1));
         ds.setMaxTotal(2);
         try (Connection conn1 = ds.getConnection()) {
@@ -317,7 +317,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * DBCP-343 - verify that using a DelegatingStatement updates the lastUsed on the parent connection
      */
     @Test
-    public void testLastUsedLargePreparedStatementUse() throws Exception {
+    void testLastUsedLargePreparedStatementUse() throws Exception {
         ds.setRemoveAbandonedTimeout(Duration.ofSeconds(1));
         ds.setMaxTotal(2);
         try (Connection conn1 = ds.getConnection(); Statement st = conn1.createStatement()) {
@@ -348,7 +348,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * Verify that lastUsed property is updated when a connection prepares a callable statement.
      */
     @Test
-    public void testLastUsedPrepareCall() throws Exception {
+    void testLastUsedPrepareCall() throws Exception {
         ds.setRemoveAbandonedTimeout(Duration.ofSeconds(1));
         ds.setMaxTotal(2);
         try (Connection conn1 = ds.getConnection()) {
@@ -380,7 +380,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * DBCP-343 - verify that using a DelegatingStatement updates the lastUsed on the parent connection
      */
     @Test
-    public void testLastUsedPreparedStatementUse() throws Exception {
+    void testLastUsedPreparedStatementUse() throws Exception {
         ds.setRemoveAbandonedTimeout(Duration.ofSeconds(1));
         ds.setMaxTotal(2);
         try (Connection conn1 = ds.getConnection(); Statement st = conn1.createStatement()) {
@@ -405,7 +405,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource {
      * DBCP-343 - verify additional operations reset lastUsed on the parent connection
      */
     @Test
-    public void testLastUsedUpdate() throws Exception {
+    void testLastUsedUpdate() throws Exception {
         try (DelegatingConnection<?> conn = (DelegatingConnection<?>) ds.getConnection();
                 final PreparedStatement ps = conn.prepareStatement("");
                 final CallableStatement cs = conn.prepareCall("");
diff --git a/src/test/java/org/apache/commons/dbcp2/TestAbandonedTrace.java b/src/test/java/org/apache/commons/dbcp2/TestAbandonedTrace.java
index 1bdb3763..00806b1c 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestAbandonedTrace.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestAbandonedTrace.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class TestAbandonedTrace {
 
     @Test
-    public void testDeprecated() throws SQLException {
+    void testDeprecated() throws SQLException {
         try (AbandonedTrace trace = new AbandonedTrace()) {
             assertEquals(trace.getLastUsedInstant().toEpochMilli(), trace.getLastUsed());
         }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index b690c469..a7a87408 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -99,7 +99,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testAccessToUnderlyingConnectionAllowed() throws Exception {
+    void testAccessToUnderlyingConnectionAllowed() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true);
         assertTrue(ds.isAccessToUnderlyingConnectionAllowed());
 
@@ -115,7 +115,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testClose() throws Exception {
+    void testClose() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true);
 
         // active connection is held open when ds is closed
@@ -160,7 +160,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testConcurrentInitBorrow() throws Exception {
+    void testConcurrentInitBorrow() throws Exception {
         ds.setDriverClassName("org.apache.commons.dbcp2.TesterConnectionDelayDriver");
         ds.setUrl("jdbc:apache:commons:testerConnectionDelayDriver:50");
         ds.setInitialSize(8);
@@ -189,7 +189,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-444 Verify that invalidate does not return closed connection to the pool.
      */
     @Test
-    public void testConcurrentInvalidateBorrow() throws Exception {
+    void testConcurrentInvalidateBorrow() throws Exception {
         ds.setDriverClassName("org.apache.commons.dbcp2.TesterConnRequestCountDriver");
         ds.setUrl("jdbc:apache:commons:testerConnRequestCountDriver");
         ds.setTestOnBorrow(true);
@@ -225,7 +225,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * Test disabling MBean registration for Connection objects. JIRA: DBCP-585
      */
     @Test
-    public void testConnectionMBeansDisabled() throws Exception {
+    void testConnectionMBeansDisabled() throws Exception {
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         // Unregister leftovers from other tests (TODO: worry about concurrent test execution)
         final ObjectName commons = new ObjectName("org.apache.commons.*:*");
@@ -245,7 +245,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-547 Verify that ConnectionFactory interface in BasicDataSource.createConnectionFactory().
      */
     @Test
-    public void testCreateConnectionFactoryWithConnectionFactoryClassName() throws Exception {
+    void testCreateConnectionFactoryWithConnectionFactoryClassName() throws Exception {
         Properties properties = new Properties();
         // set ConnectionFactoryClassName
         properties = new Properties();
@@ -266,7 +266,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-547 Verify that ConnectionFactory interface in BasicDataSource.createConnectionFactory().
      */
     @Test
-    public void testCreateConnectionFactoryWithoutConnectionFactoryClassName() throws Exception {
+    void testCreateConnectionFactoryWithoutConnectionFactoryClassName() throws Exception {
         // not set ConnectionFactoryClassName
         final Properties properties = new Properties();
         properties.put("initialSize", "1");
@@ -285,7 +285,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-342, DBCP-93 Verify that when errors occur during BasicDataSource initialization, GenericObjectPool Evictors are cleaned up.
      */
     @Test
-    public void testCreateDataSourceCleanupEvictor() throws Exception {
+    void testCreateDataSourceCleanupEvictor() throws Exception {
         ds.close();
         ds = null;
         ds = createDataSource();
@@ -330,7 +330,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA DBCP-93: If an SQLException occurs after the GenericObjectPool is initialized in createDataSource, the evictor task is not cleaned up.
      */
     @Test
-    public void testCreateDataSourceCleanupThreads() throws Exception {
+    void testCreateDataSourceCleanupThreads() throws Exception {
         ds.close();
         ds = null;
         ds = createDataSource();
@@ -360,7 +360,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testDefaultCatalog() throws Exception {
+    void testDefaultCatalog() throws Exception {
         final Connection[] c = new Connection[getMaxTotal()];
         for (int i = 0; i < c.length; i++) {
             c[i] = getConnection();
@@ -385,7 +385,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testDeprecatedAccessors() throws SQLException {
+    void testDeprecatedAccessors() throws SQLException {
         try (BasicDataSource bds = new BasicDataSource()) {
             int i = 0;
             //
@@ -432,7 +432,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testDisconnectionIgnoreSqlCodes() throws Exception {
+    void testDisconnectionIgnoreSqlCodes() throws Exception {
         final ArrayList<String> disconnectionIgnoreSqlCodes = new ArrayList<>();
         disconnectionIgnoreSqlCodes.add("XXXX");
         ds.setDisconnectionIgnoreSqlCodes(disconnectionIgnoreSqlCodes);
@@ -450,7 +450,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-437 Verify that BasicDataSource sets disconnect codes properties. Functionality is verified in pcf tests.
      */
     @Test
-    public void testDisconnectSqlCodes() throws Exception {
+    void testDisconnectSqlCodes() throws Exception {
         final ArrayList<String> disconnectionSqlCodes = new ArrayList<>();
         disconnectionSqlCodes.add("XXX");
         ds.setDisconnectionSqlCodes(disconnectionSqlCodes);
@@ -470,7 +470,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * @throws Exception
      */
     @Test
-    public void testDriverClassLoader() throws Exception {
+    void testDriverClassLoader() throws Exception {
         try (Connection conn = getConnection()) {
             final ClassLoader cl = ds.getDriverClassLoader();
             assertNotNull(cl);
@@ -480,7 +480,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testEmptyInitConnectionSql() throws Exception {
+    void testEmptyInitConnectionSql() throws Exception {
         // List
         ds.setConnectionInitSqls(Arrays.asList("", "   "));
         assertNotNull(ds.getConnectionInitSqls());
@@ -496,7 +496,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testEmptyValidationQuery() throws Exception {
+    void testEmptyValidationQuery() throws Exception {
         assertNotNull(ds.getValidationQuery());
 
         ds.setValidationQuery("");
@@ -508,7 +508,7 @@ public class TestBasicDataSource extends TestConnectionPool {
 
     @Test
     @Disabled
-    public void testEvict() throws Exception {
+    void testEvict() throws Exception {
         final long delay = 1000;
 
         ds.setInitialSize(10);
@@ -536,7 +536,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testInitialSize() throws Exception {
+    void testInitialSize() throws Exception {
         ds.setMaxTotal(20);
         ds.setMaxIdle(20);
         ds.setInitialSize(10);
@@ -553,7 +553,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-482 Verify warning not logged if JMX MBean unregistered before close() called.
      */
     @Test
-    public void testInstanceNotFoundExceptionLogSuppressed() throws Exception {
+    void testInstanceNotFoundExceptionLogSuppressed() throws Exception {
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         try (Connection c = ds.getConnection()) {
             // nothing
@@ -569,7 +569,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testInvalidateConnection() throws Exception {
+    void testInvalidateConnection() throws Exception {
         ds.setMaxTotal(2);
         try (final Connection conn1 = ds.getConnection()) {
             try (final Connection conn2 = ds.getConnection()) {
@@ -585,21 +585,21 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testInvalidConnectionInitSqlCollection() {
+    void testInvalidConnectionInitSqlCollection() {
         ds.setConnectionInitSqls((Collection<String>) Arrays.asList("SELECT 1", "invalid"));
         final SQLException e = assertThrows(SQLException.class, ds::getConnection);
         assertTrue(e.toString().contains("invalid"));
     }
 
     @Test
-    public void testInvalidConnectionInitSqlList() {
+    void testInvalidConnectionInitSqlList() {
         ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "invalid"));
         final SQLException e = assertThrows(SQLException.class, ds::getConnection);
         assertTrue(e.toString().contains("invalid"));
     }
 
     @Test
-    public void testInvalidValidationQuery() {
+    void testInvalidValidationQuery() {
         ds.setValidationQuery("invalid");
         final SQLException e = assertThrows(SQLException.class, ds::getConnection);
         assertTrue(e.toString().contains("invalid"));
@@ -608,7 +608,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     // Bugzilla Bug 28251: Returning dead database connections to BasicDataSource
     // isClosed() failure blocks returning a connection to the pool
     @Test
-    public void testIsClosedFailure() throws SQLException {
+    void testIsClosedFailure() throws SQLException {
         ds.setAccessToUnderlyingConnectionAllowed(true);
         final Connection conn = ds.getConnection();
         assertNotNull(conn);
@@ -624,7 +624,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testIsWrapperFor() throws Exception {
+    void testIsWrapperFor() throws Exception {
         assertTrue(ds.isWrapperFor(BasicDataSource.class));
         assertTrue(ds.isWrapperFor(AutoCloseable.class));
         assertFalse(ds.isWrapperFor(String.class));
@@ -635,7 +635,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * Make sure setting jmxName to null suppresses JMX registration of connection and statement pools. JIRA: DBCP-434
      */
     @Test
-    public void testJmxDisabled() throws Exception {
+    void testJmxDisabled() throws Exception {
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         // Unregister leftovers from other tests (TODO: worry about concurrent test execution)
         final ObjectName commons = new ObjectName("org.apache.commons.*:*");
@@ -658,7 +658,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * </p>
      */
     @Test
-    public void testJmxDoesNotExposePassword() throws Exception {
+    void testJmxDoesNotExposePassword() throws Exception {
         final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         try (Connection c = ds.getConnection()) {
             // nothing
@@ -671,7 +671,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testManualConnectionEvict() throws Exception {
+    void testManualConnectionEvict() throws Exception {
         ds.setMinIdle(0);
         ds.setMaxIdle(4);
         ds.setMinEvictableIdle(Duration.ofMillis(10));
@@ -695,7 +695,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMaxConnLifetimeExceeded() throws Exception {
+    void testMaxConnLifetimeExceeded() throws Exception {
         try {
             StackMessageLog.lock();
             ds.setMaxConn(Duration.ofMillis(100));
@@ -714,7 +714,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMaxConnLifetimeExceededMutedLog() throws Exception {
+    void testMaxConnLifetimeExceededMutedLog() throws Exception {
         try {
             StackMessageLog.lock();
             StackMessageLog.clear();
@@ -737,7 +737,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * in commons-pool.
      */
     @Test
-    public void testMaxTotalZero() throws Exception {
+    void testMaxTotalZero() throws Exception {
         ds.setMaxTotal(0);
         assertThrows(SQLException.class, ds::getConnection);
     }
@@ -746,7 +746,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * JIRA: DBCP-457 Verify that changes made to abandoned config are passed to the underlying pool.
      */
     @Test
-    public void testMutateAbandonedConfig() throws Exception {
+    void testMutateAbandonedConfig() throws Exception {
         final Properties properties = new Properties();
         properties.put("initialSize", "1");
         properties.put("driverClassName", "org.apache.commons.dbcp2.TesterDriver");
@@ -761,7 +761,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testNoAccessToUnderlyingConnectionAllowed() throws Exception {
+    void testNoAccessToUnderlyingConnectionAllowed() throws Exception {
         // default: false
         assertFalse(ds.isAccessToUnderlyingConnectionAllowed());
 
@@ -775,7 +775,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testNoOverlapBetweenDisconnectionAndIgnoreSqlCodes() {
+    void testNoOverlapBetweenDisconnectionAndIgnoreSqlCodes() {
         // Set disconnection SQL codes without overlap
         final HashSet<String> disconnectionSqlCodes = new HashSet<>(Arrays.asList("XXX", "ZZZ"));
         ds.setDisconnectionSqlCodes(disconnectionSqlCodes);
@@ -789,7 +789,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testOverlapBetweenDisconnectionAndIgnoreSqlCodes() {
+    void testOverlapBetweenDisconnectionAndIgnoreSqlCodes() {
         // Set initial disconnection SQL codes
         final HashSet<String> disconnectionSqlCodes = new HashSet<>(Arrays.asList("XXX", "ZZZ"));
         ds.setDisconnectionSqlCodes(disconnectionSqlCodes);
@@ -806,7 +806,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * swallowed by the underlying pool and logged, or propagated and wrapped.
      */
     @Test
-    public void testPoolCloseCheckedException() throws Exception {
+    void testPoolCloseCheckedException() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true); // Allow dirty tricks
 
         final TesterConnection tc;
@@ -839,7 +839,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolCloseRTE() throws Exception {
+    void testPoolCloseRTE() throws Exception {
         // RTE version of testPoolCloseCheckedException - see comments there.
         ds.setAccessToUnderlyingConnectionAllowed(true);
         final TesterConnection tc;
@@ -873,7 +873,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * Bugzilla Bug 29054: The BasicDataSource.setTestOnReturn(boolean) is not carried through to the GenericObjectPool variable _testOnReturn.
      */
     @Test
-    public void testPropertyTestOnReturn() throws Exception {
+    void testPropertyTestOnReturn() throws Exception {
         ds.setValidationQuery("select 1 from dual");
         ds.setTestOnBorrow(false);
         ds.setTestWhileIdle(false);
@@ -889,7 +889,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testRestart() throws Exception {
+    void testRestart() throws Exception {
         ds.setMaxTotal(2);
         ds.setDurationBetweenEvictionRuns(Duration.ofMillis(100));
         ds.setNumTestsPerEvictionRun(2);
@@ -918,7 +918,7 @@ public class TestBasicDataSource extends TestConnectionPool {
      * Bugzilla Bug 29055: AutoCommit and ReadOnly The DaffodilDB driver throws an SQLException if trying to commit or rollback a readOnly connection.
      */
     @Test
-    public void testRollbackReadOnly() throws Exception {
+    void testRollbackReadOnly() throws Exception {
         ds.setDefaultReadOnly(Boolean.TRUE);
         ds.setDefaultAutoCommit(Boolean.FALSE);
 
@@ -928,7 +928,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testSetAutoCommitTrueOnClose() throws Exception {
+    void testSetAutoCommitTrueOnClose() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true);
         ds.setDefaultAutoCommit(Boolean.FALSE);
         final Connection dconn;
@@ -946,7 +946,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testSetProperties() throws Exception {
+    void testSetProperties() throws Exception {
         // normal
         ds.setConnectionProperties("name1=value1;name2=value2;name3=value3");
         assertEquals(3, ds.getConnectionProperties().size());
@@ -993,7 +993,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testSetValidationTestProperties() {
+    void testSetValidationTestProperties() {
         // defaults
         assertTrue(ds.getTestOnBorrow());
         assertFalse(ds.getTestOnReturn());
@@ -1015,7 +1015,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testStart() throws Exception {
+    void testStart() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true);
         ds.setMaxTotal(2);
         final DelegatingConnection<?> conn1 = (DelegatingConnection<?>) ds.getConnection();
@@ -1045,7 +1045,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testStartInitializes() throws Exception {
+    void testStartInitializes() throws Exception {
         ds.setInitialSize(2);
         // Note: if we ever move away from lazy init, next two will fail
         assertEquals(0, ds.getNumIdle());
@@ -1058,7 +1058,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testTransactionIsolationBehavior() throws Exception {
+    void testTransactionIsolationBehavior() throws Exception {
         try (final Connection conn = getConnection()) {
             assertNotNull(conn);
             assertEquals(Connection.TRANSACTION_READ_COMMITTED, conn.getTransactionIsolation());
@@ -1077,7 +1077,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testUnwrap() throws Exception {
+    void testUnwrap() throws Exception {
         assertSame(ds.unwrap(BasicDataSource.class), ds);
         assertSame(ds.unwrap(AutoCloseable.class), ds);
         assertThrows(SQLException.class, () -> ds.unwrap(String.class));
@@ -1085,7 +1085,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testValidationQueryTimeoutNegative() throws Exception {
+    void testValidationQueryTimeoutNegative() throws Exception {
         ds.setTestOnBorrow(true);
         ds.setTestOnReturn(true);
         ds.setValidationQueryTimeout(Duration.ofSeconds(-1));
@@ -1095,7 +1095,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testValidationQueryTimeoutSucceed() throws Exception {
+    void testValidationQueryTimeoutSucceed() throws Exception {
         ds.setTestOnBorrow(true);
         ds.setTestOnReturn(true);
         ds.setValidationQueryTimeout(Duration.ofMillis(100)); // Works for TesterStatement
@@ -1105,7 +1105,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testValidationQueryTimeoutZero() throws Exception {
+    void testValidationQueryTimeoutZero() throws Exception {
         ds.setTestOnBorrow(true);
         ds.setTestOnReturn(true);
         ds.setValidationQueryTimeout(Duration.ZERO);
@@ -1115,7 +1115,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testValidationQueryTimoutFail() {
+    void testValidationQueryTimoutFail() {
         ds.setTestOnBorrow(true);
         ds.setValidationQueryTimeout(Duration.ofSeconds(3)); // Too fast for TesterStatement
         final SQLException e = assertThrows(SQLException.class, ds::getConnection);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
index 597cbda0..ac4b9ead 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
@@ -153,7 +153,7 @@ public class TestBasicDataSourceFactory {
     }
 
     @Test
-    public void testAllProperties() throws Exception {
+    void testAllProperties() throws Exception {
         try {
             StackMessageLog.lock();
             StackMessageLog.clear();
@@ -176,7 +176,7 @@ public class TestBasicDataSourceFactory {
     }
 
     @Test
-    public void testNoProperties() throws Exception {
+    void testNoProperties() throws Exception {
         final Properties properties = new Properties();
         try (final BasicDataSource ds = BasicDataSourceFactory.createDataSource(properties)) {
             assertNotNull(ds);
@@ -184,14 +184,14 @@ public class TestBasicDataSourceFactory {
     }
 
     @Test
-    public void testProperties() throws Exception {
+    void testProperties() throws Exception {
         try (final BasicDataSource ds = BasicDataSourceFactory.createDataSource(getTestProperties())) {
             checkDataSourceProperties(ds);
         }
     }
 
     @Test
-    public void testValidateProperties() throws Exception {
+    void testValidateProperties() throws Exception {
         try {
             StackMessageLog.lock();
             StackMessageLog.clear();
diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
index 5245490e..daf6fa79 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceMXBean.java
@@ -258,7 +258,7 @@ public class TestBasicDataSourceMXBean {
      * Tests the interface defined default method.
      */
     @Test
-    public void testDefaultSchema() {
+    void testDefaultSchema() {
         assertNull(bean.getDefaultSchema());
     }
 
@@ -266,7 +266,7 @@ public class TestBasicDataSourceMXBean {
      * Tests if the {@link BasicDataSourceMXBean} interface is a valid MXBean interface.
      */
     @Test
-    public void testMXBeanCompliance() throws OperationsException {
+    void testMXBeanCompliance() throws OperationsException {
         testMXBeanCompliance(BasicDataSourceMXBean.class);
     }
 }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index 34b556d2..d75528cd 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -490,7 +490,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testBackPointers() throws Exception {
+    void testBackPointers() throws Exception {
         // normal statement
         Connection conn = newConnection();
         assertBackPointers(conn, conn.createStatement());
@@ -523,7 +523,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testCanCloseCallableStatementTwice() throws Exception {
+    void testCanCloseCallableStatementTwice() throws Exception {
         try (Connection conn = newConnection()) {
             assertNotNull(conn);
             assertFalse(conn.isClosed());
@@ -545,7 +545,7 @@ public abstract class TestConnectionPool {
      * Verify the close method can be called multiple times on a single connection without an exception being thrown.
      */
     @Test
-    public void testCanCloseConnectionTwice() throws Exception {
+    void testCanCloseConnectionTwice() throws Exception {
         for (int i = 0; i < getMaxTotal(); i++) { // loop to show we *can* close again once we've borrowed it from the pool again
             final Connection conn = newConnection();
             assertNotNull(conn);
@@ -558,7 +558,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testCanClosePreparedStatementTwice() throws Exception {
+    void testCanClosePreparedStatementTwice() throws Exception {
         try (Connection conn = newConnection()) {
             assertNotNull(conn);
             assertFalse(conn.isClosed());
@@ -577,7 +577,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testCanCloseResultSetTwice() throws Exception {
+    void testCanCloseResultSetTwice() throws Exception {
         try (Connection conn = newConnection()) {
             assertNotNull(conn);
             assertFalse(conn.isClosed());
@@ -598,7 +598,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testCanCloseStatementTwice() throws Exception {
+    void testCanCloseStatementTwice() throws Exception {
         final Connection conn = newConnection();
         assertNotNull(conn);
         assertFalse(conn.isClosed());
@@ -702,7 +702,7 @@ public abstract class TestConnectionPool {
      * DBCP-128: BasicDataSource.getConnection() Connections don't work as hashtable keys
      */
     @Test
-    public void testHashing() throws Exception {
+    void testHashing() throws Exception {
         final Connection con = getConnection();
         final Hashtable<Connection, String> hash = new Hashtable<>();
         hash.put(con, "test");
@@ -714,7 +714,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testIsClosed() throws Exception {
+    void testIsClosed() throws Exception {
         for (int i = 0; i < getMaxTotal(); i++) {
             @SuppressWarnings("resource")
             final Connection conn = newConnection();
@@ -755,7 +755,7 @@ public abstract class TestConnectionPool {
     // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
     // wrong order of passivate/close when a rset isn't closed
     @Test
-    public void testNoRsetClose() throws Exception {
+    void testNoRsetClose() throws Exception {
         try (Connection conn = newConnection()) {
             assertNotNull(conn);
             try (PreparedStatement stmt = conn.prepareStatement("test")) {
@@ -785,7 +785,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testPooling() throws Exception {
+    void testPooling() throws Exception {
         // Grab a maximal set of open connections from the pool
         final Connection[] c = new Connection[getMaxTotal()];
         final Connection[] u = new Connection[getMaxTotal()];
@@ -822,7 +822,7 @@ public abstract class TestConnectionPool {
     // and Concurrency if statement pooling is not enabled
     // https://issues.apache.org/bugzilla/show_bug.cgi?id=24328
     @Test
-    public void testPrepareStatementOptions() throws Exception {
+    void testPrepareStatementOptions() throws Exception {
         try (Connection conn = newConnection()) {
             assertNotNull(conn);
             try (PreparedStatement stmt = conn.prepareStatement("select * from dual", ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE)) {
@@ -840,7 +840,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testRepeatedBorrowAndReturn() throws Exception {
+    void testRepeatedBorrowAndReturn() throws Exception {
         for (int i = 0; i < 100; i++) {
             try (Connection conn = newConnection()) {
                 assertNotNull(conn);
@@ -918,7 +918,7 @@ public abstract class TestConnectionPool {
     }
 
     @Test
-    public void testThreaded() {
+    void testThreaded() {
         final TestThread[] threads = new TestThread[getMaxTotal()];
         for (int i = 0; i < threads.length; i++) {
             threads[i] = new TestThread(50, 50);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConstants.java b/src/test/java/org/apache/commons/dbcp2/TestConstants.java
index 49a29b5c..554e18fd 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConstants.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConstants.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 public class TestConstants {
 
     @Test
-    public void testConstants() {
+    void testConstants() {
         assertNotNull(new Constants());
         assertEquals(",connectionpool=", Constants.JMX_CONNECTION_POOL_BASE_EXT);
         assertEquals("connections", Constants.JMX_CONNECTION_POOL_PREFIX);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
index d10b2775..3e12d819 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDataSourceConnectionFactory.java
@@ -94,7 +94,7 @@ public class TestDataSourceConnectionFactory {
     }
 
     @Test
-    public void testCredentials() throws SQLException {
+    void testCredentials() throws SQLException {
         final DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, "foo", "bar");
         try (Connection conn = factory.createConnection()) {
             assertEquals("foo", ((TesterConnection) conn).getUserName());
@@ -102,14 +102,14 @@ public class TestDataSourceConnectionFactory {
     }
 
     @Test
-    public void testDefaultValues() throws SQLException {
+    void testDefaultValues() throws SQLException {
         try (Connection conn = factory.createConnection()) {
             assertNull(((TesterConnection) conn).getUserName());
         }
     }
 
     @Test
-    public void testEmptyPassword() throws SQLException {
+    void testEmptyPassword() throws SQLException {
         final DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, "foo", (char[]) null);
         try (Connection conn = factory.createConnection()) {
             assertEquals("foo", ((TesterConnection) conn).getUserName());
@@ -117,7 +117,7 @@ public class TestDataSourceConnectionFactory {
     }
 
     @Test
-    public void testEmptyUser() throws SQLException {
+    void testEmptyUser() throws SQLException {
         final DataSourceConnectionFactory factory = new DataSourceConnectionFactory(datasource, null, new char[] { 'a' });
         try (Connection conn = factory.createConnection()) {
             assertNull(((TesterConnection) conn).getUserName());
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
index 71d1cefc..0af7d180 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
@@ -47,21 +47,21 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testExecuteQueryReturnsNotNull() throws Exception {
+    void testExecuteQueryReturnsNotNull() throws Exception {
         final TesterCallableStatement delegateStmt = new TesterCallableStatement(conn, "select * from foo");
         obj = new DelegatingCallableStatement(new DelegatingConnection<>(conn), delegateStmt);
         assertNotNull(obj.executeQuery());
     }
 
     @Test
-    public void testExecuteQueryReturnsNull() throws Exception {
+    void testExecuteQueryReturnsNull() throws Exception {
         final TesterCallableStatement delegateStmt = new TesterCallableStatement(conn, "null");
         obj = new DelegatingCallableStatement(new DelegatingConnection<>(conn), delegateStmt);
         assertNull(obj.executeQuery());
     }
 
     @Test
-    public void testGetArrayInteger() throws Exception {
+    void testGetArrayInteger() throws Exception {
         try {
             delegate.getArray(1);
         } catch (final SQLException e) {
@@ -70,7 +70,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetArrayString() throws Exception {
+    void testGetArrayString() throws Exception {
         try {
             delegate.getArray("foo");
         } catch (final SQLException e) {
@@ -79,7 +79,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBigDecimalInteger() throws Exception {
+    void testGetBigDecimalInteger() throws Exception {
         try {
             delegate.getBigDecimal(1);
         } catch (final SQLException e) {
@@ -88,7 +88,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBigDecimalIntegerInteger() throws Exception {
+    void testGetBigDecimalIntegerInteger() throws Exception {
         try {
             delegate.getBigDecimal(1, 1);
         } catch (final SQLException e) {
@@ -97,7 +97,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBigDecimalString() throws Exception {
+    void testGetBigDecimalString() throws Exception {
         try {
             delegate.getBigDecimal("foo");
         } catch (final SQLException e) {
@@ -106,7 +106,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBlobInteger() throws Exception {
+    void testGetBlobInteger() throws Exception {
         try {
             delegate.getBlob(1);
         } catch (final SQLException e) {
@@ -115,7 +115,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBlobString() throws Exception {
+    void testGetBlobString() throws Exception {
         try {
             delegate.getBlob("foo");
         } catch (final SQLException e) {
@@ -124,7 +124,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBooleanInteger() throws Exception {
+    void testGetBooleanInteger() throws Exception {
         try {
             delegate.getBoolean(1);
         } catch (final SQLException e) {
@@ -133,7 +133,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBooleanString() throws Exception {
+    void testGetBooleanString() throws Exception {
         try {
             delegate.getBoolean("foo");
         } catch (final SQLException e) {
@@ -142,7 +142,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetByteInteger() throws Exception {
+    void testGetByteInteger() throws Exception {
         try {
             delegate.getByte(1);
         } catch (final SQLException e) {
@@ -151,7 +151,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBytesInteger() throws Exception {
+    void testGetBytesInteger() throws Exception {
         try {
             delegate.getBytes(1);
         } catch (final SQLException e) {
@@ -160,7 +160,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetBytesString() throws Exception {
+    void testGetBytesString() throws Exception {
         try {
             delegate.getBytes("foo");
         } catch (final SQLException e) {
@@ -169,7 +169,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetByteString() throws Exception {
+    void testGetByteString() throws Exception {
         try {
             delegate.getByte("foo");
         } catch (final SQLException e) {
@@ -178,7 +178,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetCharacterStreamInteger() throws Exception {
+    void testGetCharacterStreamInteger() throws Exception {
         try {
             delegate.getCharacterStream(1);
         } catch (final SQLException e) {
@@ -187,7 +187,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetCharacterStreamString() throws Exception {
+    void testGetCharacterStreamString() throws Exception {
         try {
             delegate.getCharacterStream("foo");
         } catch (final SQLException e) {
@@ -196,7 +196,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetClobInteger() throws Exception {
+    void testGetClobInteger() throws Exception {
         try {
             delegate.getClob(1);
         } catch (final SQLException e) {
@@ -205,7 +205,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetClobString() throws Exception {
+    void testGetClobString() throws Exception {
         try {
             delegate.getClob("foo");
         } catch (final SQLException e) {
@@ -214,7 +214,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetDateInteger() throws Exception {
+    void testGetDateInteger() throws Exception {
         try {
             delegate.getDate(1);
         } catch (final SQLException e) {
@@ -223,7 +223,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetDateIntegerCalendar() throws Exception {
+    void testGetDateIntegerCalendar() throws Exception {
         try {
             delegate.getDate(1, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -232,7 +232,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetDateString() throws Exception {
+    void testGetDateString() throws Exception {
         try {
             delegate.getDate("foo");
         } catch (final SQLException e) {
@@ -241,7 +241,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetDateStringCalendar() throws Exception {
+    void testGetDateStringCalendar() throws Exception {
         try {
             delegate.getDate("foo", (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -250,14 +250,14 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetDelegate() throws Exception {
+    void testGetDelegate() throws Exception {
         final TesterCallableStatement delegateStmt = new TesterCallableStatement(conn, "select * from foo");
         obj = new DelegatingCallableStatement(new DelegatingConnection<>(conn), delegateStmt);
         assertEquals(delegateStmt, ((DelegatingCallableStatement) obj).getDelegate());
     }
 
     @Test
-    public void testGetDoubleInteger() throws Exception {
+    void testGetDoubleInteger() throws Exception {
         try {
             delegate.getDouble(1);
         } catch (final SQLException e) {
@@ -266,7 +266,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetDoubleString() throws Exception {
+    void testGetDoubleString() throws Exception {
         try {
             delegate.getDouble("foo");
         } catch (final SQLException e) {
@@ -275,7 +275,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetFloatInteger() throws Exception {
+    void testGetFloatInteger() throws Exception {
         try {
             delegate.getFloat(1);
         } catch (final SQLException e) {
@@ -284,7 +284,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetFloatString() throws Exception {
+    void testGetFloatString() throws Exception {
         try {
             delegate.getFloat("foo");
         } catch (final SQLException e) {
@@ -293,7 +293,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetIntInteger() throws Exception {
+    void testGetIntInteger() throws Exception {
         try {
             delegate.getInt(1);
         } catch (final SQLException e) {
@@ -302,7 +302,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetIntString() throws Exception {
+    void testGetIntString() throws Exception {
         try {
             delegate.getInt("foo");
         } catch (final SQLException e) {
@@ -311,7 +311,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetLongInteger() throws Exception {
+    void testGetLongInteger() throws Exception {
         try {
             delegate.getLong(1);
         } catch (final SQLException e) {
@@ -320,7 +320,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetLongString() throws Exception {
+    void testGetLongString() throws Exception {
         try {
             delegate.getLong("foo");
         } catch (final SQLException e) {
@@ -329,7 +329,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetNCharacterStreamInteger() throws Exception {
+    void testGetNCharacterStreamInteger() throws Exception {
         try {
             delegate.getNCharacterStream(1);
         } catch (final SQLException e) {
@@ -338,7 +338,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetNCharacterStreamString() throws Exception {
+    void testGetNCharacterStreamString() throws Exception {
         try {
             delegate.getNCharacterStream("foo");
         } catch (final SQLException e) {
@@ -347,7 +347,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetNClobInteger() throws Exception {
+    void testGetNClobInteger() throws Exception {
         try {
             delegate.getNClob(1);
         } catch (final SQLException e) {
@@ -356,7 +356,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetNClobString() throws Exception {
+    void testGetNClobString() throws Exception {
         try {
             delegate.getNClob("foo");
         } catch (final SQLException e) {
@@ -365,7 +365,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetNStringInteger() throws Exception {
+    void testGetNStringInteger() throws Exception {
         try {
             delegate.getNString(1);
         } catch (final SQLException e) {
@@ -374,7 +374,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetNStringString() throws Exception {
+    void testGetNStringString() throws Exception {
         try {
             delegate.getNString("foo");
         } catch (final SQLException e) {
@@ -383,7 +383,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetObjectInteger() throws Exception {
+    void testGetObjectInteger() throws Exception {
         try {
             delegate.getObject(1);
         } catch (final SQLException e) {
@@ -392,7 +392,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetObjectIntegerClass() throws Exception {
+    void testGetObjectIntegerClass() throws Exception {
         try {
             delegate.getObject(1, Object.class);
         } catch (final SQLException e) {
@@ -401,7 +401,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetObjectIntegerMap() throws Exception {
+    void testGetObjectIntegerMap() throws Exception {
         try {
             delegate.getObject(1, (java.util.Map) null);
         } catch (final SQLException e) {
@@ -410,7 +410,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetObjectString() throws Exception {
+    void testGetObjectString() throws Exception {
         try {
             delegate.getObject("foo");
         } catch (final SQLException e) {
@@ -419,7 +419,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetObjectStringClass() throws Exception {
+    void testGetObjectStringClass() throws Exception {
         try {
             delegate.getObject("foo", Object.class);
         } catch (final SQLException e) {
@@ -428,7 +428,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetObjectStringMap() throws Exception {
+    void testGetObjectStringMap() throws Exception {
         try {
             delegate.getObject("foo", (java.util.Map) null);
         } catch (final SQLException e) {
@@ -437,7 +437,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetRefInteger() throws Exception {
+    void testGetRefInteger() throws Exception {
         try {
             delegate.getRef(1);
         } catch (final SQLException e) {
@@ -446,7 +446,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetRefString() throws Exception {
+    void testGetRefString() throws Exception {
         try {
             delegate.getRef("foo");
         } catch (final SQLException e) {
@@ -455,7 +455,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetRowIdInteger() throws Exception {
+    void testGetRowIdInteger() throws Exception {
         try {
             delegate.getRowId(1);
         } catch (final SQLException e) {
@@ -464,7 +464,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetRowIdString() throws Exception {
+    void testGetRowIdString() throws Exception {
         try {
             delegate.getRowId("foo");
         } catch (final SQLException e) {
@@ -473,7 +473,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetShortInteger() throws Exception {
+    void testGetShortInteger() throws Exception {
         try {
             delegate.getShort(1);
         } catch (final SQLException e) {
@@ -482,7 +482,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetShortString() throws Exception {
+    void testGetShortString() throws Exception {
         try {
             delegate.getShort("foo");
         } catch (final SQLException e) {
@@ -491,7 +491,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetSQLXMLInteger() throws Exception {
+    void testGetSQLXMLInteger() throws Exception {
         try {
             delegate.getSQLXML(1);
         } catch (final SQLException e) {
@@ -500,7 +500,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetSQLXMLString() throws Exception {
+    void testGetSQLXMLString() throws Exception {
         try {
             delegate.getSQLXML("foo");
         } catch (final SQLException e) {
@@ -509,7 +509,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetStringInteger() throws Exception {
+    void testGetStringInteger() throws Exception {
         try {
             delegate.getString(1);
         } catch (final SQLException e) {
@@ -518,7 +518,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetStringString() throws Exception {
+    void testGetStringString() throws Exception {
         try {
             delegate.getString("foo");
         } catch (final SQLException e) {
@@ -527,7 +527,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimeInteger() throws Exception {
+    void testGetTimeInteger() throws Exception {
         try {
             delegate.getTime(1);
         } catch (final SQLException e) {
@@ -536,7 +536,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimeIntegerCalendar() throws Exception {
+    void testGetTimeIntegerCalendar() throws Exception {
         try {
             delegate.getTime(1, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -545,7 +545,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimestampInteger() throws Exception {
+    void testGetTimestampInteger() throws Exception {
         try {
             delegate.getTimestamp(1);
         } catch (final SQLException e) {
@@ -554,7 +554,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimestampIntegerCalendar() throws Exception {
+    void testGetTimestampIntegerCalendar() throws Exception {
         try {
             delegate.getTimestamp(1, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -563,7 +563,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimestampString() throws Exception {
+    void testGetTimestampString() throws Exception {
         try {
             delegate.getTimestamp("foo");
         } catch (final SQLException e) {
@@ -572,7 +572,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimestampStringCalendar() throws Exception {
+    void testGetTimestampStringCalendar() throws Exception {
         try {
             delegate.getTimestamp("foo", (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -581,7 +581,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimeString() throws Exception {
+    void testGetTimeString() throws Exception {
         try {
             delegate.getTime("foo");
         } catch (final SQLException e) {
@@ -590,7 +590,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetTimeStringCalendar() throws Exception {
+    void testGetTimeStringCalendar() throws Exception {
         try {
             delegate.getTime("foo", (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -599,7 +599,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetURLInteger() throws Exception {
+    void testGetURLInteger() throws Exception {
         try {
             delegate.getURL(1);
         } catch (final SQLException e) {
@@ -608,7 +608,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testGetURLString() throws Exception {
+    void testGetURLString() throws Exception {
         try {
             delegate.getURL("foo");
         } catch (final SQLException e) {
@@ -617,7 +617,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterIntegerInteger() throws Exception {
+    void testRegisterOutParameterIntegerInteger() throws Exception {
         try {
             delegate.registerOutParameter(1, 1);
         } catch (final SQLException e) {
@@ -626,7 +626,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterIntegerIntegerInteger() throws Exception {
+    void testRegisterOutParameterIntegerIntegerInteger() throws Exception {
         try {
             delegate.registerOutParameter(1, 1, 1);
         } catch (final SQLException e) {
@@ -635,7 +635,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterIntegerIntegerString() throws Exception {
+    void testRegisterOutParameterIntegerIntegerString() throws Exception {
         try {
             delegate.registerOutParameter(1, 1, "foo");
         } catch (final SQLException e) {
@@ -644,7 +644,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterIntegerSQLType() throws Exception {
+    void testRegisterOutParameterIntegerSQLType() throws Exception {
         try {
             delegate.registerOutParameter(1, (java.sql.SQLType) null);
         } catch (final SQLException e) {
@@ -653,7 +653,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterIntegerSQLTypeInteger() throws Exception {
+    void testRegisterOutParameterIntegerSQLTypeInteger() throws Exception {
         try {
             delegate.registerOutParameter(1, (java.sql.SQLType) null, 1);
         } catch (final SQLException e) {
@@ -662,7 +662,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterIntegerSQLTypeString() throws Exception {
+    void testRegisterOutParameterIntegerSQLTypeString() throws Exception {
         try {
             delegate.registerOutParameter(1, (java.sql.SQLType) null, "foo");
         } catch (final SQLException e) {
@@ -671,7 +671,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterStringInteger() throws Exception {
+    void testRegisterOutParameterStringInteger() throws Exception {
         try {
             delegate.registerOutParameter("foo", 1);
         } catch (final SQLException e) {
@@ -680,7 +680,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterStringIntegerInteger() throws Exception {
+    void testRegisterOutParameterStringIntegerInteger() throws Exception {
         try {
             delegate.registerOutParameter("foo", 1, 1);
         } catch (final SQLException e) {
@@ -689,7 +689,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterStringIntegerString() throws Exception {
+    void testRegisterOutParameterStringIntegerString() throws Exception {
         try {
             delegate.registerOutParameter("foo", 1, "foo");
         } catch (final SQLException e) {
@@ -698,7 +698,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterStringSQLType() throws Exception {
+    void testRegisterOutParameterStringSQLType() throws Exception {
         try {
             delegate.registerOutParameter("foo", (java.sql.SQLType) null);
         } catch (final SQLException e) {
@@ -707,7 +707,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterStringSQLTypeInteger() throws Exception {
+    void testRegisterOutParameterStringSQLTypeInteger() throws Exception {
         try {
             delegate.registerOutParameter("foo", (java.sql.SQLType) null, 1);
         } catch (final SQLException e) {
@@ -716,7 +716,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testRegisterOutParameterStringSQLTypeString() throws Exception {
+    void testRegisterOutParameterStringSQLTypeString() throws Exception {
         try {
             delegate.registerOutParameter("foo", (java.sql.SQLType) null, "foo");
         } catch (final SQLException e) {
@@ -725,7 +725,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetAsciiStreamStringInputStream() throws Exception {
+    void testSetAsciiStreamStringInputStream() throws Exception {
         try {
             delegate.setAsciiStream("foo", (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -734,7 +734,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetAsciiStreamStringInputStreamInteger() throws Exception {
+    void testSetAsciiStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.setAsciiStream("foo", (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -743,7 +743,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetAsciiStreamStringInputStreamLong() throws Exception {
+    void testSetAsciiStreamStringInputStreamLong() throws Exception {
         try {
             delegate.setAsciiStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -752,7 +752,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBigDecimalStringBigDecimal() throws Exception {
+    void testSetBigDecimalStringBigDecimal() throws Exception {
         try {
             delegate.setBigDecimal("foo", java.math.BigDecimal.valueOf(1.0d));
         } catch (final SQLException e) {
@@ -761,7 +761,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBinaryStreamStringInputStream() throws Exception {
+    void testSetBinaryStreamStringInputStream() throws Exception {
         try {
             delegate.setBinaryStream("foo", (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -770,7 +770,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBinaryStreamStringInputStreamInteger() throws Exception {
+    void testSetBinaryStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.setBinaryStream("foo", (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -779,7 +779,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBinaryStreamStringInputStreamLong() throws Exception {
+    void testSetBinaryStreamStringInputStreamLong() throws Exception {
         try {
             delegate.setBinaryStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -788,7 +788,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBlobStringBlob() throws Exception {
+    void testSetBlobStringBlob() throws Exception {
         try {
             delegate.setBlob("foo", (java.sql.Blob) null);
         } catch (final SQLException e) {
@@ -797,7 +797,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBlobStringInputStream() throws Exception {
+    void testSetBlobStringInputStream() throws Exception {
         try {
             delegate.setBlob("foo", (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -806,7 +806,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBlobStringInputStreamLong() throws Exception {
+    void testSetBlobStringInputStreamLong() throws Exception {
         try {
             delegate.setBlob("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -815,7 +815,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBooleanStringBoolean() throws Exception {
+    void testSetBooleanStringBoolean() throws Exception {
         try {
             delegate.setBoolean("foo", Boolean.TRUE);
         } catch (final SQLException e) {
@@ -824,7 +824,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetBytesStringByteArray() throws Exception {
+    void testSetBytesStringByteArray() throws Exception {
         try {
             delegate.setBytes("foo", new byte[] { 1 });
         } catch (final SQLException e) {
@@ -833,7 +833,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetByteStringByte() throws Exception {
+    void testSetByteStringByte() throws Exception {
         try {
             delegate.setByte("foo", (byte) 1);
         } catch (final SQLException e) {
@@ -842,7 +842,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetCharacterStreamStringReader() throws Exception {
+    void testSetCharacterStreamStringReader() throws Exception {
         try {
             delegate.setCharacterStream("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -851,7 +851,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetCharacterStreamStringReaderInteger() throws Exception {
+    void testSetCharacterStreamStringReaderInteger() throws Exception {
         try {
             delegate.setCharacterStream("foo", (java.io.StringReader) null, 1);
         } catch (final SQLException e) {
@@ -860,7 +860,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetCharacterStreamStringReaderLong() throws Exception {
+    void testSetCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.setCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -869,7 +869,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetClobStringClob() throws Exception {
+    void testSetClobStringClob() throws Exception {
         try {
             delegate.setClob("foo", (java.sql.Clob) null);
         } catch (final SQLException e) {
@@ -878,7 +878,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetClobStringReader() throws Exception {
+    void testSetClobStringReader() throws Exception {
         try {
             delegate.setClob("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -887,7 +887,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetClobStringReaderLong() throws Exception {
+    void testSetClobStringReaderLong() throws Exception {
         try {
             delegate.setClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -896,7 +896,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetDateStringSqlDate() throws Exception {
+    void testSetDateStringSqlDate() throws Exception {
         try {
             delegate.setDate("foo", new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
@@ -905,7 +905,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetDateStringSqlDateCalendar() throws Exception {
+    void testSetDateStringSqlDateCalendar() throws Exception {
         try {
             delegate.setDate("foo", new java.sql.Date(1529827548745L), (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -914,7 +914,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetDoubleStringDouble() throws Exception {
+    void testSetDoubleStringDouble() throws Exception {
         try {
             delegate.setDouble("foo", 1.0d);
         } catch (final SQLException e) {
@@ -923,7 +923,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetFloatStringFloat() throws Exception {
+    void testSetFloatStringFloat() throws Exception {
         try {
             delegate.setFloat("foo", 1.0f);
         } catch (final SQLException e) {
@@ -932,7 +932,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetIntStringInteger() throws Exception {
+    void testSetIntStringInteger() throws Exception {
         try {
             delegate.setInt("foo", 1);
         } catch (final SQLException e) {
@@ -941,7 +941,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetLongStringLong() throws Exception {
+    void testSetLongStringLong() throws Exception {
         try {
             delegate.setLong("foo", 1L);
         } catch (final SQLException e) {
@@ -950,7 +950,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNCharacterStreamStringReader() throws Exception {
+    void testSetNCharacterStreamStringReader() throws Exception {
         try {
             delegate.setNCharacterStream("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -959,7 +959,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNCharacterStreamStringReaderLong() throws Exception {
+    void testSetNCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.setNCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -968,7 +968,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNClobStringNClob() throws Exception {
+    void testSetNClobStringNClob() throws Exception {
         try {
             delegate.setNClob("foo", (java.sql.NClob) null);
         } catch (final SQLException e) {
@@ -977,7 +977,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNClobStringReader() throws Exception {
+    void testSetNClobStringReader() throws Exception {
         try {
             delegate.setNClob("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -986,7 +986,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNClobStringReaderLong() throws Exception {
+    void testSetNClobStringReaderLong() throws Exception {
         try {
             delegate.setNClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -995,7 +995,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNStringStringString() throws Exception {
+    void testSetNStringStringString() throws Exception {
         try {
             delegate.setNString("foo", "foo");
         } catch (final SQLException e) {
@@ -1004,7 +1004,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNullStringInteger() throws Exception {
+    void testSetNullStringInteger() throws Exception {
         try {
             delegate.setNull("foo", 1);
         } catch (final SQLException e) {
@@ -1013,7 +1013,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetNullStringIntegerString() throws Exception {
+    void testSetNullStringIntegerString() throws Exception {
         try {
             delegate.setNull("foo", 1, "foo");
         } catch (final SQLException e) {
@@ -1022,7 +1022,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetObjectStringObject() throws Exception {
+    void testSetObjectStringObject() throws Exception {
         try {
             delegate.setObject("foo", System.err);
         } catch (final SQLException e) {
@@ -1031,7 +1031,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetObjectStringObjectInteger() throws Exception {
+    void testSetObjectStringObjectInteger() throws Exception {
         try {
             delegate.setObject("foo", System.err, 1);
         } catch (final SQLException e) {
@@ -1040,7 +1040,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetObjectStringObjectIntegerInteger() throws Exception {
+    void testSetObjectStringObjectIntegerInteger() throws Exception {
         try {
             delegate.setObject("foo", System.err, 1, 1);
         } catch (final SQLException e) {
@@ -1049,7 +1049,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetObjectStringObjectSQLType() throws Exception {
+    void testSetObjectStringObjectSQLType() throws Exception {
         try {
             delegate.setObject("foo", System.err, (java.sql.SQLType) null);
         } catch (final SQLException e) {
@@ -1058,7 +1058,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetObjectStringObjectSQLTypeInteger() throws Exception {
+    void testSetObjectStringObjectSQLTypeInteger() throws Exception {
         try {
             delegate.setObject("foo", System.err, (java.sql.SQLType) null, 1);
         } catch (final SQLException e) {
@@ -1067,7 +1067,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetRowIdStringRowId() throws Exception {
+    void testSetRowIdStringRowId() throws Exception {
         try {
             delegate.setRowId("foo", (java.sql.RowId) null);
         } catch (final SQLException e) {
@@ -1076,7 +1076,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetShortStringShort() throws Exception {
+    void testSetShortStringShort() throws Exception {
         try {
             delegate.setShort("foo", (short) 1);
         } catch (final SQLException e) {
@@ -1085,7 +1085,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetSQLXMLStringSQLXML() throws Exception {
+    void testSetSQLXMLStringSQLXML() throws Exception {
         try {
             delegate.setSQLXML("foo", (java.sql.SQLXML) null);
         } catch (final SQLException e) {
@@ -1094,7 +1094,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetStringStringString() throws Exception {
+    void testSetStringStringString() throws Exception {
         try {
             delegate.setString("foo", "foo");
         } catch (final SQLException e) {
@@ -1103,7 +1103,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetTimestampStringTimestamp() throws Exception {
+    void testSetTimestampStringTimestamp() throws Exception {
         try {
             delegate.setTimestamp("foo", (java.sql.Timestamp) null);
         } catch (final SQLException e) {
@@ -1112,7 +1112,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetTimestampStringTimestampCalendar() throws Exception {
+    void testSetTimestampStringTimestampCalendar() throws Exception {
         try {
             delegate.setTimestamp("foo", (java.sql.Timestamp) null, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -1121,7 +1121,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetTimeStringTime() throws Exception {
+    void testSetTimeStringTime() throws Exception {
         try {
             delegate.setTime("foo", (java.sql.Time) null);
         } catch (final SQLException e) {
@@ -1130,7 +1130,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetTimeStringTimeCalendar() throws Exception {
+    void testSetTimeStringTimeCalendar() throws Exception {
         try {
             delegate.setTime("foo", (java.sql.Time) null, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -1139,7 +1139,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testSetURLStringUrl() throws Exception {
+    void testSetURLStringUrl() throws Exception {
         try {
             delegate.setURL("foo", (java.net.URL) null);
         } catch (final SQLException e) {
@@ -1148,7 +1148,7 @@ public class TestDelegatingCallableStatement {
     }
 
     @Test
-    public void testWasNull() throws Exception {
+    void testWasNull() throws Exception {
         try {
             delegate.wasNull();
         } catch (final SQLException e) {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
index f762752b..08f01a08 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
@@ -114,13 +114,13 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testAbort() throws Exception {
+    void testAbort() throws Exception {
         h2DConnection.abort(r -> {
         });
     }
 
     @Test
-    public void testAutoCommitCaching() throws SQLException {
+    void testAutoCommitCaching() throws SQLException {
         final Connection con = new NoReadOnlyOrAutoCommitConnection();
         final DelegatingConnection<Connection> delCon = new DelegatingConnection<>(con);
 
@@ -131,7 +131,7 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testCheckOpen() throws Exception {
+    void testCheckOpen() throws Exception {
         delegatingConnection.checkOpen();
         delegatingConnection.close();
         assertThrows(SQLException.class, delegatingConnection::checkOpen);
@@ -141,7 +141,7 @@ public class TestDelegatingConnection {
      * Verify fix for DBCP-241
      */
     @Test
-    public void testCheckOpenNull() throws Exception {
+    void testCheckOpenNull() throws Exception {
         delegatingConnection.close();
         SQLException e = assertThrows(SQLException.class, delegatingConnection::checkOpen);
         assertTrue(e.getMessage().endsWith("is closed."));
@@ -166,95 +166,95 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testCommit() throws Exception {
+    void testCommit() throws Exception {
         h2DConnection.commit();
     }
 
     @Test
-    public void testConnectionToString() throws Exception {
+    void testConnectionToString() throws Exception {
         final String s = delegatingConnection.toString();
         assertNotNull(s);
         assertFalse(s.isEmpty());
     }
 
     @Test
-    public void testCreateArrayOf() throws Exception {
+    void testCreateArrayOf() throws Exception {
         assertNotNull(h2DConnection.createArrayOf("CHARACTER", new Object[] { "A", "B" }));
     }
 
     @Test
-    public void testCreateBlob() throws Exception {
+    void testCreateBlob() throws Exception {
         assertNotNull(h2DConnection.createBlob());
     }
 
     @Test
-    public void testCreateClob() throws Exception {
+    void testCreateClob() throws Exception {
         assertNotNull(h2DConnection.createClob());
     }
 
     @Test
-    public void testCreateNClob() throws Exception {
+    void testCreateNClob() throws Exception {
         assertNotNull(h2DConnection.createNClob());
     }
 
     @Test
-    public void testCreateSQLXML() throws Exception {
+    void testCreateSQLXML() throws Exception {
         assertNotNull(h2DConnection.createSQLXML());
     }
 
     @Test
-    public void testCreateStruct() throws Exception {
+    void testCreateStruct() throws Exception {
         // not supported by H2
         assertThrows(SQLException.class, () -> h2DConnection.createStruct("CHARACTER", new Object[] { "A", "B" }));
     }
 
     @Test
-    public void testGetCacheState() throws Exception {
+    void testGetCacheState() throws Exception {
         assertTrue(h2DConnection.getCacheState());
     }
 
     @Test
-    public void testGetClientInfo() throws Exception {
+    void testGetClientInfo() throws Exception {
         assertNotNull(h2DConnection.getClientInfo());
     }
 
     @Test
-    public void testGetClientInfoString() throws Exception {
+    void testGetClientInfoString() throws Exception {
         assertNull(h2DConnection.getClientInfo("xyz"));
     }
 
     @Test
-    public void testGetDefaultQueryTimeout() throws Exception {
+    void testGetDefaultQueryTimeout() throws Exception {
         assertNull(h2DConnection.getDefaultQueryTimeout());
     }
 
     @Test
-    public void testGetDefaultQueryTimeoutDuration() throws Exception {
+    void testGetDefaultQueryTimeoutDuration() throws Exception {
         assertNull(h2DConnection.getDefaultQueryTimeoutDuration());
     }
 
     @Test
-    public void testGetDelegate() throws Exception {
+    void testGetDelegate() throws Exception {
         assertEquals(connection, delegatingConnection.getDelegate());
     }
 
     @Test
-    public void testGetHoldability() throws Exception {
+    void testGetHoldability() throws Exception {
         assertEquals(1, h2DConnection.getHoldability());
     }
 
     @Test
-    public void testGetNetworkTimeout() throws Exception {
+    void testGetNetworkTimeout() throws Exception {
         assertEquals(0, h2DConnection.getNetworkTimeout());
     }
 
     @Test
-    public void testGetTypeMap() throws Exception {
+    void testGetTypeMap() throws Exception {
         assertNull(h2DConnection.getTypeMap());
     }
 
     @Test
-    public void testIsClosed() throws Exception {
+    void testIsClosed() throws Exception {
         delegatingConnection.checkOpen();
         assertFalse(delegatingConnection.isClosed());
         delegatingConnection.close();
@@ -262,7 +262,7 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testIsClosedNullDelegate() throws Exception {
+    void testIsClosedNullDelegate() throws Exception {
         delegatingConnection.checkOpen();
         assertFalse(delegatingConnection.isClosed());
         delegatingConnection.setDelegate(null);
@@ -271,19 +271,19 @@ public class TestDelegatingConnection {
 
     @SuppressWarnings("resource")
     @Test
-    public void testIsWrapperFor() throws Exception {
+    void testIsWrapperFor() throws Exception {
         assertTrue(delegatingConnection.isWrapperFor(delegatingConnection.getClass()));
         assertTrue(delegatingConnection.isWrapperFor(delegatingConnection.getDelegate().getClass()));
         assertThrows(SQLException.class, () -> delegatingConnection.isWrapperFor(Integer.class));
     }
 
     @Test
-    public void testNativeSQL() throws Exception {
+    void testNativeSQL() throws Exception {
         assertNotNull(h2DConnection.nativeSQL("select 1"));
     }
 
     @Test
-    public void testPassivateWithResultSetCloseException() {
+    void testPassivateWithResultSetCloseException() {
         testerResultSet.setSqlExceptionOnClose(true);
         delegatingConnection.addTrace(testerResultSet);
         final SQLException e = assertThrows(SQLException.class, delegatingConnection::passivate);
@@ -292,7 +292,7 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testPassivateWithResultSetCloseExceptionAndStatementCloseException() {
+    void testPassivateWithResultSetCloseExceptionAndStatementCloseException() {
         testerStatement.setSqlExceptionOnClose(true);
         testerResultSet.setSqlExceptionOnClose(true);
         delegatingConnection.addTrace(testerStatement);
@@ -303,7 +303,7 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testPassivateWithStatementCloseException() {
+    void testPassivateWithStatementCloseException() {
         testerStatement.setSqlExceptionOnClose(true);
         delegatingConnection.addTrace(testerStatement);
         final SQLException e = assertThrows(SQLException.class, delegatingConnection::passivate);
@@ -312,7 +312,7 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testReadOnlyCaching() throws SQLException {
+    void testReadOnlyCaching() throws SQLException {
         final Connection con = new NoReadOnlyOrAutoCommitConnection();
         final DelegatingConnection<Connection> delCon = new DelegatingConnection<>(con);
 
@@ -323,18 +323,18 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testReleaseSavepoint() throws Exception {
+    void testReleaseSavepoint() throws Exception {
         final Savepoint s = h2DConnection.setSavepoint();
         h2DConnection.releaseSavepoint(s);
     }
 
     @Test
-    public void testRollback() throws Exception {
+    void testRollback() throws Exception {
         h2DConnection.rollback();
     }
 
     @Test
-    public void testRollbackSavepoint() throws Exception {
+    void testRollbackSavepoint() throws Exception {
         h2DConnection.setAutoCommit(false);
         try {
             h2DConnection.rollback(h2DConnection.setSavepoint());
@@ -344,40 +344,40 @@ public class TestDelegatingConnection {
     }
 
     @Test
-    public void testSetClientInfo() throws Exception {
+    void testSetClientInfo() throws Exception {
         // TODO
         // h2DConnection.setClientInfo("ApplicationName", "app1");
     }
 
     @Test
-    public void testSetDefaultQueryTimeout() throws Exception {
+    void testSetDefaultQueryTimeout() throws Exception {
         final int expected = 1;
         delegatingConnection.setDefaultQueryTimeout(expected);
         assertEquals(expected, delegatingConnection.getDefaultQueryTimeout());
     }
 
     @Test
-    public void testSetHoldability() throws Exception {
+    void testSetHoldability() throws Exception {
         final int expected = 1;
         h2DConnection.setHoldability(expected);
         assertEquals(expected, h2DConnection.getHoldability());
     }
 
     @Test
-    public void testSetNetworkTimeout() throws Exception {
+    void testSetNetworkTimeout() throws Exception {
         h2DConnection.setNetworkTimeout(r -> {
         }, 1);
         assertEquals(0, h2DConnection.getNetworkTimeout());
     }
 
     @Test
-    public void testSetSavepoint() throws Exception {
+    void testSetSavepoint() throws Exception {
         h2DConnection.setSavepoint();
     }
 
     @SuppressWarnings("javadoc")
     @Test
-    public void testUnwrap() throws Exception {
+    void testUnwrap() throws Exception {
         assertNotNull(delegatingConnection.unwrap(delegatingConnection.getClass()));
         assertNotNull(delegatingConnection.unwrap(delegatingConnection.getDelegate().getClass()));
         assertThrows(SQLException.class, () -> delegatingConnection.unwrap(Integer.class));
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
index e017663d..2c4fbbc0 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
@@ -56,7 +56,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testAllProceduresAreCallable() throws Exception {
+    void testAllProceduresAreCallable() throws Exception {
         try {
             delegate.allProceduresAreCallable();
         } catch (final SQLException e) {
@@ -70,7 +70,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testAllTablesAreSelectable() throws Exception {
+    void testAllTablesAreSelectable() throws Exception {
         try {
             delegate.allTablesAreSelectable();
         } catch (final SQLException e) {
@@ -84,7 +84,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testAutoCommitFailureClosesAllResultSets() throws Exception {
+    void testAutoCommitFailureClosesAllResultSets() throws Exception {
         try {
             delegate.autoCommitFailureClosesAllResultSets();
         } catch (final SQLException e) {
@@ -98,7 +98,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testCheckOpen() throws Exception {
+    void testCheckOpen() throws Exception {
         delegate = new DelegatingDatabaseMetaData(conn, conn.getMetaData());
         final ResultSet rst = delegate.getSchemas();
         assertFalse(rst.isClosed());
@@ -107,7 +107,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testDataDefinitionCausesTransactionCommit() throws Exception {
+    void testDataDefinitionCausesTransactionCommit() throws Exception {
         try {
             delegate.dataDefinitionCausesTransactionCommit();
         } catch (final SQLException e) {
@@ -121,7 +121,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testDataDefinitionIgnoredInTransactions() throws Exception {
+    void testDataDefinitionIgnoredInTransactions() throws Exception {
         try {
             delegate.dataDefinitionIgnoredInTransactions();
         } catch (final SQLException e) {
@@ -135,7 +135,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testDeletesAreDetectedInteger() throws Exception {
+    void testDeletesAreDetectedInteger() throws Exception {
         try {
             delegate.deletesAreDetected(1);
         } catch (final SQLException e) {
@@ -149,7 +149,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testDoesMaxRowSizeIncludeBlobs() throws Exception {
+    void testDoesMaxRowSizeIncludeBlobs() throws Exception {
         try {
             delegate.doesMaxRowSizeIncludeBlobs();
         } catch (final SQLException e) {
@@ -163,7 +163,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGeneratedKeyAlwaysReturned() throws Exception {
+    void testGeneratedKeyAlwaysReturned() throws Exception {
         try {
             delegate.generatedKeyAlwaysReturned();
         } catch (final SQLException e) {
@@ -177,7 +177,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetAttributesStringStringStringString() throws Exception {
+    void testGetAttributesStringStringStringString() throws Exception {
         try {
             delegate.getAttributes("foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -187,7 +187,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetBestRowIdentifierStringStringStringIntegerBoolean() throws Exception {
+    void testGetBestRowIdentifierStringStringStringIntegerBoolean() throws Exception {
         try {
             delegate.getBestRowIdentifier("foo", "foo", "foo", 1, Boolean.TRUE);
         } catch (final SQLException e) {
@@ -197,7 +197,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetCatalogs() throws Exception {
+    void testGetCatalogs() throws Exception {
         try {
             delegate.getCatalogs();
         } catch (final SQLException e) {
@@ -211,7 +211,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetCatalogSeparator() throws Exception {
+    void testGetCatalogSeparator() throws Exception {
         try {
             delegate.getCatalogSeparator();
         } catch (final SQLException e) {
@@ -225,7 +225,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetCatalogTerm() throws Exception {
+    void testGetCatalogTerm() throws Exception {
         try {
             delegate.getCatalogTerm();
         } catch (final SQLException e) {
@@ -239,7 +239,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetClientInfoProperties() throws Exception {
+    void testGetClientInfoProperties() throws Exception {
         try {
             delegate.getClientInfoProperties();
         } catch (final SQLException e) {
@@ -253,7 +253,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetColumnPrivilegesStringStringStringString() throws Exception {
+    void testGetColumnPrivilegesStringStringStringString() throws Exception {
         try {
             delegate.getColumnPrivileges("foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -263,7 +263,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetColumnsStringStringStringString() throws Exception {
+    void testGetColumnsStringStringStringString() throws Exception {
         try {
             delegate.getColumns("foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -278,7 +278,7 @@ public class TestDelegatingDatabaseMetaData {
      * @throws Exception
      */
     @Test
-    public void testGetConnection() throws Exception {
+    void testGetConnection() throws Exception {
         try {
             delegate.getConnection();
         } catch (final SQLException e) {
@@ -288,7 +288,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetCrossReferenceStringStringStringStringStringString() throws Exception {
+    void testGetCrossReferenceStringStringStringStringStringString() throws Exception {
         try {
             delegate.getCrossReference("foo", "foo", "foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -298,7 +298,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDatabaseMajorVersion() throws Exception {
+    void testGetDatabaseMajorVersion() throws Exception {
         try {
             delegate.getDatabaseMajorVersion();
         } catch (final SQLException e) {
@@ -312,7 +312,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDatabaseMinorVersion() throws Exception {
+    void testGetDatabaseMinorVersion() throws Exception {
         try {
             delegate.getDatabaseMinorVersion();
         } catch (final SQLException e) {
@@ -326,7 +326,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDatabaseProductName() throws Exception {
+    void testGetDatabaseProductName() throws Exception {
         try {
             delegate.getDatabaseProductName();
         } catch (final SQLException e) {
@@ -340,7 +340,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDatabaseProductVersion() throws Exception {
+    void testGetDatabaseProductVersion() throws Exception {
         try {
             delegate.getDatabaseProductVersion();
         } catch (final SQLException e) {
@@ -350,7 +350,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDefaultTransactionIsolation() throws Exception {
+    void testGetDefaultTransactionIsolation() throws Exception {
         try {
             delegate.getDefaultTransactionIsolation();
         } catch (final SQLException e) {
@@ -360,24 +360,24 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDelegate() throws Exception {
+    void testGetDelegate() throws Exception {
         assertEquals(obj, delegate.getDelegate());
     }
 
     @Test
-    public void testGetDriverMajorVersion() throws Exception {
+    void testGetDriverMajorVersion() throws Exception {
         delegate.getDriverMajorVersion();
         verify(obj, times(1)).getDriverMajorVersion();
     }
 
     @Test
-    public void testGetDriverMinorVersion() throws Exception {
+    void testGetDriverMinorVersion() throws Exception {
         delegate.getDriverMinorVersion();
         verify(obj, times(1)).getDriverMinorVersion();
     }
 
     @Test
-    public void testGetDriverName() throws Exception {
+    void testGetDriverName() throws Exception {
         try {
             delegate.getDriverName();
         } catch (final SQLException e) {
@@ -387,7 +387,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetDriverVersion() throws Exception {
+    void testGetDriverVersion() throws Exception {
         try {
             delegate.getDriverVersion();
         } catch (final SQLException e) {
@@ -397,7 +397,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetExportedKeysStringStringString() throws Exception {
+    void testGetExportedKeysStringStringString() throws Exception {
         try {
             delegate.getExportedKeys("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -407,7 +407,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetExtraNameCharacters() throws Exception {
+    void testGetExtraNameCharacters() throws Exception {
         try {
             delegate.getExtraNameCharacters();
         } catch (final SQLException e) {
@@ -417,7 +417,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetFunctionColumnsStringStringStringString() throws Exception {
+    void testGetFunctionColumnsStringStringStringString() throws Exception {
         try {
             delegate.getFunctionColumns("foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -427,7 +427,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetFunctionsStringStringString() throws Exception {
+    void testGetFunctionsStringStringString() throws Exception {
         try {
             delegate.getFunctions("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -437,7 +437,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetIdentifierQuoteString() throws Exception {
+    void testGetIdentifierQuoteString() throws Exception {
         try {
             delegate.getIdentifierQuoteString();
         } catch (final SQLException e) {
@@ -447,7 +447,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetImportedKeysStringStringString() throws Exception {
+    void testGetImportedKeysStringStringString() throws Exception {
         try {
             delegate.getImportedKeys("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -457,7 +457,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetIndexInfoStringStringStringBooleanBoolean() throws Exception {
+    void testGetIndexInfoStringStringStringBooleanBoolean() throws Exception {
         try {
             delegate.getIndexInfo("foo", "foo", "foo", Boolean.TRUE, Boolean.TRUE);
         } catch (final SQLException e) {
@@ -467,12 +467,12 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetInnermostDelegate() {
+    void testGetInnermostDelegate() {
         assertNotNull(delegate.getInnermostDelegate());
     }
 
     @Test
-    public void testGetJDBCMajorVersion() throws Exception {
+    void testGetJDBCMajorVersion() throws Exception {
         try {
             delegate.getJDBCMajorVersion();
         } catch (final SQLException e) {
@@ -482,7 +482,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetJDBCMinorVersion() throws Exception {
+    void testGetJDBCMinorVersion() throws Exception {
         try {
             delegate.getJDBCMinorVersion();
         } catch (final SQLException e) {
@@ -492,7 +492,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxBinaryLiteralLength() throws Exception {
+    void testGetMaxBinaryLiteralLength() throws Exception {
         try {
             delegate.getMaxBinaryLiteralLength();
         } catch (final SQLException e) {
@@ -502,7 +502,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxCatalogNameLength() throws Exception {
+    void testGetMaxCatalogNameLength() throws Exception {
         try {
             delegate.getMaxCatalogNameLength();
         } catch (final SQLException e) {
@@ -512,7 +512,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxCharLiteralLength() throws Exception {
+    void testGetMaxCharLiteralLength() throws Exception {
         try {
             delegate.getMaxCharLiteralLength();
         } catch (final SQLException e) {
@@ -522,7 +522,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxColumnNameLength() throws Exception {
+    void testGetMaxColumnNameLength() throws Exception {
         try {
             delegate.getMaxColumnNameLength();
         } catch (final SQLException e) {
@@ -532,7 +532,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxColumnsInGroupBy() throws Exception {
+    void testGetMaxColumnsInGroupBy() throws Exception {
         try {
             delegate.getMaxColumnsInGroupBy();
         } catch (final SQLException e) {
@@ -542,7 +542,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxColumnsInIndex() throws Exception {
+    void testGetMaxColumnsInIndex() throws Exception {
         try {
             delegate.getMaxColumnsInIndex();
         } catch (final SQLException e) {
@@ -552,7 +552,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxColumnsInOrderBy() throws Exception {
+    void testGetMaxColumnsInOrderBy() throws Exception {
         try {
             delegate.getMaxColumnsInOrderBy();
         } catch (final SQLException e) {
@@ -562,7 +562,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxColumnsInSelect() throws Exception {
+    void testGetMaxColumnsInSelect() throws Exception {
         try {
             delegate.getMaxColumnsInSelect();
         } catch (final SQLException e) {
@@ -572,7 +572,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxColumnsInTable() throws Exception {
+    void testGetMaxColumnsInTable() throws Exception {
         try {
             delegate.getMaxColumnsInTable();
         } catch (final SQLException e) {
@@ -582,7 +582,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxConnections() throws Exception {
+    void testGetMaxConnections() throws Exception {
         try {
             delegate.getMaxConnections();
         } catch (final SQLException e) {
@@ -592,7 +592,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxCursorNameLength() throws Exception {
+    void testGetMaxCursorNameLength() throws Exception {
         try {
             delegate.getMaxCursorNameLength();
         } catch (final SQLException e) {
@@ -602,7 +602,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxIndexLength() throws Exception {
+    void testGetMaxIndexLength() throws Exception {
         try {
             delegate.getMaxIndexLength();
         } catch (final SQLException e) {
@@ -612,7 +612,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxLogicalLobSize() throws Exception {
+    void testGetMaxLogicalLobSize() throws Exception {
         try {
             delegate.getMaxLogicalLobSize();
         } catch (final SQLException e) {
@@ -622,7 +622,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxProcedureNameLength() throws Exception {
+    void testGetMaxProcedureNameLength() throws Exception {
         try {
             delegate.getMaxProcedureNameLength();
         } catch (final SQLException e) {
@@ -632,7 +632,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxRowSize() throws Exception {
+    void testGetMaxRowSize() throws Exception {
         try {
             delegate.getMaxRowSize();
         } catch (final SQLException e) {
@@ -642,7 +642,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxSchemaNameLength() throws Exception {
+    void testGetMaxSchemaNameLength() throws Exception {
         try {
             delegate.getMaxSchemaNameLength();
         } catch (final SQLException e) {
@@ -652,7 +652,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxStatementLength() throws Exception {
+    void testGetMaxStatementLength() throws Exception {
         try {
             delegate.getMaxStatementLength();
         } catch (final SQLException e) {
@@ -662,7 +662,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxStatements() throws Exception {
+    void testGetMaxStatements() throws Exception {
         try {
             delegate.getMaxStatements();
         } catch (final SQLException e) {
@@ -672,7 +672,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxTableNameLength() throws Exception {
+    void testGetMaxTableNameLength() throws Exception {
         try {
             delegate.getMaxTableNameLength();
         } catch (final SQLException e) {
@@ -682,7 +682,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxTablesInSelect() throws Exception {
+    void testGetMaxTablesInSelect() throws Exception {
         try {
             delegate.getMaxTablesInSelect();
         } catch (final SQLException e) {
@@ -692,7 +692,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetMaxUserNameLength() throws Exception {
+    void testGetMaxUserNameLength() throws Exception {
         try {
             delegate.getMaxUserNameLength();
         } catch (final SQLException e) {
@@ -702,7 +702,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetNumericFunctions() throws Exception {
+    void testGetNumericFunctions() throws Exception {
         try {
             delegate.getNumericFunctions();
         } catch (final SQLException e) {
@@ -712,7 +712,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetPrimaryKeysStringStringString() throws Exception {
+    void testGetPrimaryKeysStringStringString() throws Exception {
         try {
             delegate.getPrimaryKeys("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -722,7 +722,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetProcedureColumnsStringStringStringString() throws Exception {
+    void testGetProcedureColumnsStringStringStringString() throws Exception {
         try {
             delegate.getProcedureColumns("foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -732,7 +732,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetProceduresStringStringString() throws Exception {
+    void testGetProceduresStringStringString() throws Exception {
         try {
             delegate.getProcedures("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -742,7 +742,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetProcedureTerm() throws Exception {
+    void testGetProcedureTerm() throws Exception {
         try {
             delegate.getProcedureTerm();
         } catch (final SQLException e) {
@@ -752,7 +752,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetPseudoColumnsStringStringStringString() throws Exception {
+    void testGetPseudoColumnsStringStringStringString() throws Exception {
         try {
             delegate.getPseudoColumns("foo", "foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -762,7 +762,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetResultSetHoldability() throws Exception {
+    void testGetResultSetHoldability() throws Exception {
         try {
             delegate.getResultSetHoldability();
         } catch (final SQLException e) {
@@ -772,7 +772,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetRowIdLifetime() throws Exception {
+    void testGetRowIdLifetime() throws Exception {
         try {
             delegate.getRowIdLifetime();
         } catch (final SQLException e) {
@@ -782,7 +782,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSchemas() throws Exception {
+    void testGetSchemas() throws Exception {
         try {
             delegate.getSchemas();
         } catch (final SQLException e) {
@@ -792,7 +792,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSchemasStringString() throws Exception {
+    void testGetSchemasStringString() throws Exception {
         try {
             delegate.getSchemas("foo", "foo");
         } catch (final SQLException e) {
@@ -802,7 +802,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSchemaTerm() throws Exception {
+    void testGetSchemaTerm() throws Exception {
         try {
             delegate.getSchemaTerm();
         } catch (final SQLException e) {
@@ -812,7 +812,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSearchStringEscape() throws Exception {
+    void testGetSearchStringEscape() throws Exception {
         try {
             delegate.getSearchStringEscape();
         } catch (final SQLException e) {
@@ -822,7 +822,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSQLKeywords() throws Exception {
+    void testGetSQLKeywords() throws Exception {
         try {
             delegate.getSQLKeywords();
         } catch (final SQLException e) {
@@ -832,7 +832,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSQLStateType() throws Exception {
+    void testGetSQLStateType() throws Exception {
         try {
             delegate.getSQLStateType();
         } catch (final SQLException e) {
@@ -842,7 +842,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetStringFunctions() throws Exception {
+    void testGetStringFunctions() throws Exception {
         try {
             delegate.getStringFunctions();
         } catch (final SQLException e) {
@@ -852,7 +852,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSuperTablesStringStringString() throws Exception {
+    void testGetSuperTablesStringStringString() throws Exception {
         try {
             delegate.getSuperTables("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -862,7 +862,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSuperTypesStringStringString() throws Exception {
+    void testGetSuperTypesStringStringString() throws Exception {
         try {
             delegate.getSuperTypes("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -872,7 +872,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetSystemFunctions() throws Exception {
+    void testGetSystemFunctions() throws Exception {
         try {
             delegate.getSystemFunctions();
         } catch (final SQLException e) {
@@ -882,7 +882,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetTablePrivilegesStringStringString() throws Exception {
+    void testGetTablePrivilegesStringStringString() throws Exception {
         try {
             delegate.getTablePrivileges("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -892,7 +892,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetTablesStringStringStringStringArray() throws Exception {
+    void testGetTablesStringStringStringStringArray() throws Exception {
         try {
             delegate.getTables("foo", "foo", "foo", (String[]) null);
         } catch (final SQLException e) {
@@ -902,7 +902,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetTableTypes() throws Exception {
+    void testGetTableTypes() throws Exception {
         try {
             delegate.getTableTypes();
         } catch (final SQLException e) {
@@ -912,7 +912,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetTimeDateFunctions() throws Exception {
+    void testGetTimeDateFunctions() throws Exception {
         try {
             delegate.getTimeDateFunctions();
         } catch (final SQLException e) {
@@ -922,7 +922,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetTypeInfo() throws Exception {
+    void testGetTypeInfo() throws Exception {
         try {
             delegate.getTypeInfo();
         } catch (final SQLException e) {
@@ -932,7 +932,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetUDTsStringStringStringIntegerArray() throws Exception {
+    void testGetUDTsStringStringStringIntegerArray() throws Exception {
         try {
             delegate.getUDTs("foo", "foo", "foo", (int[]) null);
         } catch (final SQLException e) {
@@ -942,7 +942,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetURL() throws Exception {
+    void testGetURL() throws Exception {
         try {
             delegate.getURL();
         } catch (final SQLException e) {
@@ -952,7 +952,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetUserName() throws Exception {
+    void testGetUserName() throws Exception {
         try {
             delegate.getUserName();
         } catch (final SQLException e) {
@@ -962,7 +962,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testGetVersionColumnsStringStringString() throws Exception {
+    void testGetVersionColumnsStringStringString() throws Exception {
         try {
             delegate.getVersionColumns("foo", "foo", "foo");
         } catch (final SQLException e) {
@@ -972,7 +972,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testInsertsAreDetectedInteger() throws Exception {
+    void testInsertsAreDetectedInteger() throws Exception {
         try {
             delegate.insertsAreDetected(1);
         } catch (final SQLException e) {
@@ -982,7 +982,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testIsCatalogAtStart() throws Exception {
+    void testIsCatalogAtStart() throws Exception {
         try {
             delegate.isCatalogAtStart();
         } catch (final SQLException e) {
@@ -992,7 +992,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testIsReadOnly() throws Exception {
+    void testIsReadOnly() throws Exception {
         try {
             delegate.isReadOnly();
         } catch (final SQLException e) {
@@ -1002,7 +1002,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testLocatorsUpdateCopy() throws Exception {
+    void testLocatorsUpdateCopy() throws Exception {
         try {
             delegate.locatorsUpdateCopy();
         } catch (final SQLException e) {
@@ -1012,13 +1012,13 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testNullArguments() throws Exception {
+    void testNullArguments() throws Exception {
         assertThrows(NullPointerException.class, () -> new DelegatingDatabaseMetaData(null, null));
         assertThrows(NullPointerException.class, () -> new DelegatingDatabaseMetaData(new DelegatingConnection(null), null));
     }
 
     @Test
-    public void testNullPlusNonNullIsNull() throws Exception {
+    void testNullPlusNonNullIsNull() throws Exception {
         try {
             delegate.nullPlusNonNullIsNull();
         } catch (final SQLException e) {
@@ -1028,7 +1028,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testNullsAreSortedAtEnd() throws Exception {
+    void testNullsAreSortedAtEnd() throws Exception {
         try {
             delegate.nullsAreSortedAtEnd();
         } catch (final SQLException e) {
@@ -1038,7 +1038,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testNullsAreSortedAtStart() throws Exception {
+    void testNullsAreSortedAtStart() throws Exception {
         try {
             delegate.nullsAreSortedAtStart();
         } catch (final SQLException e) {
@@ -1048,7 +1048,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testNullsAreSortedHigh() throws Exception {
+    void testNullsAreSortedHigh() throws Exception {
         try {
             delegate.nullsAreSortedHigh();
         } catch (final SQLException e) {
@@ -1058,7 +1058,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testNullsAreSortedLow() throws Exception {
+    void testNullsAreSortedLow() throws Exception {
         try {
             delegate.nullsAreSortedLow();
         } catch (final SQLException e) {
@@ -1068,7 +1068,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testOthersDeletesAreVisibleInteger() throws Exception {
+    void testOthersDeletesAreVisibleInteger() throws Exception {
         try {
             delegate.othersDeletesAreVisible(1);
         } catch (final SQLException e) {
@@ -1078,7 +1078,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testOthersInsertsAreVisibleInteger() throws Exception {
+    void testOthersInsertsAreVisibleInteger() throws Exception {
         try {
             delegate.othersInsertsAreVisible(1);
         } catch (final SQLException e) {
@@ -1088,7 +1088,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testOthersUpdatesAreVisibleInteger() throws Exception {
+    void testOthersUpdatesAreVisibleInteger() throws Exception {
         try {
             delegate.othersUpdatesAreVisible(1);
         } catch (final SQLException e) {
@@ -1098,7 +1098,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testOwnDeletesAreVisibleInteger() throws Exception {
+    void testOwnDeletesAreVisibleInteger() throws Exception {
         try {
             delegate.ownDeletesAreVisible(1);
         } catch (final SQLException e) {
@@ -1108,7 +1108,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testOwnInsertsAreVisibleInteger() throws Exception {
+    void testOwnInsertsAreVisibleInteger() throws Exception {
         try {
             delegate.ownInsertsAreVisible(1);
         } catch (final SQLException e) {
@@ -1118,7 +1118,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testOwnUpdatesAreVisibleInteger() throws Exception {
+    void testOwnUpdatesAreVisibleInteger() throws Exception {
         try {
             delegate.ownUpdatesAreVisible(1);
         } catch (final SQLException e) {
@@ -1128,7 +1128,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testStoresLowerCaseIdentifiers() throws Exception {
+    void testStoresLowerCaseIdentifiers() throws Exception {
         try {
             delegate.storesLowerCaseIdentifiers();
         } catch (final SQLException e) {
@@ -1138,7 +1138,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testStoresLowerCaseQuotedIdentifiers() throws Exception {
+    void testStoresLowerCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.storesLowerCaseQuotedIdentifiers();
         } catch (final SQLException e) {
@@ -1148,7 +1148,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testStoresMixedCaseIdentifiers() throws Exception {
+    void testStoresMixedCaseIdentifiers() throws Exception {
         try {
             delegate.storesMixedCaseIdentifiers();
         } catch (final SQLException e) {
@@ -1158,7 +1158,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testStoresMixedCaseQuotedIdentifiers() throws Exception {
+    void testStoresMixedCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.storesMixedCaseQuotedIdentifiers();
         } catch (final SQLException e) {
@@ -1168,7 +1168,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testStoresUpperCaseIdentifiers() throws Exception {
+    void testStoresUpperCaseIdentifiers() throws Exception {
         try {
             delegate.storesUpperCaseIdentifiers();
         } catch (final SQLException e) {
@@ -1178,7 +1178,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testStoresUpperCaseQuotedIdentifiers() throws Exception {
+    void testStoresUpperCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.storesUpperCaseQuotedIdentifiers();
         } catch (final SQLException e) {
@@ -1188,7 +1188,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsAlterTableWithAddColumn() throws Exception {
+    void testSupportsAlterTableWithAddColumn() throws Exception {
         try {
             delegate.supportsAlterTableWithAddColumn();
         } catch (final SQLException e) {
@@ -1198,7 +1198,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsAlterTableWithDropColumn() throws Exception {
+    void testSupportsAlterTableWithDropColumn() throws Exception {
         try {
             delegate.supportsAlterTableWithDropColumn();
         } catch (final SQLException e) {
@@ -1208,7 +1208,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsANSI92EntryLevelSQL() throws Exception {
+    void testSupportsANSI92EntryLevelSQL() throws Exception {
         try {
             delegate.supportsANSI92EntryLevelSQL();
         } catch (final SQLException e) {
@@ -1218,7 +1218,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsANSI92FullSQL() throws Exception {
+    void testSupportsANSI92FullSQL() throws Exception {
         try {
             delegate.supportsANSI92FullSQL();
         } catch (final SQLException e) {
@@ -1228,7 +1228,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsANSI92IntermediateSQL() throws Exception {
+    void testSupportsANSI92IntermediateSQL() throws Exception {
         try {
             delegate.supportsANSI92IntermediateSQL();
         } catch (final SQLException e) {
@@ -1238,7 +1238,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsBatchUpdates() throws Exception {
+    void testSupportsBatchUpdates() throws Exception {
         try {
             delegate.supportsBatchUpdates();
         } catch (final SQLException e) {
@@ -1248,7 +1248,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCatalogsInDataManipulation() throws Exception {
+    void testSupportsCatalogsInDataManipulation() throws Exception {
         try {
             delegate.supportsCatalogsInDataManipulation();
         } catch (final SQLException e) {
@@ -1258,7 +1258,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCatalogsInIndexDefinitions() throws Exception {
+    void testSupportsCatalogsInIndexDefinitions() throws Exception {
         try {
             delegate.supportsCatalogsInIndexDefinitions();
         } catch (final SQLException e) {
@@ -1268,7 +1268,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCatalogsInPrivilegeDefinitions() throws Exception {
+    void testSupportsCatalogsInPrivilegeDefinitions() throws Exception {
         try {
             delegate.supportsCatalogsInPrivilegeDefinitions();
         } catch (final SQLException e) {
@@ -1278,7 +1278,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCatalogsInProcedureCalls() throws Exception {
+    void testSupportsCatalogsInProcedureCalls() throws Exception {
         try {
             delegate.supportsCatalogsInProcedureCalls();
         } catch (final SQLException e) {
@@ -1288,7 +1288,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCatalogsInTableDefinitions() throws Exception {
+    void testSupportsCatalogsInTableDefinitions() throws Exception {
         try {
             delegate.supportsCatalogsInTableDefinitions();
         } catch (final SQLException e) {
@@ -1298,7 +1298,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsColumnAliasing() throws Exception {
+    void testSupportsColumnAliasing() throws Exception {
         try {
             delegate.supportsColumnAliasing();
         } catch (final SQLException e) {
@@ -1308,7 +1308,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsConvert() throws Exception {
+    void testSupportsConvert() throws Exception {
         try {
             delegate.supportsConvert();
         } catch (final SQLException e) {
@@ -1318,7 +1318,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsConvertIntegerInteger() throws Exception {
+    void testSupportsConvertIntegerInteger() throws Exception {
         try {
             delegate.supportsConvert(1, 1);
         } catch (final SQLException e) {
@@ -1328,7 +1328,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCoreSQLGrammar() throws Exception {
+    void testSupportsCoreSQLGrammar() throws Exception {
         try {
             delegate.supportsCoreSQLGrammar();
         } catch (final SQLException e) {
@@ -1338,7 +1338,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsCorrelatedSubqueries() throws Exception {
+    void testSupportsCorrelatedSubqueries() throws Exception {
         try {
             delegate.supportsCorrelatedSubqueries();
         } catch (final SQLException e) {
@@ -1348,7 +1348,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsDataDefinitionAndDataManipulationTransactions() throws Exception {
+    void testSupportsDataDefinitionAndDataManipulationTransactions() throws Exception {
         try {
             delegate.supportsDataDefinitionAndDataManipulationTransactions();
         } catch (final SQLException e) {
@@ -1358,7 +1358,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsDataManipulationTransactionsOnly() throws Exception {
+    void testSupportsDataManipulationTransactionsOnly() throws Exception {
         try {
             delegate.supportsDataManipulationTransactionsOnly();
         } catch (final SQLException e) {
@@ -1368,7 +1368,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsDifferentTableCorrelationNames() throws Exception {
+    void testSupportsDifferentTableCorrelationNames() throws Exception {
         try {
             delegate.supportsDifferentTableCorrelationNames();
         } catch (final SQLException e) {
@@ -1378,7 +1378,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsExpressionsInOrderBy() throws Exception {
+    void testSupportsExpressionsInOrderBy() throws Exception {
         try {
             delegate.supportsExpressionsInOrderBy();
         } catch (final SQLException e) {
@@ -1388,7 +1388,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsExtendedSQLGrammar() throws Exception {
+    void testSupportsExtendedSQLGrammar() throws Exception {
         try {
             delegate.supportsExtendedSQLGrammar();
         } catch (final SQLException e) {
@@ -1398,7 +1398,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsFullOuterJoins() throws Exception {
+    void testSupportsFullOuterJoins() throws Exception {
         try {
             delegate.supportsFullOuterJoins();
         } catch (final SQLException e) {
@@ -1408,7 +1408,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsGetGeneratedKeys() throws Exception {
+    void testSupportsGetGeneratedKeys() throws Exception {
         try {
             delegate.supportsGetGeneratedKeys();
         } catch (final SQLException e) {
@@ -1418,7 +1418,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsGroupBy() throws Exception {
+    void testSupportsGroupBy() throws Exception {
         try {
             delegate.supportsGroupBy();
         } catch (final SQLException e) {
@@ -1428,7 +1428,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsGroupByBeyondSelect() throws Exception {
+    void testSupportsGroupByBeyondSelect() throws Exception {
         try {
             delegate.supportsGroupByBeyondSelect();
         } catch (final SQLException e) {
@@ -1438,7 +1438,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsGroupByUnrelated() throws Exception {
+    void testSupportsGroupByUnrelated() throws Exception {
         try {
             delegate.supportsGroupByUnrelated();
         } catch (final SQLException e) {
@@ -1448,7 +1448,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsIntegrityEnhancementFacility() throws Exception {
+    void testSupportsIntegrityEnhancementFacility() throws Exception {
         try {
             delegate.supportsIntegrityEnhancementFacility();
         } catch (final SQLException e) {
@@ -1458,7 +1458,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsLikeEscapeClause() throws Exception {
+    void testSupportsLikeEscapeClause() throws Exception {
         try {
             delegate.supportsLikeEscapeClause();
         } catch (final SQLException e) {
@@ -1468,7 +1468,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsLimitedOuterJoins() throws Exception {
+    void testSupportsLimitedOuterJoins() throws Exception {
         try {
             delegate.supportsLimitedOuterJoins();
         } catch (final SQLException e) {
@@ -1478,7 +1478,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsMinimumSQLGrammar() throws Exception {
+    void testSupportsMinimumSQLGrammar() throws Exception {
         try {
             delegate.supportsMinimumSQLGrammar();
         } catch (final SQLException e) {
@@ -1488,7 +1488,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsMixedCaseIdentifiers() throws Exception {
+    void testSupportsMixedCaseIdentifiers() throws Exception {
         try {
             delegate.supportsMixedCaseIdentifiers();
         } catch (final SQLException e) {
@@ -1498,7 +1498,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsMixedCaseQuotedIdentifiers() throws Exception {
+    void testSupportsMixedCaseQuotedIdentifiers() throws Exception {
         try {
             delegate.supportsMixedCaseQuotedIdentifiers();
         } catch (final SQLException e) {
@@ -1508,7 +1508,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsMultipleOpenResults() throws Exception {
+    void testSupportsMultipleOpenResults() throws Exception {
         try {
             delegate.supportsMultipleOpenResults();
         } catch (final SQLException e) {
@@ -1518,7 +1518,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsMultipleResultSets() throws Exception {
+    void testSupportsMultipleResultSets() throws Exception {
         try {
             delegate.supportsMultipleResultSets();
         } catch (final SQLException e) {
@@ -1528,7 +1528,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsMultipleTransactions() throws Exception {
+    void testSupportsMultipleTransactions() throws Exception {
         try {
             delegate.supportsMultipleTransactions();
         } catch (final SQLException e) {
@@ -1538,7 +1538,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsNamedParameters() throws Exception {
+    void testSupportsNamedParameters() throws Exception {
         try {
             delegate.supportsNamedParameters();
         } catch (final SQLException e) {
@@ -1548,7 +1548,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsNonNullableColumns() throws Exception {
+    void testSupportsNonNullableColumns() throws Exception {
         try {
             delegate.supportsNonNullableColumns();
         } catch (final SQLException e) {
@@ -1558,7 +1558,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsOpenCursorsAcrossCommit() throws Exception {
+    void testSupportsOpenCursorsAcrossCommit() throws Exception {
         try {
             delegate.supportsOpenCursorsAcrossCommit();
         } catch (final SQLException e) {
@@ -1568,7 +1568,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsOpenCursorsAcrossRollback() throws Exception {
+    void testSupportsOpenCursorsAcrossRollback() throws Exception {
         try {
             delegate.supportsOpenCursorsAcrossRollback();
         } catch (final SQLException e) {
@@ -1578,7 +1578,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsOpenStatementsAcrossCommit() throws Exception {
+    void testSupportsOpenStatementsAcrossCommit() throws Exception {
         try {
             delegate.supportsOpenStatementsAcrossCommit();
         } catch (final SQLException e) {
@@ -1588,7 +1588,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsOpenStatementsAcrossRollback() throws Exception {
+    void testSupportsOpenStatementsAcrossRollback() throws Exception {
         try {
             delegate.supportsOpenStatementsAcrossRollback();
         } catch (final SQLException e) {
@@ -1598,7 +1598,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsOrderByUnrelated() throws Exception {
+    void testSupportsOrderByUnrelated() throws Exception {
         try {
             delegate.supportsOrderByUnrelated();
         } catch (final SQLException e) {
@@ -1608,7 +1608,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsOuterJoins() throws Exception {
+    void testSupportsOuterJoins() throws Exception {
         try {
             delegate.supportsOuterJoins();
         } catch (final SQLException e) {
@@ -1618,7 +1618,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsPositionedDelete() throws Exception {
+    void testSupportsPositionedDelete() throws Exception {
         try {
             delegate.supportsPositionedDelete();
         } catch (final SQLException e) {
@@ -1628,7 +1628,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsPositionedUpdate() throws Exception {
+    void testSupportsPositionedUpdate() throws Exception {
         try {
             delegate.supportsPositionedUpdate();
         } catch (final SQLException e) {
@@ -1638,7 +1638,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsRefCursors() throws Exception {
+    void testSupportsRefCursors() throws Exception {
         try {
             delegate.supportsRefCursors();
         } catch (final SQLException e) {
@@ -1648,7 +1648,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsResultSetConcurrencyIntegerInteger() throws Exception {
+    void testSupportsResultSetConcurrencyIntegerInteger() throws Exception {
         try {
             delegate.supportsResultSetConcurrency(1, 1);
         } catch (final SQLException e) {
@@ -1658,7 +1658,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsResultSetHoldabilityInteger() throws Exception {
+    void testSupportsResultSetHoldabilityInteger() throws Exception {
         try {
             delegate.supportsResultSetHoldability(1);
         } catch (final SQLException e) {
@@ -1668,7 +1668,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsResultSetTypeInteger() throws Exception {
+    void testSupportsResultSetTypeInteger() throws Exception {
         try {
             delegate.supportsResultSetType(1);
         } catch (final SQLException e) {
@@ -1678,7 +1678,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSavepoints() throws Exception {
+    void testSupportsSavepoints() throws Exception {
         try {
             delegate.supportsSavepoints();
         } catch (final SQLException e) {
@@ -1688,7 +1688,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSchemasInDataManipulation() throws Exception {
+    void testSupportsSchemasInDataManipulation() throws Exception {
         try {
             delegate.supportsSchemasInDataManipulation();
         } catch (final SQLException e) {
@@ -1698,7 +1698,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSchemasInIndexDefinitions() throws Exception {
+    void testSupportsSchemasInIndexDefinitions() throws Exception {
         try {
             delegate.supportsSchemasInIndexDefinitions();
         } catch (final SQLException e) {
@@ -1708,7 +1708,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSchemasInPrivilegeDefinitions() throws Exception {
+    void testSupportsSchemasInPrivilegeDefinitions() throws Exception {
         try {
             delegate.supportsSchemasInPrivilegeDefinitions();
         } catch (final SQLException e) {
@@ -1718,7 +1718,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSchemasInProcedureCalls() throws Exception {
+    void testSupportsSchemasInProcedureCalls() throws Exception {
         try {
             delegate.supportsSchemasInProcedureCalls();
         } catch (final SQLException e) {
@@ -1728,7 +1728,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSchemasInTableDefinitions() throws Exception {
+    void testSupportsSchemasInTableDefinitions() throws Exception {
         try {
             delegate.supportsSchemasInTableDefinitions();
         } catch (final SQLException e) {
@@ -1738,7 +1738,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSelectForUpdate() throws Exception {
+    void testSupportsSelectForUpdate() throws Exception {
         try {
             delegate.supportsSelectForUpdate();
         } catch (final SQLException e) {
@@ -1748,7 +1748,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsStatementPooling() throws Exception {
+    void testSupportsStatementPooling() throws Exception {
         try {
             delegate.supportsStatementPooling();
         } catch (final SQLException e) {
@@ -1758,7 +1758,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsStoredFunctionsUsingCallSyntax() throws Exception {
+    void testSupportsStoredFunctionsUsingCallSyntax() throws Exception {
         try {
             delegate.supportsStoredFunctionsUsingCallSyntax();
         } catch (final SQLException e) {
@@ -1768,7 +1768,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsStoredProcedures() throws Exception {
+    void testSupportsStoredProcedures() throws Exception {
         try {
             delegate.supportsStoredProcedures();
         } catch (final SQLException e) {
@@ -1778,7 +1778,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSubqueriesInComparisons() throws Exception {
+    void testSupportsSubqueriesInComparisons() throws Exception {
         try {
             delegate.supportsSubqueriesInComparisons();
         } catch (final SQLException e) {
@@ -1788,7 +1788,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSubqueriesInExists() throws Exception {
+    void testSupportsSubqueriesInExists() throws Exception {
         try {
             delegate.supportsSubqueriesInExists();
         } catch (final SQLException e) {
@@ -1798,7 +1798,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSubqueriesInIns() throws Exception {
+    void testSupportsSubqueriesInIns() throws Exception {
         try {
             delegate.supportsSubqueriesInIns();
         } catch (final SQLException e) {
@@ -1808,7 +1808,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsSubqueriesInQuantifieds() throws Exception {
+    void testSupportsSubqueriesInQuantifieds() throws Exception {
         try {
             delegate.supportsSubqueriesInQuantifieds();
         } catch (final SQLException e) {
@@ -1818,7 +1818,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsTableCorrelationNames() throws Exception {
+    void testSupportsTableCorrelationNames() throws Exception {
         try {
             delegate.supportsTableCorrelationNames();
         } catch (final SQLException e) {
@@ -1828,7 +1828,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsTransactionIsolationLevelInteger() throws Exception {
+    void testSupportsTransactionIsolationLevelInteger() throws Exception {
         try {
             delegate.supportsTransactionIsolationLevel(1);
         } catch (final SQLException e) {
@@ -1838,7 +1838,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsTransactions() throws Exception {
+    void testSupportsTransactions() throws Exception {
         try {
             delegate.supportsTransactions();
         } catch (final SQLException e) {
@@ -1848,7 +1848,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsUnion() throws Exception {
+    void testSupportsUnion() throws Exception {
         try {
             delegate.supportsUnion();
         } catch (final SQLException e) {
@@ -1858,7 +1858,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testSupportsUnionAll() throws Exception {
+    void testSupportsUnionAll() throws Exception {
         try {
             delegate.supportsUnionAll();
         } catch (final SQLException e) {
@@ -1868,7 +1868,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testUpdatesAreDetectedInteger() throws Exception {
+    void testUpdatesAreDetectedInteger() throws Exception {
         try {
             delegate.updatesAreDetected(1);
         } catch (final SQLException e) {
@@ -1878,7 +1878,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testUsesLocalFilePerTable() throws Exception {
+    void testUsesLocalFilePerTable() throws Exception {
         try {
             delegate.usesLocalFilePerTable();
         } catch (final SQLException e) {
@@ -1888,7 +1888,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testUsesLocalFiles() throws Exception {
+    void testUsesLocalFiles() throws Exception {
         try {
             delegate.usesLocalFiles();
         } catch (final SQLException e) {
@@ -1898,7 +1898,7 @@ public class TestDelegatingDatabaseMetaData {
     }
 
     @Test
-    public void testWrap() throws SQLException {
+    void testWrap() throws SQLException {
         assertEquals(delegate, delegate.unwrap(DatabaseMetaData.class));
         assertEquals(delegate, delegate.unwrap(DelegatingDatabaseMetaData.class));
         assertEquals(obj, delegate.unwrap(obj.getClass()));
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
index 1d48f880..69c6b094 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
@@ -47,7 +47,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testAddBatch() throws Exception {
+    void testAddBatch() throws Exception {
         try {
             delegate.addBatch();
         } catch (final SQLException e) {
@@ -56,7 +56,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testClearParameters() throws Exception {
+    void testClearParameters() throws Exception {
         try {
             delegate.clearParameters();
         } catch (final SQLException e) {
@@ -65,7 +65,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testExecute() throws Exception {
+    void testExecute() throws Exception {
         try {
             delegate.execute();
         } catch (final SQLException e) {
@@ -74,7 +74,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testExecuteLargeUpdate() throws Exception {
+    void testExecuteLargeUpdate() throws Exception {
         try {
             delegate.executeLargeUpdate();
         } catch (final SQLException e) {
@@ -83,7 +83,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testExecuteQuery() throws Exception {
+    void testExecuteQuery() throws Exception {
         try {
             delegate.executeQuery();
         } catch (final SQLException e) {
@@ -92,21 +92,21 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testExecuteQueryReturnsNotNull() throws Exception {
+    void testExecuteQueryReturnsNotNull() throws Exception {
         obj = new TesterPreparedStatement(testerConn, "select * from foo");
         delegate = new DelegatingPreparedStatement(connection, obj);
         assertNotNull(delegate.executeQuery());
     }
 
     @Test
-    public void testExecuteQueryReturnsNull() throws Exception {
+    void testExecuteQueryReturnsNull() throws Exception {
         obj = new TesterPreparedStatement(testerConn, "null");
         delegate = new DelegatingPreparedStatement(connection, obj);
         assertNull(delegate.executeQuery());
     }
 
     @Test
-    public void testExecuteUpdate() throws Exception {
+    void testExecuteUpdate() throws Exception {
         try {
             delegate.executeUpdate();
         } catch (final SQLException e) {
@@ -115,14 +115,14 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testGetDelegate() throws Exception {
+    void testGetDelegate() throws Exception {
         obj = new TesterPreparedStatement(testerConn, "select * from foo");
         delegate = new DelegatingPreparedStatement(connection, obj);
         assertEquals(obj, delegate.getDelegate());
     }
 
     @Test
-    public void testGetMetaData() throws Exception {
+    void testGetMetaData() throws Exception {
         try {
             delegate.getMetaData();
         } catch (final SQLException e) {
@@ -131,7 +131,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testGetParameterMetaData() throws Exception {
+    void testGetParameterMetaData() throws Exception {
         try {
             delegate.getParameterMetaData();
         } catch (final SQLException e) {
@@ -140,7 +140,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetArrayIntegerArray() throws Exception {
+    void testSetArrayIntegerArray() throws Exception {
         try {
             delegate.setArray(1, (java.sql.Array) null);
         } catch (final SQLException e) {
@@ -149,7 +149,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetAsciiStreamIntegerInputStream() throws Exception {
+    void testSetAsciiStreamIntegerInputStream() throws Exception {
         try {
             delegate.setAsciiStream(1, (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -158,7 +158,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetAsciiStreamIntegerInputStreamInteger() throws Exception {
+    void testSetAsciiStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.setAsciiStream(1, (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -167,7 +167,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetAsciiStreamIntegerInputStreamLong() throws Exception {
+    void testSetAsciiStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.setAsciiStream(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -176,7 +176,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBigDecimalIntegerBigDecimal() throws Exception {
+    void testSetBigDecimalIntegerBigDecimal() throws Exception {
         try {
             delegate.setBigDecimal(1, java.math.BigDecimal.valueOf(1.0d));
         } catch (final SQLException e) {
@@ -185,7 +185,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBinaryStreamIntegerInputStream() throws Exception {
+    void testSetBinaryStreamIntegerInputStream() throws Exception {
         try {
             delegate.setBinaryStream(1, (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -194,7 +194,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBinaryStreamIntegerInputStreamInteger() throws Exception {
+    void testSetBinaryStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.setBinaryStream(1, (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -203,7 +203,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBinaryStreamIntegerInputStreamLong() throws Exception {
+    void testSetBinaryStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.setBinaryStream(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -212,7 +212,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBlobIntegerBlob() throws Exception {
+    void testSetBlobIntegerBlob() throws Exception {
         try {
             delegate.setBlob(1, (java.sql.Blob) null);
         } catch (final SQLException e) {
@@ -221,7 +221,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBlobIntegerInputStream() throws Exception {
+    void testSetBlobIntegerInputStream() throws Exception {
         try {
             delegate.setBlob(1, (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -230,7 +230,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBlobIntegerInputStreamLong() throws Exception {
+    void testSetBlobIntegerInputStreamLong() throws Exception {
         try {
             delegate.setBlob(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -239,7 +239,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBooleanIntegerBoolean() throws Exception {
+    void testSetBooleanIntegerBoolean() throws Exception {
         try {
             delegate.setBoolean(1, Boolean.TRUE);
         } catch (final SQLException e) {
@@ -248,7 +248,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetByteIntegerByte() throws Exception {
+    void testSetByteIntegerByte() throws Exception {
         try {
             delegate.setByte(1, (byte) 1);
         } catch (final SQLException e) {
@@ -257,7 +257,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetBytesIntegerByteArray() throws Exception {
+    void testSetBytesIntegerByteArray() throws Exception {
         try {
             delegate.setBytes(1, new byte[] { 1 });
         } catch (final SQLException e) {
@@ -266,7 +266,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetCharacterStreamIntegerReader() throws Exception {
+    void testSetCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.setCharacterStream(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -275,7 +275,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetCharacterStreamIntegerReaderInteger() throws Exception {
+    void testSetCharacterStreamIntegerReaderInteger() throws Exception {
         try {
             delegate.setCharacterStream(1, (java.io.StringReader) null, 1);
         } catch (final SQLException e) {
@@ -284,7 +284,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetCharacterStreamIntegerReaderLong() throws Exception {
+    void testSetCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.setCharacterStream(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -293,7 +293,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetClobIntegerClob() throws Exception {
+    void testSetClobIntegerClob() throws Exception {
         try {
             delegate.setClob(1, (java.sql.Clob) null);
         } catch (final SQLException e) {
@@ -302,7 +302,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetClobIntegerReader() throws Exception {
+    void testSetClobIntegerReader() throws Exception {
         try {
             delegate.setClob(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -311,7 +311,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetClobIntegerReaderLong() throws Exception {
+    void testSetClobIntegerReaderLong() throws Exception {
         try {
             delegate.setClob(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -320,7 +320,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetDateIntegerSqlDate() throws Exception {
+    void testSetDateIntegerSqlDate() throws Exception {
         try {
             delegate.setDate(1, new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
@@ -329,7 +329,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetDateIntegerSqlDateCalendar() throws Exception {
+    void testSetDateIntegerSqlDateCalendar() throws Exception {
         try {
             delegate.setDate(1, new java.sql.Date(1529827548745L), (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -338,7 +338,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetDoubleIntegerDouble() throws Exception {
+    void testSetDoubleIntegerDouble() throws Exception {
         try {
             delegate.setDouble(1, 1.0d);
         } catch (final SQLException e) {
@@ -347,7 +347,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetFloatIntegerFloat() throws Exception {
+    void testSetFloatIntegerFloat() throws Exception {
         try {
             delegate.setFloat(1, 1.0f);
         } catch (final SQLException e) {
@@ -356,7 +356,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetIntIntegerInteger() throws Exception {
+    void testSetIntIntegerInteger() throws Exception {
         try {
             delegate.setInt(1, 1);
         } catch (final SQLException e) {
@@ -365,7 +365,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetLongIntegerLong() throws Exception {
+    void testSetLongIntegerLong() throws Exception {
         try {
             delegate.setLong(1, 1L);
         } catch (final SQLException e) {
@@ -374,7 +374,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNCharacterStreamIntegerReader() throws Exception {
+    void testSetNCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.setNCharacterStream(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -383,7 +383,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNCharacterStreamIntegerReaderLong() throws Exception {
+    void testSetNCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.setNCharacterStream(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -392,7 +392,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNClobIntegerNClob() throws Exception {
+    void testSetNClobIntegerNClob() throws Exception {
         try {
             delegate.setNClob(1, (java.sql.NClob) null);
         } catch (final SQLException e) {
@@ -401,7 +401,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNClobIntegerReader() throws Exception {
+    void testSetNClobIntegerReader() throws Exception {
         try {
             delegate.setNClob(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -410,7 +410,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNClobIntegerReaderLong() throws Exception {
+    void testSetNClobIntegerReaderLong() throws Exception {
         try {
             delegate.setNClob(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -419,7 +419,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNStringIntegerString() throws Exception {
+    void testSetNStringIntegerString() throws Exception {
         try {
             delegate.setNString(1, "foo");
         } catch (final SQLException e) {
@@ -428,7 +428,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNullIntegerInteger() throws Exception {
+    void testSetNullIntegerInteger() throws Exception {
         try {
             delegate.setNull(1, 1);
         } catch (final SQLException e) {
@@ -437,7 +437,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetNullIntegerIntegerString() throws Exception {
+    void testSetNullIntegerIntegerString() throws Exception {
         try {
             delegate.setNull(1, 1, "foo");
         } catch (final SQLException e) {
@@ -446,7 +446,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetObjectIntegerObject() throws Exception {
+    void testSetObjectIntegerObject() throws Exception {
         try {
             delegate.setObject(1, System.err);
         } catch (final SQLException e) {
@@ -455,7 +455,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetObjectIntegerObjectInteger() throws Exception {
+    void testSetObjectIntegerObjectInteger() throws Exception {
         try {
             delegate.setObject(1, System.err, 1);
         } catch (final SQLException e) {
@@ -464,7 +464,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetObjectIntegerObjectIntegerInteger() throws Exception {
+    void testSetObjectIntegerObjectIntegerInteger() throws Exception {
         try {
             delegate.setObject(1, System.err, 1, 1);
         } catch (final SQLException e) {
@@ -473,7 +473,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetObjectIntegerObjectSQLType() throws Exception {
+    void testSetObjectIntegerObjectSQLType() throws Exception {
         try {
             delegate.setObject(1, System.err, (java.sql.SQLType) null);
         } catch (final SQLException e) {
@@ -482,7 +482,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetObjectIntegerObjectSQLTypeInteger() throws Exception {
+    void testSetObjectIntegerObjectSQLTypeInteger() throws Exception {
         try {
             delegate.setObject(1, System.err, (java.sql.SQLType) null, 1);
         } catch (final SQLException e) {
@@ -491,7 +491,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetRefIntegerRef() throws Exception {
+    void testSetRefIntegerRef() throws Exception {
         try {
             delegate.setRef(1, (java.sql.Ref) null);
         } catch (final SQLException e) {
@@ -500,7 +500,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetRowIdIntegerRowId() throws Exception {
+    void testSetRowIdIntegerRowId() throws Exception {
         try {
             delegate.setRowId(1, (java.sql.RowId) null);
         } catch (final SQLException e) {
@@ -509,7 +509,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetShortIntegerShort() throws Exception {
+    void testSetShortIntegerShort() throws Exception {
         try {
             delegate.setShort(1, (short) 1);
         } catch (final SQLException e) {
@@ -518,7 +518,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetSQLXMLIntegerSQLXML() throws Exception {
+    void testSetSQLXMLIntegerSQLXML() throws Exception {
         try {
             delegate.setSQLXML(1, (java.sql.SQLXML) null);
         } catch (final SQLException e) {
@@ -527,7 +527,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetStringIntegerString() throws Exception {
+    void testSetStringIntegerString() throws Exception {
         try {
             delegate.setString(1, "foo");
         } catch (final SQLException e) {
@@ -536,7 +536,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetTimeIntegerTime() throws Exception {
+    void testSetTimeIntegerTime() throws Exception {
         try {
             delegate.setTime(1, (java.sql.Time) null);
         } catch (final SQLException e) {
@@ -545,7 +545,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetTimeIntegerTimeCalendar() throws Exception {
+    void testSetTimeIntegerTimeCalendar() throws Exception {
         try {
             delegate.setTime(1, (java.sql.Time) null, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -554,7 +554,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetTimestampIntegerTimestamp() throws Exception {
+    void testSetTimestampIntegerTimestamp() throws Exception {
         try {
             delegate.setTimestamp(1, (java.sql.Timestamp) null);
         } catch (final SQLException e) {
@@ -563,7 +563,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetTimestampIntegerTimestampCalendar() throws Exception {
+    void testSetTimestampIntegerTimestampCalendar() throws Exception {
         try {
             delegate.setTimestamp(1, (java.sql.Timestamp) null, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -572,7 +572,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetUnicodeStreamIntegerInputStreamInteger() throws Exception {
+    void testSetUnicodeStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.setUnicodeStream(1, (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -581,7 +581,7 @@ public class TestDelegatingPreparedStatement {
     }
 
     @Test
-    public void testSetURLIntegerUrl() throws Exception {
+    void testSetURLIntegerUrl() throws Exception {
         try {
             delegate.setURL(1, (java.net.URL) null);
         } catch (final SQLException e) {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
index 49af2c7f..56a08563 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingResultSet.java
@@ -53,7 +53,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testAbsoluteInteger() throws Exception {
+    void testAbsoluteInteger() throws Exception {
         try {
             delegate.absolute(1);
         } catch (final SQLException e) {
@@ -62,7 +62,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testAbsolutes() throws Exception {
+    void testAbsolutes() throws Exception {
         try {
             delegate.absolute(1);
         } catch (final SQLException e) {
@@ -71,7 +71,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testAfterLast() throws Exception {
+    void testAfterLast() throws Exception {
         try {
             delegate.afterLast();
         } catch (final SQLException e) {
@@ -80,7 +80,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testBeforeFirst() throws Exception {
+    void testBeforeFirst() throws Exception {
         try {
             delegate.beforeFirst();
         } catch (final SQLException e) {
@@ -89,7 +89,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testCancelRowUpdates() throws Exception {
+    void testCancelRowUpdates() throws Exception {
         try {
             delegate.cancelRowUpdates();
         } catch (final SQLException e) {
@@ -98,7 +98,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testClearWarnings() throws Exception {
+    void testClearWarnings() throws Exception {
         try {
             delegate.clearWarnings();
         } catch (final SQLException e) {
@@ -107,7 +107,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testClose() throws Exception {
+    void testClose() throws Exception {
         try {
             delegate.close();
         } catch (final SQLException e) {
@@ -116,7 +116,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testDeleteRow() throws Exception {
+    void testDeleteRow() throws Exception {
         try {
             delegate.deleteRow();
         } catch (final SQLException e) {
@@ -125,7 +125,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testFindColumnString() throws Exception {
+    void testFindColumnString() throws Exception {
         try {
             delegate.findColumn("foo");
         } catch (final SQLException e) {
@@ -134,7 +134,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testFirst() throws Exception {
+    void testFirst() throws Exception {
         try {
             delegate.first();
         } catch (final SQLException e) {
@@ -143,7 +143,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetArrayInteger() throws Exception {
+    void testGetArrayInteger() throws Exception {
         try {
             delegate.getArray(1);
         } catch (final SQLException e) {
@@ -152,7 +152,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetArrayString() throws Exception {
+    void testGetArrayString() throws Exception {
         try {
             delegate.getArray("foo");
         } catch (final SQLException e) {
@@ -161,7 +161,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetAsciiStreamInteger() throws Exception {
+    void testGetAsciiStreamInteger() throws Exception {
         try {
             delegate.getAsciiStream(1);
         } catch (final SQLException e) {
@@ -170,7 +170,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetAsciiStreamString() throws Exception {
+    void testGetAsciiStreamString() throws Exception {
         try {
             delegate.getAsciiStream("foo");
         } catch (final SQLException e) {
@@ -179,7 +179,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBigDecimalInteger() throws Exception {
+    void testGetBigDecimalInteger() throws Exception {
         try {
             delegate.getBigDecimal(1);
         } catch (final SQLException e) {
@@ -190,7 +190,7 @@ public class TestDelegatingResultSet {
     // FIXME: this appears to be a bug
     @Disabled
     @Test
-    public void testGetBigDecimalIntegerInteger() throws Exception {
+    void testGetBigDecimalIntegerInteger() throws Exception {
         try {
             delegate.getBigDecimal(1, 1);
         } catch (final SQLException e) {
@@ -199,7 +199,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBigDecimalString() throws Exception {
+    void testGetBigDecimalString() throws Exception {
         try {
             delegate.getBigDecimal("foo");
         } catch (final SQLException e) {
@@ -210,7 +210,7 @@ public class TestDelegatingResultSet {
     // FIXME: this appears to be a bug
     @Disabled
     @Test
-    public void testGetBigDecimalStringInteger() throws Exception {
+    void testGetBigDecimalStringInteger() throws Exception {
         try {
             delegate.getBigDecimal("foo", 1);
         } catch (final SQLException e) {
@@ -219,7 +219,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBinaryStreamInteger() throws Exception {
+    void testGetBinaryStreamInteger() throws Exception {
         try {
             delegate.getBinaryStream(1);
         } catch (final SQLException e) {
@@ -228,7 +228,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBinaryStreamString() throws Exception {
+    void testGetBinaryStreamString() throws Exception {
         try {
             delegate.getBinaryStream("foo");
         } catch (final SQLException e) {
@@ -237,7 +237,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBlobInteger() throws Exception {
+    void testGetBlobInteger() throws Exception {
         try {
             delegate.getBlob(1);
         } catch (final SQLException e) {
@@ -246,7 +246,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBlobString() throws Exception {
+    void testGetBlobString() throws Exception {
         try {
             delegate.getBlob("foo");
         } catch (final SQLException e) {
@@ -255,7 +255,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBooleanInteger() throws Exception {
+    void testGetBooleanInteger() throws Exception {
         try {
             delegate.getBoolean(1);
         } catch (final SQLException e) {
@@ -264,7 +264,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBooleanString() throws Exception {
+    void testGetBooleanString() throws Exception {
         try {
             delegate.getBoolean("foo");
         } catch (final SQLException e) {
@@ -273,7 +273,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetByteInteger() throws Exception {
+    void testGetByteInteger() throws Exception {
         try {
             delegate.getByte(1);
         } catch (final SQLException e) {
@@ -282,7 +282,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBytesInteger() throws Exception {
+    void testGetBytesInteger() throws Exception {
         try {
             delegate.getBytes(1);
         } catch (final SQLException e) {
@@ -291,7 +291,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetBytesString() throws Exception {
+    void testGetBytesString() throws Exception {
         try {
             delegate.getBytes("foo");
         } catch (final SQLException e) {
@@ -300,7 +300,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetByteString() throws Exception {
+    void testGetByteString() throws Exception {
         try {
             delegate.getByte("foo");
         } catch (final SQLException e) {
@@ -309,7 +309,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetCharacterStreamInteger() throws Exception {
+    void testGetCharacterStreamInteger() throws Exception {
         try {
             delegate.getCharacterStream(1);
         } catch (final SQLException e) {
@@ -318,7 +318,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetCharacterStreamString() throws Exception {
+    void testGetCharacterStreamString() throws Exception {
         try {
             delegate.getCharacterStream("foo");
         } catch (final SQLException e) {
@@ -327,7 +327,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetClobInteger() throws Exception {
+    void testGetClobInteger() throws Exception {
         try {
             delegate.getClob(1);
         } catch (final SQLException e) {
@@ -336,7 +336,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetClobString() throws Exception {
+    void testGetClobString() throws Exception {
         try {
             delegate.getClob("foo");
         } catch (final SQLException e) {
@@ -345,7 +345,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetConcurrency() throws Exception {
+    void testGetConcurrency() throws Exception {
         try {
             delegate.getConcurrency();
         } catch (final SQLException e) {
@@ -354,7 +354,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetCursorName() throws Exception {
+    void testGetCursorName() throws Exception {
         try {
             delegate.getCursorName();
         } catch (final SQLException e) {
@@ -363,7 +363,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetDateInteger() throws Exception {
+    void testGetDateInteger() throws Exception {
         try {
             delegate.getDate(1);
         } catch (final SQLException e) {
@@ -372,7 +372,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetDateIntegerCalendar() throws Exception {
+    void testGetDateIntegerCalendar() throws Exception {
         try {
             delegate.getDate(1, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -381,7 +381,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetDateString() throws Exception {
+    void testGetDateString() throws Exception {
         try {
             delegate.getDate("foo");
         } catch (final SQLException e) {
@@ -390,7 +390,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetDateStringCalendar() throws Exception {
+    void testGetDateStringCalendar() throws Exception {
         try {
             delegate.getDate("foo", (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -399,7 +399,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetDoubleInteger() throws Exception {
+    void testGetDoubleInteger() throws Exception {
         try {
             delegate.getDouble(1);
         } catch (final SQLException e) {
@@ -408,7 +408,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetDoubleString() throws Exception {
+    void testGetDoubleString() throws Exception {
         try {
             delegate.getDouble("foo");
         } catch (final SQLException e) {
@@ -417,7 +417,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetFetchDirection() throws Exception {
+    void testGetFetchDirection() throws Exception {
         try {
             delegate.getFetchDirection();
         } catch (final SQLException e) {
@@ -426,7 +426,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetFetchSize() throws Exception {
+    void testGetFetchSize() throws Exception {
         try {
             delegate.getFetchSize();
         } catch (final SQLException e) {
@@ -435,7 +435,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetFloatInteger() throws Exception {
+    void testGetFloatInteger() throws Exception {
         try {
             delegate.getFloat(1);
         } catch (final SQLException e) {
@@ -444,7 +444,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetFloatString() throws Exception {
+    void testGetFloatString() throws Exception {
         try {
             delegate.getFloat("foo");
         } catch (final SQLException e) {
@@ -453,7 +453,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetHoldability() throws Exception {
+    void testGetHoldability() throws Exception {
         try {
             delegate.getHoldability();
         } catch (final SQLException e) {
@@ -462,7 +462,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetIntInteger() throws Exception {
+    void testGetIntInteger() throws Exception {
         try {
             delegate.getInt(1);
         } catch (final SQLException e) {
@@ -471,7 +471,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetIntString() throws Exception {
+    void testGetIntString() throws Exception {
         try {
             delegate.getInt("foo");
         } catch (final SQLException e) {
@@ -480,7 +480,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetLongInteger() throws Exception {
+    void testGetLongInteger() throws Exception {
         try {
             delegate.getLong(1);
         } catch (final SQLException e) {
@@ -489,7 +489,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetLongString() throws Exception {
+    void testGetLongString() throws Exception {
         try {
             delegate.getLong("foo");
         } catch (final SQLException e) {
@@ -498,7 +498,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetMetaData() throws Exception {
+    void testGetMetaData() throws Exception {
         try {
             delegate.getMetaData();
         } catch (final SQLException e) {
@@ -507,7 +507,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetNCharacterStreamInteger() throws Exception {
+    void testGetNCharacterStreamInteger() throws Exception {
         try {
             delegate.getNCharacterStream(1);
         } catch (final SQLException e) {
@@ -516,7 +516,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetNCharacterStreamString() throws Exception {
+    void testGetNCharacterStreamString() throws Exception {
         try {
             delegate.getNCharacterStream("foo");
         } catch (final SQLException e) {
@@ -525,7 +525,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetNClobInteger() throws Exception {
+    void testGetNClobInteger() throws Exception {
         try {
             delegate.getNClob(1);
         } catch (final SQLException e) {
@@ -534,7 +534,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetNClobString() throws Exception {
+    void testGetNClobString() throws Exception {
         try {
             delegate.getNClob("foo");
         } catch (final SQLException e) {
@@ -543,7 +543,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetNStringInteger() throws Exception {
+    void testGetNStringInteger() throws Exception {
         try {
             delegate.getNString(1);
         } catch (final SQLException e) {
@@ -552,7 +552,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetNStringString() throws Exception {
+    void testGetNStringString() throws Exception {
         try {
             delegate.getNString("foo");
         } catch (final SQLException e) {
@@ -561,7 +561,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetObjectInteger() throws Exception {
+    void testGetObjectInteger() throws Exception {
         try {
             delegate.getObject(1);
         } catch (final SQLException e) {
@@ -570,7 +570,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetObjectIntegerClass() throws Exception {
+    void testGetObjectIntegerClass() throws Exception {
         try {
             delegate.getObject(1, Object.class);
         } catch (final SQLException e) {
@@ -579,7 +579,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetObjectIntegerMap() throws Exception {
+    void testGetObjectIntegerMap() throws Exception {
         try {
             delegate.getObject(1, (java.util.Map) null);
         } catch (final SQLException e) {
@@ -588,7 +588,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetObjectString() throws Exception {
+    void testGetObjectString() throws Exception {
         try {
             delegate.getObject("foo");
         } catch (final SQLException e) {
@@ -597,7 +597,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetObjectStringClass() throws Exception {
+    void testGetObjectStringClass() throws Exception {
         try {
             delegate.getObject("foo", Object.class);
         } catch (final SQLException e) {
@@ -606,7 +606,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetObjectStringMap() throws Exception {
+    void testGetObjectStringMap() throws Exception {
         try {
             delegate.getObject("foo", (java.util.Map) null);
         } catch (final SQLException e) {
@@ -615,7 +615,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetRefInteger() throws Exception {
+    void testGetRefInteger() throws Exception {
         try {
             delegate.getRef(1);
         } catch (final SQLException e) {
@@ -624,7 +624,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetRefString() throws Exception {
+    void testGetRefString() throws Exception {
         try {
             delegate.getRef("foo");
         } catch (final SQLException e) {
@@ -633,7 +633,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetRow() throws Exception {
+    void testGetRow() throws Exception {
         try {
             delegate.getRow();
         } catch (final SQLException e) {
@@ -642,7 +642,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetRowIdInteger() throws Exception {
+    void testGetRowIdInteger() throws Exception {
         try {
             delegate.getRowId(1);
         } catch (final SQLException e) {
@@ -651,7 +651,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetRowIdString() throws Exception {
+    void testGetRowIdString() throws Exception {
         try {
             delegate.getRowId("foo");
         } catch (final SQLException e) {
@@ -660,7 +660,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetShortInteger() throws Exception {
+    void testGetShortInteger() throws Exception {
         try {
             delegate.getShort(1);
         } catch (final SQLException e) {
@@ -669,7 +669,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetShortString() throws Exception {
+    void testGetShortString() throws Exception {
         try {
             delegate.getShort("foo");
         } catch (final SQLException e) {
@@ -678,7 +678,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetSQLXMLInteger() throws Exception {
+    void testGetSQLXMLInteger() throws Exception {
         try {
             delegate.getSQLXML(1);
         } catch (final SQLException e) {
@@ -687,7 +687,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetSQLXMLString() throws Exception {
+    void testGetSQLXMLString() throws Exception {
         try {
             delegate.getSQLXML("foo");
         } catch (final SQLException e) {
@@ -703,7 +703,7 @@ public class TestDelegatingResultSet {
      * @throws Exception
      */
     @Test
-    public void testGetStatement() throws Exception {
+    void testGetStatement() throws Exception {
         try {
             delegate.getStatement();
         } catch (final SQLException e) {
@@ -712,7 +712,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetStringInteger() throws Exception {
+    void testGetStringInteger() throws Exception {
         try {
             delegate.getString(1);
         } catch (final SQLException e) {
@@ -721,7 +721,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetStringString() throws Exception {
+    void testGetStringString() throws Exception {
         try {
             delegate.getString("foo");
         } catch (final SQLException e) {
@@ -730,7 +730,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimeInteger() throws Exception {
+    void testGetTimeInteger() throws Exception {
         try {
             delegate.getTime(1);
         } catch (final SQLException e) {
@@ -739,7 +739,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimeIntegerCalendar() throws Exception {
+    void testGetTimeIntegerCalendar() throws Exception {
         try {
             delegate.getTime(1, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -748,7 +748,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimestampInteger() throws Exception {
+    void testGetTimestampInteger() throws Exception {
         try {
             delegate.getTimestamp(1);
         } catch (final SQLException e) {
@@ -757,7 +757,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimestampIntegerCalendar() throws Exception {
+    void testGetTimestampIntegerCalendar() throws Exception {
         try {
             delegate.getTimestamp(1, (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -766,7 +766,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimestampString() throws Exception {
+    void testGetTimestampString() throws Exception {
         try {
             delegate.getTimestamp("foo");
         } catch (final SQLException e) {
@@ -775,7 +775,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimestampStringCalendar() throws Exception {
+    void testGetTimestampStringCalendar() throws Exception {
         try {
             delegate.getTimestamp("foo", (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -784,7 +784,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimeString() throws Exception {
+    void testGetTimeString() throws Exception {
         try {
             delegate.getTime("foo");
         } catch (final SQLException e) {
@@ -793,7 +793,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetTimeStringCalendar() throws Exception {
+    void testGetTimeStringCalendar() throws Exception {
         try {
             delegate.getTime("foo", (java.util.Calendar) null);
         } catch (final SQLException e) {
@@ -802,7 +802,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetType() throws Exception {
+    void testGetType() throws Exception {
         try {
             delegate.getType();
         } catch (final SQLException e) {
@@ -811,7 +811,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetUnicodeStreamInteger() throws Exception {
+    void testGetUnicodeStreamInteger() throws Exception {
         try {
             delegate.getUnicodeStream(1);
         } catch (final SQLException e) {
@@ -820,7 +820,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetUnicodeStreamString() throws Exception {
+    void testGetUnicodeStreamString() throws Exception {
         try {
             delegate.getUnicodeStream("foo");
         } catch (final SQLException e) {
@@ -829,7 +829,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetURLInteger() throws Exception {
+    void testGetURLInteger() throws Exception {
         try {
             delegate.getURL(1);
         } catch (final SQLException e) {
@@ -838,7 +838,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetURLString() throws Exception {
+    void testGetURLString() throws Exception {
         try {
             delegate.getURL("foo");
         } catch (final SQLException e) {
@@ -847,7 +847,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testGetWarnings() throws Exception {
+    void testGetWarnings() throws Exception {
         try {
             delegate.getWarnings();
         } catch (final SQLException e) {
@@ -856,7 +856,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testInsertRow() throws Exception {
+    void testInsertRow() throws Exception {
         try {
             delegate.insertRow();
         } catch (final SQLException e) {
@@ -865,7 +865,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testIsAfterLast() throws Exception {
+    void testIsAfterLast() throws Exception {
         try {
             delegate.isAfterLast();
         } catch (final SQLException e) {
@@ -874,7 +874,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testIsBeforeFirst() throws Exception {
+    void testIsBeforeFirst() throws Exception {
         try {
             delegate.isBeforeFirst();
         } catch (final SQLException e) {
@@ -883,7 +883,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testIsClosed() throws Exception {
+    void testIsClosed() throws Exception {
         try {
             delegate.isClosed();
         } catch (final SQLException e) {
@@ -892,7 +892,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testIsFirst() throws Exception {
+    void testIsFirst() throws Exception {
         try {
             delegate.isFirst();
         } catch (final SQLException e) {
@@ -901,7 +901,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testIsLast() throws Exception {
+    void testIsLast() throws Exception {
         try {
             delegate.isLast();
         } catch (final SQLException e) {
@@ -910,7 +910,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testLast() throws Exception {
+    void testLast() throws Exception {
         try {
             delegate.last();
         } catch (final SQLException e) {
@@ -919,7 +919,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testMoveToCurrentRow() throws Exception {
+    void testMoveToCurrentRow() throws Exception {
         try {
             delegate.moveToCurrentRow();
         } catch (final SQLException e) {
@@ -928,7 +928,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testMoveToInsertRow() throws Exception {
+    void testMoveToInsertRow() throws Exception {
         try {
             delegate.moveToInsertRow();
         } catch (final SQLException e) {
@@ -937,7 +937,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testNext() throws Exception {
+    void testNext() throws Exception {
         try {
             delegate.next();
         } catch (final SQLException e) {
@@ -946,7 +946,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testPrevious() throws Exception {
+    void testPrevious() throws Exception {
         try {
             delegate.previous();
         } catch (final SQLException e) {
@@ -955,7 +955,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testRefreshRow() throws Exception {
+    void testRefreshRow() throws Exception {
         try {
             delegate.refreshRow();
         } catch (final SQLException e) {
@@ -964,7 +964,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testRelativeInteger() throws Exception {
+    void testRelativeInteger() throws Exception {
         try {
             delegate.relative(1);
         } catch (final SQLException e) {
@@ -973,7 +973,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testRowDeleted() throws Exception {
+    void testRowDeleted() throws Exception {
         try {
             delegate.rowDeleted();
         } catch (final SQLException e) {
@@ -982,7 +982,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testRowInserted() throws Exception {
+    void testRowInserted() throws Exception {
         try {
             delegate.rowInserted();
         } catch (final SQLException e) {
@@ -991,7 +991,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testRowUpdated() throws Exception {
+    void testRowUpdated() throws Exception {
         try {
             delegate.rowUpdated();
         } catch (final SQLException e) {
@@ -1000,7 +1000,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testSetFetchDirectionInteger() throws Exception {
+    void testSetFetchDirectionInteger() throws Exception {
         try {
             delegate.setFetchDirection(1);
         } catch (final SQLException e) {
@@ -1009,7 +1009,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testSetFetchSizeInteger() throws Exception {
+    void testSetFetchSizeInteger() throws Exception {
         try {
             delegate.setFetchSize(1);
         } catch (final SQLException e) {
@@ -1018,14 +1018,14 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         final String toString = delegate.toString();
         assertTrue(toString.contains("DelegatingResultSet"));
         assertTrue(toString.contains("Mock for ResultSet"));
     }
 
     @Test
-    public void testUpdateArrayIntegerArray() throws Exception {
+    void testUpdateArrayIntegerArray() throws Exception {
         try {
             delegate.updateArray(1, (java.sql.Array) null);
         } catch (final SQLException e) {
@@ -1034,7 +1034,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateArrayStringArray() throws Exception {
+    void testUpdateArrayStringArray() throws Exception {
         try {
             delegate.updateArray("foo", (java.sql.Array) null);
         } catch (final SQLException e) {
@@ -1043,7 +1043,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateAsciiStreamIntegerInputStream() throws Exception {
+    void testUpdateAsciiStreamIntegerInputStream() throws Exception {
         try {
             delegate.updateAsciiStream(1, (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -1052,7 +1052,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateAsciiStreamIntegerInputStreamInteger() throws Exception {
+    void testUpdateAsciiStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.updateAsciiStream(1, (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -1061,7 +1061,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateAsciiStreamIntegerInputStreamLong() throws Exception {
+    void testUpdateAsciiStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.updateAsciiStream(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -1070,7 +1070,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateAsciiStreamStringInputStream() throws Exception {
+    void testUpdateAsciiStreamStringInputStream() throws Exception {
         try {
             delegate.updateAsciiStream("foo", (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -1079,7 +1079,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateAsciiStreamStringInputStreamInteger() throws Exception {
+    void testUpdateAsciiStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.updateAsciiStream("foo", (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -1088,7 +1088,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateAsciiStreamStringInputStreamLong() throws Exception {
+    void testUpdateAsciiStreamStringInputStreamLong() throws Exception {
         try {
             delegate.updateAsciiStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -1097,7 +1097,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBigDecimalIntegerBigDecimal() throws Exception {
+    void testUpdateBigDecimalIntegerBigDecimal() throws Exception {
         try {
             delegate.updateBigDecimal(1, java.math.BigDecimal.valueOf(1.0d));
         } catch (final SQLException e) {
@@ -1106,7 +1106,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBigDecimalStringBigDecimal() throws Exception {
+    void testUpdateBigDecimalStringBigDecimal() throws Exception {
         try {
             delegate.updateBigDecimal("foo", java.math.BigDecimal.valueOf(1.0d));
         } catch (final SQLException e) {
@@ -1115,7 +1115,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBinaryStreamIntegerInputStream() throws Exception {
+    void testUpdateBinaryStreamIntegerInputStream() throws Exception {
         try {
             delegate.updateBinaryStream(1, (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -1124,7 +1124,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBinaryStreamIntegerInputStreamInteger() throws Exception {
+    void testUpdateBinaryStreamIntegerInputStreamInteger() throws Exception {
         try {
             delegate.updateBinaryStream(1, (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -1133,7 +1133,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBinaryStreamIntegerInputStreamLong() throws Exception {
+    void testUpdateBinaryStreamIntegerInputStreamLong() throws Exception {
         try {
             delegate.updateBinaryStream(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -1142,7 +1142,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBinaryStreamStringInputStream() throws Exception {
+    void testUpdateBinaryStreamStringInputStream() throws Exception {
         try {
             delegate.updateBinaryStream("foo", (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -1151,7 +1151,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBinaryStreamStringInputStreamInteger() throws Exception {
+    void testUpdateBinaryStreamStringInputStreamInteger() throws Exception {
         try {
             delegate.updateBinaryStream("foo", (java.io.InputStream) null, 1);
         } catch (final SQLException e) {
@@ -1160,7 +1160,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBinaryStreamStringInputStreamLong() throws Exception {
+    void testUpdateBinaryStreamStringInputStreamLong() throws Exception {
         try {
             delegate.updateBinaryStream("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -1169,7 +1169,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBlobIntegerBlob() throws Exception {
+    void testUpdateBlobIntegerBlob() throws Exception {
         try {
             delegate.updateBlob(1, (java.sql.Blob) null);
         } catch (final SQLException e) {
@@ -1178,7 +1178,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBlobIntegerInputStream() throws Exception {
+    void testUpdateBlobIntegerInputStream() throws Exception {
         try {
             delegate.updateBlob(1, (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -1187,7 +1187,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBlobIntegerInputStreamLong() throws Exception {
+    void testUpdateBlobIntegerInputStreamLong() throws Exception {
         try {
             delegate.updateBlob(1, (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -1196,7 +1196,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBlobStringBlob() throws Exception {
+    void testUpdateBlobStringBlob() throws Exception {
         try {
             delegate.updateBlob("foo", (java.sql.Blob) null);
         } catch (final SQLException e) {
@@ -1205,7 +1205,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBlobStringInputStream() throws Exception {
+    void testUpdateBlobStringInputStream() throws Exception {
         try {
             delegate.updateBlob("foo", (java.io.InputStream) null);
         } catch (final SQLException e) {
@@ -1214,7 +1214,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBlobStringInputStreamLong() throws Exception {
+    void testUpdateBlobStringInputStreamLong() throws Exception {
         try {
             delegate.updateBlob("foo", (java.io.InputStream) null, 1L);
         } catch (final SQLException e) {
@@ -1223,7 +1223,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBooleanIntegerBoolean() throws Exception {
+    void testUpdateBooleanIntegerBoolean() throws Exception {
         try {
             delegate.updateBoolean(1, Boolean.TRUE);
         } catch (final SQLException e) {
@@ -1232,7 +1232,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBooleanStringBoolean() throws Exception {
+    void testUpdateBooleanStringBoolean() throws Exception {
         try {
             delegate.updateBoolean("foo", Boolean.TRUE);
         } catch (final SQLException e) {
@@ -1241,7 +1241,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateByteIntegerByte() throws Exception {
+    void testUpdateByteIntegerByte() throws Exception {
         try {
             delegate.updateByte(1, (byte) 1);
         } catch (final SQLException e) {
@@ -1250,7 +1250,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBytesIntegerByteArray() throws Exception {
+    void testUpdateBytesIntegerByteArray() throws Exception {
         try {
             delegate.updateBytes(1, new byte[] { 1 });
         } catch (final SQLException e) {
@@ -1259,7 +1259,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateBytesStringByteArray() throws Exception {
+    void testUpdateBytesStringByteArray() throws Exception {
         try {
             delegate.updateBytes("foo", new byte[] { 1 });
         } catch (final SQLException e) {
@@ -1268,7 +1268,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateByteStringByte() throws Exception {
+    void testUpdateByteStringByte() throws Exception {
         try {
             delegate.updateByte("foo", (byte) 1);
         } catch (final SQLException e) {
@@ -1277,7 +1277,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateCharacterStreamIntegerReader() throws Exception {
+    void testUpdateCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.updateCharacterStream(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1286,7 +1286,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateCharacterStreamIntegerReaderInteger() throws Exception {
+    void testUpdateCharacterStreamIntegerReaderInteger() throws Exception {
         try {
             delegate.updateCharacterStream(1, (java.io.StringReader) null, 1);
         } catch (final SQLException e) {
@@ -1295,7 +1295,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateCharacterStreamIntegerReaderLong() throws Exception {
+    void testUpdateCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.updateCharacterStream(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1304,7 +1304,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateCharacterStreamStringReader() throws Exception {
+    void testUpdateCharacterStreamStringReader() throws Exception {
         try {
             delegate.updateCharacterStream("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1313,7 +1313,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateCharacterStreamStringReaderInteger() throws Exception {
+    void testUpdateCharacterStreamStringReaderInteger() throws Exception {
         try {
             delegate.updateCharacterStream("foo", (java.io.StringReader) null, 1);
         } catch (final SQLException e) {
@@ -1322,7 +1322,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateCharacterStreamStringReaderLong() throws Exception {
+    void testUpdateCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.updateCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1331,7 +1331,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateClobIntegerClob() throws Exception {
+    void testUpdateClobIntegerClob() throws Exception {
         try {
             delegate.updateClob(1, (java.sql.Clob) null);
         } catch (final SQLException e) {
@@ -1340,7 +1340,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateClobIntegerReader() throws Exception {
+    void testUpdateClobIntegerReader() throws Exception {
         try {
             delegate.updateClob(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1349,7 +1349,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateClobIntegerReaderLong() throws Exception {
+    void testUpdateClobIntegerReaderLong() throws Exception {
         try {
             delegate.updateClob(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1358,7 +1358,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateClobStringClob() throws Exception {
+    void testUpdateClobStringClob() throws Exception {
         try {
             delegate.updateClob("foo", (java.sql.Clob) null);
         } catch (final SQLException e) {
@@ -1367,7 +1367,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateClobStringReader() throws Exception {
+    void testUpdateClobStringReader() throws Exception {
         try {
             delegate.updateClob("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1376,7 +1376,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateClobStringReaderLong() throws Exception {
+    void testUpdateClobStringReaderLong() throws Exception {
         try {
             delegate.updateClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1385,7 +1385,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateDateIntegerSqlDate() throws Exception {
+    void testUpdateDateIntegerSqlDate() throws Exception {
         try {
             delegate.updateDate(1, new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
@@ -1394,7 +1394,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateDateStringSqlDate() throws Exception {
+    void testUpdateDateStringSqlDate() throws Exception {
         try {
             delegate.updateDate("foo", new java.sql.Date(1529827548745L));
         } catch (final SQLException e) {
@@ -1403,7 +1403,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateDoubleIntegerDouble() throws Exception {
+    void testUpdateDoubleIntegerDouble() throws Exception {
         try {
             delegate.updateDouble(1, 1.0d);
         } catch (final SQLException e) {
@@ -1412,7 +1412,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateDoubleStringDouble() throws Exception {
+    void testUpdateDoubleStringDouble() throws Exception {
         try {
             delegate.updateDouble("foo", 1.0d);
         } catch (final SQLException e) {
@@ -1421,7 +1421,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateFloatIntegerFloat() throws Exception {
+    void testUpdateFloatIntegerFloat() throws Exception {
         try {
             delegate.updateFloat(1, 1.0f);
         } catch (final SQLException e) {
@@ -1430,7 +1430,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateFloatStringFloat() throws Exception {
+    void testUpdateFloatStringFloat() throws Exception {
         try {
             delegate.updateFloat("foo", 1.0f);
         } catch (final SQLException e) {
@@ -1439,7 +1439,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateIntIntegerInteger() throws Exception {
+    void testUpdateIntIntegerInteger() throws Exception {
         try {
             delegate.updateInt(1, 1);
         } catch (final SQLException e) {
@@ -1448,7 +1448,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateIntStringInteger() throws Exception {
+    void testUpdateIntStringInteger() throws Exception {
         try {
             delegate.updateInt("foo", 1);
         } catch (final SQLException e) {
@@ -1457,7 +1457,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateLongIntegerLong() throws Exception {
+    void testUpdateLongIntegerLong() throws Exception {
         try {
             delegate.updateLong(1, 1L);
         } catch (final SQLException e) {
@@ -1466,7 +1466,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateLongStringLong() throws Exception {
+    void testUpdateLongStringLong() throws Exception {
         try {
             delegate.updateLong("foo", 1L);
         } catch (final SQLException e) {
@@ -1475,7 +1475,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNCharacterStreamIntegerReader() throws Exception {
+    void testUpdateNCharacterStreamIntegerReader() throws Exception {
         try {
             delegate.updateNCharacterStream(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1484,7 +1484,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNCharacterStreamIntegerReaderLong() throws Exception {
+    void testUpdateNCharacterStreamIntegerReaderLong() throws Exception {
         try {
             delegate.updateNCharacterStream(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1493,7 +1493,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNCharacterStreamStringReader() throws Exception {
+    void testUpdateNCharacterStreamStringReader() throws Exception {
         try {
             delegate.updateNCharacterStream("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1502,7 +1502,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNCharacterStreamStringReaderLong() throws Exception {
+    void testUpdateNCharacterStreamStringReaderLong() throws Exception {
         try {
             delegate.updateNCharacterStream("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1511,7 +1511,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNClobIntegerNClob() throws Exception {
+    void testUpdateNClobIntegerNClob() throws Exception {
         try {
             delegate.updateNClob(1, (java.sql.NClob) null);
         } catch (final SQLException e) {
@@ -1520,7 +1520,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNClobIntegerReader() throws Exception {
+    void testUpdateNClobIntegerReader() throws Exception {
         try {
             delegate.updateNClob(1, (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1529,7 +1529,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNClobIntegerReaderLong() throws Exception {
+    void testUpdateNClobIntegerReaderLong() throws Exception {
         try {
             delegate.updateNClob(1, (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1538,7 +1538,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNClobStringNClob() throws Exception {
+    void testUpdateNClobStringNClob() throws Exception {
         try {
             delegate.updateNClob("foo", (java.sql.NClob) null);
         } catch (final SQLException e) {
@@ -1547,7 +1547,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNClobStringReader() throws Exception {
+    void testUpdateNClobStringReader() throws Exception {
         try {
             delegate.updateNClob("foo", (java.io.StringReader) null);
         } catch (final SQLException e) {
@@ -1556,7 +1556,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNClobStringReaderLong() throws Exception {
+    void testUpdateNClobStringReaderLong() throws Exception {
         try {
             delegate.updateNClob("foo", (java.io.StringReader) null, 1L);
         } catch (final SQLException e) {
@@ -1565,7 +1565,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNStringIntegerString() throws Exception {
+    void testUpdateNStringIntegerString() throws Exception {
         try {
             delegate.updateNString(1, "foo");
         } catch (final SQLException e) {
@@ -1574,7 +1574,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNStringStringString() throws Exception {
+    void testUpdateNStringStringString() throws Exception {
         try {
             delegate.updateNString("foo", "foo");
         } catch (final SQLException e) {
@@ -1583,7 +1583,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNullInteger() throws Exception {
+    void testUpdateNullInteger() throws Exception {
         try {
             delegate.updateNull(1);
         } catch (final SQLException e) {
@@ -1592,7 +1592,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateNullString() throws Exception {
+    void testUpdateNullString() throws Exception {
         try {
             delegate.updateNull("foo");
         } catch (final SQLException e) {
@@ -1601,7 +1601,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateObjectIntegerObject() throws Exception {
+    void testUpdateObjectIntegerObject() throws Exception {
         try {
             delegate.updateObject(1, System.err);
         } catch (final SQLException e) {
@@ -1612,7 +1612,7 @@ public class TestDelegatingResultSet {
     // FIXME: this appears to be a bug
     @Disabled
     @Test
-    public void testUpdateObjectIntegerObjectInteger() throws Exception {
+    void testUpdateObjectIntegerObjectInteger() throws Exception {
         try {
             delegate.updateObject(1, System.err, 1);
         } catch (final SQLException e) {
@@ -1621,7 +1621,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateObjectIntegerObjectSQLType() throws Exception {
+    void testUpdateObjectIntegerObjectSQLType() throws Exception {
         try {
             delegate.updateObject(1, System.err, (java.sql.SQLType) null);
         } catch (final SQLException e) {
@@ -1630,7 +1630,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateObjectIntegerObjectSQLTypeInteger() throws Exception {
+    void testUpdateObjectIntegerObjectSQLTypeInteger() throws Exception {
         try {
             delegate.updateObject(1, System.err, (java.sql.SQLType) null, 1);
         } catch (final SQLException e) {
@@ -1639,7 +1639,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateObjectStringObject() throws Exception {
+    void testUpdateObjectStringObject() throws Exception {
         try {
             delegate.updateObject("foo", System.err);
         } catch (final SQLException e) {
@@ -1650,7 +1650,7 @@ public class TestDelegatingResultSet {
     // FIXME this appears to be a bug
     @Disabled
     @Test
-    public void testUpdateObjectStringObjectInteger() throws Exception {
+    void testUpdateObjectStringObjectInteger() throws Exception {
         try {
             delegate.updateObject("foo", System.err, 1);
         } catch (final SQLException e) {
@@ -1659,7 +1659,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateObjectStringObjectSQLType() throws Exception {
+    void testUpdateObjectStringObjectSQLType() throws Exception {
         try {
             delegate.updateObject("foo", System.err, (java.sql.SQLType) null);
         } catch (final SQLException e) {
@@ -1668,7 +1668,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateObjectStringObjectSQLTypeInteger() throws Exception {
+    void testUpdateObjectStringObjectSQLTypeInteger() throws Exception {
         try {
             delegate.updateObject("foo", System.err, (java.sql.SQLType) null, 1);
         } catch (final SQLException e) {
@@ -1677,7 +1677,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateRefIntegerRef() throws Exception {
+    void testUpdateRefIntegerRef() throws Exception {
         try {
             delegate.updateRef(1, (java.sql.Ref) null);
         } catch (final SQLException e) {
@@ -1686,7 +1686,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateRefStringRef() throws Exception {
+    void testUpdateRefStringRef() throws Exception {
         try {
             delegate.updateRef("foo", (java.sql.Ref) null);
         } catch (final SQLException e) {
@@ -1695,7 +1695,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateRow() throws Exception {
+    void testUpdateRow() throws Exception {
         try {
             delegate.updateRow();
         } catch (final SQLException e) {
@@ -1704,7 +1704,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateRowIdIntegerRowId() throws Exception {
+    void testUpdateRowIdIntegerRowId() throws Exception {
         try {
             delegate.updateRowId(1, (java.sql.RowId) null);
         } catch (final SQLException e) {
@@ -1713,7 +1713,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateRowIdStringRowId() throws Exception {
+    void testUpdateRowIdStringRowId() throws Exception {
         try {
             delegate.updateRowId("foo", (java.sql.RowId) null);
         } catch (final SQLException e) {
@@ -1722,7 +1722,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateShortIntegerShort() throws Exception {
+    void testUpdateShortIntegerShort() throws Exception {
         try {
             delegate.updateShort(1, (short) 1);
         } catch (final SQLException e) {
@@ -1731,7 +1731,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateShortStringShort() throws Exception {
+    void testUpdateShortStringShort() throws Exception {
         try {
             delegate.updateShort("foo", (short) 1);
         } catch (final SQLException e) {
@@ -1740,7 +1740,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateSQLXMLIntegerSQLXML() throws Exception {
+    void testUpdateSQLXMLIntegerSQLXML() throws Exception {
         try {
             delegate.updateSQLXML(1, (java.sql.SQLXML) null);
         } catch (final SQLException e) {
@@ -1749,7 +1749,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateSQLXMLStringSQLXML() throws Exception {
+    void testUpdateSQLXMLStringSQLXML() throws Exception {
         try {
             delegate.updateSQLXML("foo", (java.sql.SQLXML) null);
         } catch (final SQLException e) {
@@ -1758,7 +1758,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateStringIntegerString() throws Exception {
+    void testUpdateStringIntegerString() throws Exception {
         try {
             delegate.updateString(1, "foo");
         } catch (final SQLException e) {
@@ -1767,7 +1767,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateStringStringString() throws Exception {
+    void testUpdateStringStringString() throws Exception {
         try {
             delegate.updateString("foo", "foo");
         } catch (final SQLException e) {
@@ -1776,7 +1776,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateTimeIntegerTime() throws Exception {
+    void testUpdateTimeIntegerTime() throws Exception {
         try {
             delegate.updateTime(1, (java.sql.Time) null);
         } catch (final SQLException e) {
@@ -1785,7 +1785,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateTimestampIntegerTimestamp() throws Exception {
+    void testUpdateTimestampIntegerTimestamp() throws Exception {
         try {
             delegate.updateTimestamp(1, (java.sql.Timestamp) null);
         } catch (final SQLException e) {
@@ -1794,7 +1794,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateTimestampStringTimestamp() throws Exception {
+    void testUpdateTimestampStringTimestamp() throws Exception {
         try {
             delegate.updateTimestamp("foo", (java.sql.Timestamp) null);
         } catch (final SQLException e) {
@@ -1803,7 +1803,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testUpdateTimeStringTime() throws Exception {
+    void testUpdateTimeStringTime() throws Exception {
         try {
             delegate.updateTime("foo", (java.sql.Time) null);
         } catch (final SQLException e) {
@@ -1812,7 +1812,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testWasNull() throws Exception {
+    void testWasNull() throws Exception {
         try {
             delegate.wasNull();
         } catch (final SQLException e) {
@@ -1821,7 +1821,7 @@ public class TestDelegatingResultSet {
     }
 
     @Test
-    public void testWrap() throws SQLException {
+    void testWrap() throws SQLException {
         final DelegatingResultSet delegate = (DelegatingResultSet) DelegatingResultSet.wrapResultSet(conn, rs);
         assertEquals(delegate, delegate.unwrap(ResultSet.class));
         assertEquals(delegate, delegate.unwrap(DelegatingResultSet.class));
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
index 70d19659..5955184b 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
@@ -76,7 +76,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testAddBatchString() throws Exception {
+    void testAddBatchString() throws Exception {
         try {
             delegatingStatement.addBatch("foo");
         } catch (final SQLException e) {
@@ -85,7 +85,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testCancel() throws Exception {
+    void testCancel() throws Exception {
         try {
             delegatingStatement.cancel();
         } catch (final SQLException e) {
@@ -94,14 +94,14 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testCheckOpen() throws Exception {
+    void testCheckOpen() throws Exception {
         delegatingStatement.checkOpen();
         delegatingStatement.close();
         assertThrows(SQLException.class, delegatingStatement::checkOpen);
     }
 
     @Test
-    public void testClearBatch() throws Exception {
+    void testClearBatch() throws Exception {
         try {
             delegatingStatement.clearBatch();
         } catch (final SQLException e) {
@@ -110,7 +110,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testClearWarnings() throws Exception {
+    void testClearWarnings() throws Exception {
         try {
             delegatingStatement.clearWarnings();
         } catch (final SQLException e) {
@@ -119,7 +119,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testClose() throws Exception {
+    void testClose() throws Exception {
         try {
             delegatingStatement.close();
         } catch (final SQLException e) {
@@ -128,7 +128,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testCloseOnCompletion() throws Exception {
+    void testCloseOnCompletion() throws Exception {
         try {
             delegatingStatement.closeOnCompletion();
         } catch (final SQLException e) {
@@ -137,7 +137,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testCloseWithResultSetCloseException() throws Exception {
+    void testCloseWithResultSetCloseException() throws Exception {
         testerResultSet.setSqlExceptionOnClose(true);
         delegatingStatement.addTrace(testerResultSet);
         final SQLException e = assertThrows(SQLException.class, delegatingStatement::close);
@@ -146,14 +146,14 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testCloseWithStatementCloseException() throws Exception {
+    void testCloseWithStatementCloseException() throws Exception {
         testerStatement.setSqlExceptionOnClose(true);
         final SQLException e = assertThrows(SQLException.class, delegatingTesterStatement::close);
         assertInstanceOf(SQLExceptionList.class, e);
     }
 
     @Test
-    public void testExecuteBatch() throws Exception {
+    void testExecuteBatch() throws Exception {
         try {
             delegatingStatement.executeBatch();
         } catch (final SQLException e) {
@@ -162,7 +162,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteLargeBatch() throws Exception {
+    void testExecuteLargeBatch() throws Exception {
         try {
             delegatingStatement.executeLargeBatch();
         } catch (final SQLException e) {
@@ -171,7 +171,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteLargeUpdateString() throws Exception {
+    void testExecuteLargeUpdateString() throws Exception {
         try {
             delegatingStatement.executeLargeUpdate("foo");
         } catch (final SQLException e) {
@@ -180,7 +180,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteLargeUpdateStringInteger() throws Exception {
+    void testExecuteLargeUpdateStringInteger() throws Exception {
         try {
             delegatingStatement.executeLargeUpdate("foo", 1);
         } catch (final SQLException e) {
@@ -189,7 +189,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteLargeUpdateStringIntegerArray() throws Exception {
+    void testExecuteLargeUpdateStringIntegerArray() throws Exception {
         try {
             delegatingStatement.executeLargeUpdate("foo", (int[]) null);
         } catch (final SQLException e) {
@@ -198,7 +198,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteLargeUpdateStringStringArray() throws Exception {
+    void testExecuteLargeUpdateStringStringArray() throws Exception {
         try {
             delegatingStatement.executeLargeUpdate("foo", (String[]) null);
         } catch (final SQLException e) {
@@ -207,12 +207,12 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteQueryReturnsNull() throws Exception {
+    void testExecuteQueryReturnsNull() throws Exception {
         assertNull(delegatingStatement.executeQuery("null"));
     }
 
     @Test
-    public void testExecuteQueryString() throws Exception {
+    void testExecuteQueryString() throws Exception {
         try {
             delegatingStatement.executeQuery("foo");
         } catch (final SQLException e) {
@@ -221,7 +221,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteString() throws Exception {
+    void testExecuteString() throws Exception {
         try {
             delegatingStatement.execute("foo");
         } catch (final SQLException e) {
@@ -230,7 +230,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteStringInteger() throws Exception {
+    void testExecuteStringInteger() throws Exception {
         try {
             delegatingStatement.execute("foo", 1);
         } catch (final SQLException e) {
@@ -239,7 +239,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteStringIntegerArray() throws Exception {
+    void testExecuteStringIntegerArray() throws Exception {
         try {
             delegatingStatement.execute("foo", (int[]) null);
         } catch (final SQLException e) {
@@ -248,7 +248,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteStringStringArray() throws Exception {
+    void testExecuteStringStringArray() throws Exception {
         try {
             delegatingStatement.execute("foo", (String[]) null);
         } catch (final SQLException e) {
@@ -257,7 +257,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteUpdateString() throws Exception {
+    void testExecuteUpdateString() throws Exception {
         try {
             delegatingStatement.executeUpdate("foo");
         } catch (final SQLException e) {
@@ -266,7 +266,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteUpdateStringInteger() throws Exception {
+    void testExecuteUpdateStringInteger() throws Exception {
         try {
             delegatingStatement.executeUpdate("foo", 1);
         } catch (final SQLException e) {
@@ -275,7 +275,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteUpdateStringIntegerArray() throws Exception {
+    void testExecuteUpdateStringIntegerArray() throws Exception {
         try {
             delegatingStatement.executeUpdate("foo", (int[]) null);
         } catch (final SQLException e) {
@@ -284,7 +284,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testExecuteUpdateStringStringArray() throws Exception {
+    void testExecuteUpdateStringStringArray() throws Exception {
         try {
             delegatingStatement.executeUpdate("foo", (String[]) null);
         } catch (final SQLException e) {
@@ -298,7 +298,7 @@ public class TestDelegatingStatement {
      * @throws Exception
      */
     @Test
-    public void testGetConnection() throws Exception {
+    void testGetConnection() throws Exception {
         try {
             delegatingStatement.getConnection();
         } catch (final SQLException e) {
@@ -307,12 +307,12 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetDelegate() throws Exception {
+    void testGetDelegate() throws Exception {
         assertEquals(mockedStatement, delegatingStatement.getDelegate());
     }
 
     @Test
-    public void testGetFetchDirection() throws Exception {
+    void testGetFetchDirection() throws Exception {
         try {
             delegatingStatement.getFetchDirection();
         } catch (final SQLException e) {
@@ -321,7 +321,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetFetchSize() throws Exception {
+    void testGetFetchSize() throws Exception {
         try {
             delegatingStatement.getFetchSize();
         } catch (final SQLException e) {
@@ -330,7 +330,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetGeneratedKeys() throws Exception {
+    void testGetGeneratedKeys() throws Exception {
         try {
             delegatingStatement.getGeneratedKeys();
         } catch (final SQLException e) {
@@ -339,7 +339,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetLargeMaxRows() throws Exception {
+    void testGetLargeMaxRows() throws Exception {
         try {
             delegatingStatement.getLargeMaxRows();
         } catch (final SQLException e) {
@@ -348,7 +348,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetLargeUpdateCount() throws Exception {
+    void testGetLargeUpdateCount() throws Exception {
         try {
             delegatingStatement.getLargeUpdateCount();
         } catch (final SQLException e) {
@@ -357,7 +357,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetMaxFieldSize() throws Exception {
+    void testGetMaxFieldSize() throws Exception {
         try {
             delegatingStatement.getMaxFieldSize();
         } catch (final SQLException e) {
@@ -366,7 +366,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetMaxRows() throws Exception {
+    void testGetMaxRows() throws Exception {
         try {
             delegatingStatement.getMaxRows();
         } catch (final SQLException e) {
@@ -375,7 +375,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetMoreResults() throws Exception {
+    void testGetMoreResults() throws Exception {
         try {
             delegatingStatement.getMoreResults();
         } catch (final SQLException e) {
@@ -384,7 +384,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetMoreResultsInteger() throws Exception {
+    void testGetMoreResultsInteger() throws Exception {
         try {
             delegatingStatement.getMoreResults(1);
         } catch (final SQLException e) {
@@ -393,7 +393,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetQueryTimeout() throws Exception {
+    void testGetQueryTimeout() throws Exception {
         try {
             delegatingStatement.getQueryTimeout();
         } catch (final SQLException e) {
@@ -402,7 +402,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetResultSet() throws Exception {
+    void testGetResultSet() throws Exception {
         try {
             delegatingStatement.getResultSet();
         } catch (final SQLException e) {
@@ -411,7 +411,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetResultSetConcurrency() throws Exception {
+    void testGetResultSetConcurrency() throws Exception {
         try {
             delegatingStatement.getResultSetConcurrency();
         } catch (final SQLException e) {
@@ -420,7 +420,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetResultSetHoldability() throws Exception {
+    void testGetResultSetHoldability() throws Exception {
         try {
             delegatingStatement.getResultSetHoldability();
         } catch (final SQLException e) {
@@ -429,7 +429,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetResultSetType() throws Exception {
+    void testGetResultSetType() throws Exception {
         try {
             delegatingStatement.getResultSetType();
         } catch (final SQLException e) {
@@ -438,7 +438,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetUpdateCount() throws Exception {
+    void testGetUpdateCount() throws Exception {
         try {
             delegatingStatement.getUpdateCount();
         } catch (final SQLException e) {
@@ -447,7 +447,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testGetWarnings() throws Exception {
+    void testGetWarnings() throws Exception {
         try {
             delegatingStatement.getWarnings();
         } catch (final SQLException e) {
@@ -461,7 +461,7 @@ public class TestDelegatingStatement {
      * @throws Exception
      */
     @Test
-    public void testIsClosed() throws Exception {
+    void testIsClosed() throws Exception {
         try {
             delegatingStatement.isClosed();
         } catch (final SQLException e) {
@@ -470,7 +470,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testIsCloseOnCompletion() throws Exception {
+    void testIsCloseOnCompletion() throws Exception {
         try {
             delegatingStatement.isCloseOnCompletion();
         } catch (final SQLException e) {
@@ -479,7 +479,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testIsPoolable() throws Exception {
+    void testIsPoolable() throws Exception {
         try {
             delegatingStatement.isPoolable();
         } catch (final SQLException e) {
@@ -488,7 +488,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testIsWrapperFor() throws Exception {
+    void testIsWrapperFor() throws Exception {
         final TesterConnection tstConn = new TesterConnection("test", "test");
         final TesterStatement tstStmt = new TesterStatementNonWrapping(tstConn);
         final DelegatingConnection<TesterConnection> dconn = new DelegatingConnection<>(tstConn);
@@ -504,7 +504,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetCursorNameString() throws Exception {
+    void testSetCursorNameString() throws Exception {
         try {
             delegatingStatement.setCursorName("foo");
         } catch (final SQLException e) {
@@ -513,7 +513,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetEscapeProcessingBoolean() throws Exception {
+    void testSetEscapeProcessingBoolean() throws Exception {
         try {
             delegatingStatement.setEscapeProcessing(Boolean.TRUE);
         } catch (final SQLException e) {
@@ -522,7 +522,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetFetchDirectionInteger() throws Exception {
+    void testSetFetchDirectionInteger() throws Exception {
         try {
             delegatingStatement.setFetchDirection(1);
         } catch (final SQLException e) {
@@ -531,7 +531,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetFetchSizeInteger() throws Exception {
+    void testSetFetchSizeInteger() throws Exception {
         try {
             delegatingStatement.setFetchSize(1);
         } catch (final SQLException e) {
@@ -540,7 +540,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetLargeMaxRowsLong() throws Exception {
+    void testSetLargeMaxRowsLong() throws Exception {
         try {
             delegatingStatement.setLargeMaxRows(1L);
         } catch (final SQLException e) {
@@ -549,7 +549,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetMaxFieldSizeInteger() throws Exception {
+    void testSetMaxFieldSizeInteger() throws Exception {
         try {
             delegatingStatement.setMaxFieldSize(1);
         } catch (final SQLException e) {
@@ -558,7 +558,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetMaxRowsInteger() throws Exception {
+    void testSetMaxRowsInteger() throws Exception {
         try {
             delegatingStatement.setMaxRows(1);
         } catch (final SQLException e) {
@@ -567,7 +567,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetPoolableBoolean() throws Exception {
+    void testSetPoolableBoolean() throws Exception {
         try {
             delegatingStatement.setPoolable(Boolean.TRUE);
         } catch (final SQLException e) {
@@ -576,7 +576,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testSetQueryTimeoutInteger() throws Exception {
+    void testSetQueryTimeoutInteger() throws Exception {
         try {
             delegatingStatement.setQueryTimeout(1);
         } catch (final SQLException e) {
@@ -585,7 +585,7 @@ public class TestDelegatingStatement {
     }
 
     @Test
-    public void testWrap() throws SQLException {
+    void testWrap() throws SQLException {
         assertEquals(delegatingStatement, delegatingStatement.unwrap(Statement.class));
         assertEquals(delegatingStatement, delegatingStatement.unwrap(DelegatingStatement.class));
         assertEquals(mockedStatement, delegatingStatement.unwrap(mockedStatement.getClass()));
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
index c5224f32..e218aec7 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDriverConnectionFactory.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 public class TestDriverConnectionFactory {
 
     @Test
-    public void testCreateConnection() throws SQLException {
+    void testCreateConnection() throws SQLException {
         final DriverConnectionFactory cf = new DriverConnectionFactory(
                 new TesterDriver(), "jdbc:apache:commons:testdriver", null);
         final Connection conn = cf.createConnection();
@@ -39,7 +39,7 @@ public class TestDriverConnectionFactory {
     }
 
     @Test
-    public void testDriverConnectionFactoryToString() {
+    void testDriverConnectionFactoryToString() {
         final DriverConnectionFactory cf = new DriverConnectionFactory(
                 new TesterDriver(), "jdbc:apache:commons:testdriver", null);
         final String toString = cf.toString();
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
index 827d491c..40278334 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
@@ -75,13 +75,13 @@ public class TestDriverManagerConnectionFactory extends AbstractDriverTest {
     }
 
     @Test
-    public void testDriverManagerCredentialsInUrl() throws SQLException {
+    void testDriverManagerCredentialsInUrl() throws SQLException {
         final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver;user=foo;password=bar", null,
                 (char[]) null);
         cf.createConnection();
     }
 
-    public void testDriverManagerInit(final boolean withProperties) throws Exception {
+    void testDriverManagerInit(final boolean withProperties) throws Exception {
         final GenericObjectPoolConfig<PoolableConnection> config = new GenericObjectPoolConfig<>();
         config.setMaxTotal(10);
         config.setMaxIdle(0);
@@ -121,35 +121,35 @@ public class TestDriverManagerConnectionFactory extends AbstractDriverTest {
     }
 
     @Test
-    public void testDriverManagerInitWithCredentials() throws Exception {
+    void testDriverManagerInitWithCredentials() throws Exception {
         testDriverManagerInit(false);
     }
 
     @Test
-    public void testDriverManagerInitWithEmptyProperties() throws Exception {
+    void testDriverManagerInitWithEmptyProperties() throws Exception {
         final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver;user=foo;password=bar");
         connectionFactory.createConnection();
     }
 
     @Test
-    public void testDriverManagerInitWithProperties() throws Exception {
+    void testDriverManagerInitWithProperties() throws Exception {
         testDriverManagerInit(true);
     }
 
     @Test
-    public void testDriverManagerWithoutCredentials() {
+    void testDriverManagerWithoutCredentials() {
         final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", null, (char[]) null);
         assertThrows(ArrayIndexOutOfBoundsException.class, cf::createConnection); // thrown by TestDriver due to missing user
     }
 
     @Test
-    public void testDriverManagerWithoutPassword() {
+    void testDriverManagerWithoutPassword() {
         final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", "user", (char[]) null);
         assertThrows(SQLException.class, cf::createConnection); // thrown by TestDriver due to invalid password
     }
 
     @Test
-    public void testDriverManagerWithoutUser() {
+    void testDriverManagerWithoutUser() {
         final DriverManagerConnectionFactory cf = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", null, "pass");
         assertThrows(IndexOutOfBoundsException.class, cf::createConnection); // thrown by TestDriver due to missing user
     }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestJndi.java b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
index d5da7239..97e5bd45 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestJndi.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
@@ -115,7 +115,7 @@ public class TestJndi {
      * @throws Exception
      */
     @Test
-    public void testBasicDataSourceBind() throws Exception {
+    void testBasicDataSourceBind() throws Exception {
         final BasicDataSource dataSource = new BasicDataSource();
         checkBind(dataSource);
     }
@@ -126,7 +126,7 @@ public class TestJndi {
      * @throws Exception
      */
     @Test
-    public void testPerUserPoolDataSourceBind() throws Exception {
+    void testPerUserPoolDataSourceBind() throws Exception {
         final PerUserPoolDataSource dataSource = new PerUserPoolDataSource();
         checkBind(dataSource);
     }
@@ -137,7 +137,7 @@ public class TestJndi {
      * @throws Exception
      */
     @Test
-    public void testSharedPoolDataSourceBind() throws Exception {
+    void testSharedPoolDataSourceBind() throws Exception {
         final SharedPoolDataSource dataSource = new SharedPoolDataSource();
         checkBind(dataSource);
     }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java b/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
index 4c741cb2..76bedd59 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestLifetimeExceededException.java
@@ -28,13 +28,13 @@ import org.junit.jupiter.api.Test;
 public class TestLifetimeExceededException {
 
     @Test
-    public void testLifetimeExceededException() {
+    void testLifetimeExceededException() {
         final LifetimeExceededException exception = new LifetimeExceededException("car");
         assertEquals("car", exception.getMessage());
     }
 
     @Test
-    public void testLifetimeExceededExceptionNoMessage() {
+    void testLifetimeExceededExceptionNoMessage() {
         final LifetimeExceededException exception = new LifetimeExceededException();
         assertNull(exception.getMessage());
     }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestListException.java b/src/test/java/org/apache/commons/dbcp2/TestListException.java
index afeba2f5..80e29eda 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestListException.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestListException.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 public class TestListException {
 
     @Test
-    public void testExceptionList() {
+    void testExceptionList() {
         final List<Throwable> exceptions = Arrays.asList(new NullPointerException(), new RuntimeException());
         final ListException list = new ListException("Internal Error", exceptions);
         assertEquals("Internal Error", list.getMessage());
@@ -40,7 +40,7 @@ public class TestListException {
     }
 
     @Test
-    public void testNulls() {
+    void testNulls() {
         final ListException list = new ListException(null, null);
         assertNull(list.getMessage());
         assertNull(list.getExceptionList());
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
index e14f9d46..3384f2f8 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
@@ -39,7 +39,7 @@ public class TestPStmtKey {
      * Tests constructors with different catalog.
      */
     @Test
-    public void testCtorDifferentCatalog() {
+    void testCtorDifferentCatalog() {
         assertNotEquals(new PStmtKey("sql", "catalog1", "schema1"), new PStmtKey("sql", "catalog2", "schema1"));
         assertNotEquals(new PStmtKey("sql", "catalog1", "schema1", 0),
                 new PStmtKey("sql", "catalog2", "schema1", 0));
@@ -77,7 +77,7 @@ public class TestPStmtKey {
      * Tests constructors with different schemas.
      */
     @Test
-    public void testCtorDifferentSchema() {
+    void testCtorDifferentSchema() {
         assertNotEquals(new PStmtKey("sql", "catalog1", "schema1"), new PStmtKey("sql", "catalog1", "schema2"));
         assertNotEquals(new PStmtKey("sql", "catalog1", "schema1", 0),
                 new PStmtKey("sql", "catalog1", "schema2", 0));
@@ -115,7 +115,7 @@ public class TestPStmtKey {
      * Tests constructors with different catalog.
      */
     @Test
-    public void testCtorEquals() {
+    void testCtorEquals() {
         assertEquals(new PStmtKey("sql", "catalog1", "schema1"), new PStmtKey("sql", "catalog1", "schema1"));
         assertEquals(new PStmtKey("sql", "catalog1", "schema1", 0),
                 new PStmtKey("sql", "catalog1", "schema1", 0));
@@ -155,7 +155,7 @@ public class TestPStmtKey {
      * See https://issues.apache.org/jira/browse/DBCP-494
      */
     @Test
-    public void testCtorStringStringArrayOfInts() {
+    void testCtorStringStringArrayOfInts() {
         final int[] input = {0, 0};
         final PStmtKey pStmtKey = new PStmtKey("", "", "", input);
         assertArrayEquals(input, pStmtKey.getColumnIndexes());
@@ -170,7 +170,7 @@ public class TestPStmtKey {
      * See https://issues.apache.org/jira/browse/DBCP-494
      */
     @Test
-    public void testCtorStringStringArrayOfNullInts() {
+    void testCtorStringStringArrayOfNullInts() {
         final int[] input = null;
         final PStmtKey pStmtKey = new PStmtKey("", "", "", input);
         assertArrayEquals(input, pStmtKey.getColumnIndexes());
@@ -182,7 +182,7 @@ public class TestPStmtKey {
      * See https://issues.apache.org/jira/browse/DBCP-494
      */
     @Test
-    public void testCtorStringStringArrayOfNullStrings() {
+    void testCtorStringStringArrayOfNullStrings() {
         final String[] input = null;
         final PStmtKey pStmtKey = new PStmtKey("", "", "", input);
         assertArrayEquals(input, pStmtKey.getColumnNames());
@@ -194,7 +194,7 @@ public class TestPStmtKey {
      * See https://issues.apache.org/jira/browse/DBCP-494
      */
     @Test
-    public void testCtorStringStringArrayOfStrings() {
+    void testCtorStringStringArrayOfStrings() {
         final String[] input = {"A", "B"};
         final PStmtKey pStmtKey = new PStmtKey("", "", "", input);
         assertArrayEquals(input, pStmtKey.getColumnNames());
@@ -204,7 +204,7 @@ public class TestPStmtKey {
     }
 
     @Test
-    public void testEquals() {
+    void testEquals() {
         final PStmtKey pStmtKey = new PStmtKey("SELECT 1", "catalog", "public",
                 java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
                 StatementType.CALLABLE_STATEMENT);
@@ -238,7 +238,7 @@ public class TestPStmtKey {
     }
 
     @Test
-    public void testGettersSetters() {
+    void testGettersSetters() {
         final PStmtKey pStmtKey = new PStmtKey("SELECT 1", "catalog", "public");
         assertEquals("SELECT 1", pStmtKey.getSql());
         assertEquals("public", pStmtKey.getSchema());
@@ -251,7 +251,7 @@ public class TestPStmtKey {
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         final PStmtKey pStmtKey = new PStmtKey("SELECT 1", "catalog", "public",
                 StatementType.CALLABLE_STATEMENT, Statement.RETURN_GENERATED_KEYS);
         assertTrue(pStmtKey.toString().contains("sql=SELECT 1"));
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
index 5f2eb4bd..f11f3ae5 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
@@ -73,7 +73,7 @@ public class TestPStmtPooling {
     }
 
     @Test
-    public void testBatchUpdate() throws Exception {
+    void testBatchUpdate() throws Exception {
         DriverManager.registerDriver(new TesterDriver());
         final ConnectionFactory connFactory = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", "u1", "p1");
 
@@ -98,7 +98,7 @@ public class TestPStmtPooling {
     }
 
     @Test
-    public void testCallableStatementPooling() throws Exception {
+    void testCallableStatementPooling() throws Exception {
         DriverManager.registerDriver(new TesterDriver());
         final ConnectionFactory connFactory = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", "u1", "p1");
 
@@ -142,7 +142,7 @@ public class TestPStmtPooling {
     }
 
     @Test
-    public void testClosePool() throws Exception {
+    void testClosePool() throws Exception {
         DriverManager.registerDriver(new TesterDriver());
         final ConnectionFactory connFactory = new DriverManagerConnectionFactory("jdbc:apache:commons:testdriver", "u1", "p1");
 
@@ -174,7 +174,7 @@ public class TestPStmtPooling {
      * be in use by another client - see DBCP-414).
      */
     @Test
-    public void testMultipleClose() throws Exception {
+    void testMultipleClose() throws Exception {
         final DataSource ds = createPoolingDataSource();
         final Connection conn = ds.getConnection();
         final PreparedStatement stmt1 = conn.prepareStatement("select 1 from dual");
@@ -196,7 +196,7 @@ public class TestPStmtPooling {
     }
 
     @Test
-    public void testStmtPool() throws Exception {
+    void testStmtPool() throws Exception {
         final DataSource ds = createPoolingDataSource();
         try (Connection conn = ds.getConnection()) {
             final Statement stmt1 = conn.prepareStatement("select 1 from dual");
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
index 5142d34a..8e45d783 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
@@ -54,7 +54,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
      * for new ones if necessary.
      */
     @Test
-    public void testLRUBehavior() throws Exception {
+    void testLRUBehavior() throws Exception {
         ds.setMaxOpenPreparedStatements(3);
 
         final Connection conn = getConnection();
@@ -100,7 +100,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
      * DBCP-414
      */
     @Test
-    public void testMultipleThreads1() throws Exception {
+    void testMultipleThreads1() throws Exception {
         ds.setMaxWait(Duration.ofMillis(-1));
         ds.setMaxTotal(5);
         ds.setMaxOpenPreparedStatements(-1);
@@ -108,7 +108,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testPreparedStatementPooling() throws Exception {
+    void testPreparedStatementPooling() throws Exception {
         final Connection conn = getConnection();
         assertNotNull(conn);
 
@@ -142,7 +142,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
     // Bugzilla Bug 27246
     // PreparedStatement cache should be different depending on the Catalog
     @Test
-    public void testPStmtCatalog() throws Exception {
+    void testPStmtCatalog() throws Exception {
         final Connection conn = getConnection();
         conn.setCatalog("catalog1");
         final DelegatingPreparedStatement stmt1 = (DelegatingPreparedStatement) conn.prepareStatement("select 'a' from dual");
@@ -167,7 +167,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testPStmtPoolingAcrossClose() throws Exception {
+    void testPStmtPoolingAcrossClose() throws Exception {
         ds.setMaxTotal(1); // only one connection in pool needed
         ds.setMaxIdle(1);
         ds.setAccessToUnderlyingConnectionAllowed(true);
@@ -209,7 +209,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
      * @throws Exception
      */
     @Test
-    public void testPStmtPoolingAcrossCloseWithClearOnReturn() throws Exception {
+    void testPStmtPoolingAcrossCloseWithClearOnReturn() throws Exception {
         ds.setMaxTotal(1); // only one connection in pool needed
         ds.setMaxIdle(1);
         ds.setClearStatementPoolOnReturn(true);
@@ -263,7 +263,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testPStmtPoolingWithNoClose() throws Exception {
+    void testPStmtPoolingWithNoClose() throws Exception {
         ds.setMaxTotal(1); // only one connection in pool needed
         ds.setMaxIdle(1);
         ds.setAccessToUnderlyingConnectionAllowed(true);
diff --git a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
index f1d06efa..c765ea4b 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
@@ -117,7 +117,7 @@ public class TestParallelCreationWithNoIdle {
      * @throws Exception
      */
     @Test
-    public void testMassiveConcurrentInitBorrow() throws Exception {
+    void testMassiveConcurrentInitBorrow() throws Exception {
         final int numThreads = 200;
         ds.setDriverClassName("org.apache.commons.dbcp2.TesterConnectionDelayDriver");
         ds.setUrl("jdbc:apache:commons:testerConnectionDelayDriver:20");
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
index 06ec9ece..3818df2d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
@@ -57,7 +57,7 @@ public class TestPoolableConnection {
     }
 
     @Test
-    public void testClosingWrappedInDelegate() throws Exception {
+    void testClosingWrappedInDelegate() throws Exception {
         Assertions.assertEquals(0, pool.getNumActive());
 
         final Connection conn = pool.borrowObject();
@@ -76,7 +76,7 @@ public class TestPoolableConnection {
     }
 
     @Test
-    public void testConnectionPool() throws Exception {
+    void testConnectionPool() throws Exception {
         // Grab a new connection from the pool
         final Connection c = pool.borrowObject();
 
@@ -90,7 +90,7 @@ public class TestPoolableConnection {
     }
 
     @Test
-    public void testDisconnectionIgnoreSqlCodes() throws Exception {
+    void testDisconnectionIgnoreSqlCodes() throws Exception {
         pool.setTestOnReturn(true);
         final PoolableConnectionFactory factory = (PoolableConnectionFactory) pool.getFactory();
         factory.setFastFailValidation(true);
@@ -111,7 +111,7 @@ public class TestPoolableConnection {
     }
 
     @Test
-    public void testFastFailValidation() throws Exception {
+    void testFastFailValidation() throws Exception {
         pool.setTestOnReturn(true);
         final PoolableConnectionFactory factory = (PoolableConnectionFactory) pool.getFactory();
         factory.setFastFailValidation(true);
@@ -143,7 +143,7 @@ public class TestPoolableConnection {
     }
 
     @Test
-    public void testFastFailValidationCustomCodes() throws Exception {
+    void testFastFailValidationCustomCodes() throws Exception {
         pool.setTestOnReturn(true);
         final PoolableConnectionFactory factory = (PoolableConnectionFactory) pool.getFactory();
         factory.setFastFailValidation(true);
@@ -166,7 +166,7 @@ public class TestPoolableConnection {
     }
 
     @Test
-    public void testIsDisconnectionSqlExceptionStackOverflow() throws Exception {
+    void testIsDisconnectionSqlExceptionStackOverflow() throws Exception {
         final int maxDeep = 100_000;
         final SQLException rootException = new SQLException("Data truncated", "22001");
         SQLException parentException = rootException;
@@ -184,14 +184,14 @@ public class TestPoolableConnection {
      * Tests if the {@link PoolableConnectionMXBean} interface is a valid MXBean interface.
      */
     @Test
-    public void testMXBeanCompliance() throws OperationsException {
+    void testMXBeanCompliance() throws OperationsException {
         TestBasicDataSourceMXBean.testMXBeanCompliance(PoolableConnectionMXBean.class);
     }
 
     // Bugzilla Bug 33591: PoolableConnection leaks connections if the
     // delegated connection closes itself.
     @Test
-    public void testPoolableConnectionLeak() throws Exception {
+    void testPoolableConnectionLeak() throws Exception {
         // 'Borrow' a connection from the pool
         final Connection conn = pool.borrowObject();
 
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index ca648180..98ff92c7 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -52,7 +52,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareCall() throws Exception {
+    void testPrepareCall() throws Exception {
         final String sql = "select 'a' from dual";
         try (final DelegatingCallableStatement statement = (DelegatingCallableStatement) connection.prepareCall(sql)) {
             final TesterCallableStatement testStatement = (TesterCallableStatement) statement.getInnermostDelegate();
@@ -62,7 +62,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareCallWithResultSetConcurrency() throws Exception {
+    void testPrepareCallWithResultSetConcurrency() throws Exception {
         final String sql = "select 'a' from dual";
         final int resultSetType = 0;
         final int resultSetConcurrency = 0;
@@ -76,7 +76,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareCallWithResultSetHoldability() throws Exception {
+    void testPrepareCallWithResultSetHoldability() throws Exception {
         final String sql = "select 'a' from dual";
         final int resultSetType = 0;
         final int resultSetConcurrency = 0;
@@ -93,7 +93,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareStatement() throws Exception {
+    void testPrepareStatement() throws Exception {
         final String sql = "select 'a' from dual";
         try (final DelegatingPreparedStatement statement = (DelegatingPreparedStatement) connection.prepareStatement(sql)) {
             final TesterPreparedStatement testStatement = (TesterPreparedStatement) statement.getInnermostDelegate();
@@ -103,7 +103,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareStatementWithAutoGeneratedKeys() throws Exception {
+    void testPrepareStatementWithAutoGeneratedKeys() throws Exception {
         final String sql = "select 'a' from dual";
         final int autoGeneratedKeys = 0;
         try (final DelegatingPreparedStatement statement = (DelegatingPreparedStatement) connection.prepareStatement(sql, autoGeneratedKeys)) {
@@ -115,7 +115,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareStatementWithColumnIndexes() throws Exception {
+    void testPrepareStatementWithColumnIndexes() throws Exception {
         final String sql = "select 'a' from dual";
         final int[] columnIndexes = {1};
         try (final DelegatingPreparedStatement statement = (DelegatingPreparedStatement) connection.prepareStatement(sql, columnIndexes)) {
@@ -127,7 +127,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareStatementWithColumnNames() throws Exception {
+    void testPrepareStatementWithColumnNames() throws Exception {
         final String sql = "select 'a' from dual";
         final String[] columnNames = {"columnName1"};
         try (final DelegatingPreparedStatement statement = (DelegatingPreparedStatement) connection.prepareStatement(sql, columnNames)) {
@@ -139,7 +139,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareStatementWithResultSetConcurrency() throws Exception {
+    void testPrepareStatementWithResultSetConcurrency() throws Exception {
         final String sql = "select 'a' from dual";
         final int resultSetType = 0;
         final int resultSetConcurrency = 0;
@@ -154,7 +154,7 @@ public class TestPoolingConnection {
     }
 
     @Test
-    public void testPrepareStatementWithResultSetHoldability() throws Exception {
+    void testPrepareStatementWithResultSetHoldability() throws Exception {
         final String sql = "select 'a' from dual";
         final int resultSetType = 0;
         final int resultSetConcurrency = 0;
@@ -174,7 +174,7 @@ public class TestPoolingConnection {
      * Tests DBCP-596 PoolingConnection.toString() causes StackOverflowError.
      */
     @Test
-    public void testToStringStackOverflow() throws SQLException {
+    void testToStringStackOverflow() throws SQLException {
         // Also tests a possible NullPointerException in PoolingConnection.close()
         try (PoolingConnection conn = new PoolingConnection(null)) {
             final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>();
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
index 3f318c39..3ed18954 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
@@ -77,7 +77,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testClose() throws Exception {
+    void testClose() throws Exception {
         final Properties properties = new Properties();
         properties.setProperty(Constants.KEY_USER, "userName");
         properties.setProperty(Constants.KEY_PASSWORD, "password");
@@ -107,7 +107,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
      * result in NPE.
      */
     @Test
-    public void testFixFactoryConfig() throws Exception {
+    void testFixFactoryConfig() throws Exception {
         final Properties properties = new Properties();
         properties.setProperty(Constants.KEY_USER, "userName");
         properties.setProperty(Constants.KEY_PASSWORD, "password");
@@ -128,7 +128,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testIsWrapperFor() throws Exception {
+    void testIsWrapperFor() throws Exception {
         assertTrue(ds.isWrapperFor(PoolingDataSource.class));
         assertTrue(ds.isWrapperFor(AutoCloseable.class));
         assertFalse(ds.isWrapperFor(String.class));
@@ -136,7 +136,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolGuardConnectionWrapperEqualInnermost() throws Exception {
+    void testPoolGuardConnectionWrapperEqualInnermost() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true);
         final DelegatingConnection<?> con = (DelegatingConnection<?>) ds.getConnection();
         final Connection inner = con.getInnermostDelegate();
@@ -149,7 +149,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolGuardConnectionWrapperEqualsFail() throws Exception {
+    void testPoolGuardConnectionWrapperEqualsFail() throws Exception {
         final Connection con1 = ds.getConnection();
         final Connection con2 = ds.getConnection();
         assertNotEquals(con1, con2);
@@ -158,7 +158,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolGuardConnectionWrapperEqualsNull() throws Exception {
+    void testPoolGuardConnectionWrapperEqualsNull() throws Exception {
         final Connection con1 = ds.getConnection();
         final Connection con2 = null;
         assertNotEquals(con2, con1);
@@ -169,7 +169,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
      * JIRA: DBCP-198
      */
     @Test
-    public void testPoolGuardConnectionWrapperEqualsReflexive()
+    void testPoolGuardConnectionWrapperEqualsReflexive()
         throws Exception {
         final Connection con = ds.getConnection();
         final Connection con2 = con;
@@ -179,7 +179,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolGuardConnectionWrapperEqualsSameDelegate() throws Exception {
+    void testPoolGuardConnectionWrapperEqualsSameDelegate() throws Exception {
         // Get a maximal set of connections from the pool
         final Connection[] c = new Connection[getMaxTotal()];
         for (int i = 0; i < c.length; i++) {
@@ -201,7 +201,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolGuardConnectionWrapperEqualsType() throws Exception {
+    void testPoolGuardConnectionWrapperEqualsType() throws Exception {
         final Connection con1 = ds.getConnection();
         final Integer con2 = 0;
         assertNotEquals(con2, con1);
@@ -209,7 +209,7 @@ public class TestPoolingDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testUnwrap() throws Exception {
+    void testUnwrap() throws Exception {
         assertSame(ds.unwrap(PoolingDataSource.class), ds);
         assertSame(ds.unwrap(AutoCloseable.class), ds);
         assertThrows(SQLException.class, () -> ds.unwrap(String.class));
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
index 150e89b9..6d47a58d 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
@@ -95,7 +95,7 @@ public class TestPoolingDriver extends TestConnectionPool {
     }
 
     @Test
-    public void test1() {
+    void test1() {
         final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string", "userName", "password");
         final PoolableConnectionFactory pcf = new PoolableConnectionFactory(connectionFactory, null);
         pcf.setDefaultReadOnly(Boolean.FALSE);
@@ -107,7 +107,7 @@ public class TestPoolingDriver extends TestConnectionPool {
     }
 
     @Test
-    public void test2() {
+    void test2() {
         final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:some:connect:string", "userName", "password");
         final PoolableConnectionFactory pcf = new PoolableConnectionFactory(connectionFactory, null);
         pcf.setDefaultReadOnly(Boolean.FALSE);
@@ -118,7 +118,7 @@ public class TestPoolingDriver extends TestConnectionPool {
     }
 
     @Test
-    public void testClosePool() throws Exception {
+    void testClosePool() throws Exception {
         final Connection conn = DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
         assertNotNull(conn);
         conn.close();
@@ -130,7 +130,7 @@ public class TestPoolingDriver extends TestConnectionPool {
     }
 
     @Test
-    public void testInvalidateConnection() throws Exception {
+    void testInvalidateConnection() throws Exception {
         final Connection conn = DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
         assertNotNull(conn);
 
@@ -147,7 +147,7 @@ public class TestPoolingDriver extends TestConnectionPool {
     }
 
     @Test
-    public void testLogWriter() throws Exception {
+    void testLogWriter() throws Exception {
         final PrintStream ps = new PrintStream(new ByteArrayOutputStream(), false, StandardCharsets.UTF_8.name());
         final PrintWriter pw = new PrintWriter(new OutputStreamWriter(new ByteArrayOutputStream(), StandardCharsets.UTF_8));
         System.setErr(new PrintStream(new ByteArrayOutputStream(), false, StandardCharsets.UTF_8.name()));
@@ -192,7 +192,7 @@ public class TestPoolingDriver extends TestConnectionPool {
 
     /** "https://issues.apache.org/bugzilla/show_bug.cgi?id=12400" */
     @Test
-    public void testReportedBug12400() throws Exception {
+    void testReportedBug12400() throws Exception {
         final GenericObjectPoolConfig<PoolableConnection> config = new GenericObjectPoolConfig<>();
         config.setMaxTotal(70);
         config.setMaxWait(Duration.ofMinutes(1));
@@ -221,7 +221,7 @@ public class TestPoolingDriver extends TestConnectionPool {
 
     /** "https://issues.apache.org/bugzilla/show_bug.cgi?id=28912" */
     @Test
-    public void testReportedBug28912() throws Exception {
+    void testReportedBug28912() throws Exception {
         final Connection conn1 = getConnection();
         assertNotNull(conn1);
         assertFalse(conn1.isClosed());
diff --git a/src/test/java/org/apache/commons/dbcp2/TestSQLExceptionList.java b/src/test/java/org/apache/commons/dbcp2/TestSQLExceptionList.java
index 3ecd6a05..28c09ad9 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestSQLExceptionList.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestSQLExceptionList.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 public class TestSQLExceptionList {
 
     @Test
-    public void testCause() {
+    void testCause() {
         final SQLTransientException cause = new SQLTransientException();
         final List<SQLTransientException> list = Collections.singletonList(cause);
         final SQLExceptionList sqlExceptionList = new SQLExceptionList(list);
@@ -37,7 +37,7 @@ public class TestSQLExceptionList {
     }
 
     @Test
-    public void testNullCause() {
+    void testNullCause() {
         final SQLExceptionList sqlExceptionList = new SQLExceptionList(null);
         Assertions.assertNull(sqlExceptionList.getCause());
         Assertions.assertNull(sqlExceptionList.getCauseList());
diff --git a/src/test/java/org/apache/commons/dbcp2/TestUtils.java b/src/test/java/org/apache/commons/dbcp2/TestUtils.java
index aad63e37..2caea09e 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestUtils.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestUtils.java
@@ -37,40 +37,40 @@ public class TestUtils {
     }
 
     @Test
-    public void testCheckForConflictsBothCollectionsNull() {
+    void testCheckForConflictsBothCollectionsNull() {
         assertDoesNotThrow(() -> Utils.checkSqlCodes(null, null));
     }
 
     @Test
-    public void testCheckForConflictsEmptyCollections() {
+    void testCheckForConflictsEmptyCollections() {
         final Collection<String> codes1 = Collections.emptySet();
         final Collection<String> codes2 = Collections.emptySet();
         assertDoesNotThrow(() -> Utils.checkSqlCodes(codes1, codes2));
     }
 
     @Test
-    public void testCheckForConflictsFirstCollectionNull() {
+    void testCheckForConflictsFirstCollectionNull() {
         final Collection<String> codes1 = null;
         final Collection<String> codes2 = new HashSet<>(Arrays.asList("08005", "08007"));
         assertDoesNotThrow(() -> Utils.checkSqlCodes(codes1, codes2));
     }
 
     @Test
-    public void testCheckForConflictsNoOverlap() {
+    void testCheckForConflictsNoOverlap() {
         final Collection<String> codes1 = new HashSet<>(Arrays.asList("08003", "08006"));
         final Collection<String> codes2 = new HashSet<>(Arrays.asList("08005", "08007"));
         assertDoesNotThrow(() -> Utils.checkSqlCodes(codes1, codes2));
     }
 
     @Test
-    public void testCheckForConflictsSecondCollectionNull() {
+    void testCheckForConflictsSecondCollectionNull() {
         final Collection<String> codes1 = new HashSet<>(Arrays.asList("08003", "08006"));
         final Collection<String> codes2 = null;
         assertDoesNotThrow(() -> Utils.checkSqlCodes(codes1, codes2));
     }
 
     @Test
-    public void testCheckForConflictsWith1Overlap() {
+    void testCheckForConflictsWith1Overlap() {
         final Collection<String> codes1 = new HashSet<>(Arrays.asList("08003", "08006"));
         final Collection<String> codes2 = new HashSet<>(Arrays.asList("08005", "08006"));
         final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> Utils.checkSqlCodes(codes1, codes2));
@@ -78,7 +78,7 @@ public class TestUtils {
     }
 
     @Test
-    public void testCheckForConflictsWith2Overlap() {
+    void testCheckForConflictsWith2Overlap() {
         final Collection<String> codes1 = new HashSet<>(Arrays.asList("08003", "08006", "08007"));
         final Collection<String> codes2 = new HashSet<>(Arrays.asList("08005", "08006", "08007"));
         final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> Utils.checkSqlCodes(codes1, codes2));
@@ -86,12 +86,12 @@ public class TestUtils {
     }
 
     @Test
-    public void testClassLoads() {
+    void testClassLoads() {
         Utils.closeQuietly((AutoCloseable) null);
     }
 
     @Test
-    public void testIsDisconnectionSqlCode() {
+    void testIsDisconnectionSqlCode() {
         assertTrue(Utils.isDisconnectionSqlCode("57P01"), "57P01 should be recognised as a disconnection SQL code.");
         assertTrue(Utils.isDisconnectionSqlCode("01002"), "01002 should be recognised as a disconnection SQL code.");
         assertTrue(Utils.isDisconnectionSqlCode("JZ0C0"), "JZ0C0 should be recognised as a disconnection SQL code.");
diff --git a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
index 31b64a8a..e709eb18 100644
--- a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
+++ b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
@@ -111,7 +111,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testClose()
+    void testClose()
             throws Exception {
         final Connection[] c = new Connection[10];
         for (int i = 0; i < c.length; i++) {
@@ -140,7 +140,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testCloseWithUserName()
+    void testCloseWithUserName()
             throws Exception {
         final Connection[] c = new Connection[10];
         for (int i = 0; i < c.length; i++) {
@@ -172,7 +172,7 @@ public class TestDriverAdapterCPDS {
      * Tests https://issues.apache.org/jira/browse/DBCP-376
      */
     @Test
-    public void testDbcp367() throws Exception {
+    void testDbcp367() throws Exception {
         final ThreadDbcp367[] threads = new ThreadDbcp367[200];
 
         pcds.setPoolPreparedStatements(true);
@@ -207,7 +207,7 @@ public class TestDriverAdapterCPDS {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void testDeprecatedAccessors() {
+    void testDeprecatedAccessors() {
         int i = 0;
         //
         i++;
@@ -222,14 +222,14 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testGetObjectInstance() throws Exception {
+    void testGetObjectInstance() throws Exception {
         final Reference ref = pcds.getReference();
         final Object o = pcds.getObjectInstance(ref, null, null, null);
         assertEquals(pcds.getDriver(), ((DriverAdapterCPDS) o).getDriver());
     }
 
     @Test
-    public void testGetObjectInstanceChangeDescription() throws Exception {
+    void testGetObjectInstanceChangeDescription() throws Exception {
         final Reference ref = pcds.getReference();
         for (int i = 0; i < ref.size(); i++) {
             if (ref.get(i).getType().equals("description")) {
@@ -243,25 +243,25 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testGetObjectInstanceNull() throws Exception {
+    void testGetObjectInstanceNull() throws Exception {
         final Object o = pcds.getObjectInstance(null, null, null, null);
         assertNull(o);
     }
 
     @Test
-    public void testGetParentLogger() {
+    void testGetParentLogger() {
         assertThrows(SQLFeatureNotSupportedException.class, pcds::getParentLogger);
     }
 
     @Test
-    public void testGetReference() throws NamingException {
+    void testGetReference() throws NamingException {
         final Reference ref = pcds.getReference();
         assertEquals(pcds.getDriver(), ref.get("driver").getContent());
         assertEquals(pcds.getDescription(), ref.get("description").getContent());
     }
 
     @Test
-    public void testGettersAndSetters() {
+    void testGettersAndSetters() {
         pcds.setUser("foo");
         assertEquals("foo", pcds.getUser());
         pcds.setPassword("bar");
@@ -291,7 +291,7 @@ public class TestDriverAdapterCPDS {
      * JIRA: DBCP-245
      */
     @Test
-    public void testIncorrectPassword() throws Exception {
+    void testIncorrectPassword() throws Exception {
         pcds.getPooledConnection("u2", "p2").close();
         // Use bad password
         assertThrows(SQLException.class, () -> pcds.getPooledConnection("u1", "zlsafjk"), "Able to retrieve connection with incorrect password");
@@ -309,7 +309,7 @@ public class TestDriverAdapterCPDS {
      * JIRA: DBCP-442
      */
     @Test
-    public void testNullValidationQuery() throws Exception {
+    void testNullValidationQuery() throws Exception {
         try (final SharedPoolDataSource spds = new SharedPoolDataSource()) {
             spds.setConnectionPoolDataSource(pcds);
             spds.setDefaultTestOnBorrow(true);
@@ -320,7 +320,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetConnectionProperties() throws Exception {
+    void testSetConnectionProperties() throws Exception {
         // Set user property to bad value
         pcds.setUser("bad");
         // Supply correct value in connection properties
@@ -342,7 +342,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetConnectionPropertiesConnectionCalled() throws Exception {
+    void testSetConnectionPropertiesConnectionCalled() throws Exception {
         final Properties properties = new Properties();
         // call to the connection
         pcds.getPooledConnection().close();
@@ -350,12 +350,12 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetConnectionPropertiesNull() throws Exception {
+    void testSetConnectionPropertiesNull() throws Exception {
         pcds.setConnectionProperties(null);
     }
 
     @Test
-    public void testSetPasswordNull() throws Exception {
+    void testSetPasswordNull() throws Exception {
         pcds.setPassword("Secret");
         assertEquals("Secret", pcds.getPassword());
         pcds.setPassword((char[]) null);
@@ -363,7 +363,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetPasswordNullWithConnectionProperties() throws Exception {
+    void testSetPasswordNullWithConnectionProperties() throws Exception {
         pcds.setConnectionProperties(new Properties());
         pcds.setPassword("Secret");
         assertEquals("Secret", pcds.getPassword());
@@ -372,7 +372,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetPasswordThenModCharArray() {
+    void testSetPasswordThenModCharArray() {
         final char[] pwd = {'a'};
         pcds.setPassword(pwd);
         assertEquals("a", pcds.getPassword());
@@ -381,7 +381,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetUserNull() throws Exception {
+    void testSetUserNull() throws Exception {
         pcds.setUser("Alice");
         assertEquals("Alice", pcds.getUser());
         pcds.setUser(null);
@@ -389,7 +389,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSetUserNullWithConnectionProperties() throws Exception {
+    void testSetUserNullWithConnectionProperties() throws Exception {
         pcds.setConnectionProperties(new Properties());
         pcds.setUser("Alice");
         assertEquals("Alice", pcds.getUser());
@@ -398,7 +398,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testSimple() throws Exception {
+    void testSimple() throws Exception {
         try (final Connection conn = pcds.getPooledConnection().getConnection()) {
             assertNotNull(conn);
             try (final PreparedStatement stmt = conn.prepareStatement("select * from dual")) {
@@ -413,7 +413,7 @@ public class TestDriverAdapterCPDS {
 
     @SuppressWarnings("resource")
     @Test
-    public void testSimpleWithUsername() throws Exception {
+    void testSimpleWithUsername() throws Exception {
         final Connection connCheck;
         PStmtKey pStmtKey;
         try (final Connection conn = pcds.getPooledConnection("u1", "p1").getConnection()) {
@@ -435,7 +435,7 @@ public class TestDriverAdapterCPDS {
     }
 
     @Test
-    public void testToStringWithoutConnectionProperties() throws ClassNotFoundException {
+    void testToStringWithoutConnectionProperties() throws ClassNotFoundException {
         final DriverAdapterCPDS cleanCpds = new DriverAdapterCPDS();
         cleanCpds.setDriver("org.apache.commons.dbcp2.TesterDriver");
         cleanCpds.setUrl("jdbc:apache:commons:testdriver");
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/CharArrayTest.java b/src/test/java/org/apache/commons/dbcp2/datasources/CharArrayTest.java
index 0db2d824..bea69179 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/CharArrayTest.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/CharArrayTest.java
@@ -30,36 +30,36 @@ import org.junit.jupiter.api.Test;
 public class CharArrayTest {
 
     @Test
-    public void testAsString() {
+    void testAsString() {
         assertEquals("foo", new CharArray("foo").asString());
     }
 
     @Test
-    public void testEquals() {
+    void testEquals() {
         assertEquals(new CharArray("foo"), new CharArray("foo"));
         assertNotEquals(new CharArray("foo"), new CharArray("bar"));
     }
 
     @Test
-    public void testGet() {
+    void testGet() {
         assertArrayEquals("foo".toCharArray(), new CharArray("foo").get());
     }
 
     @Test
-    public void testClear() {
+    void testClear() {
         assertNull(new CharArray((String) null).clear().get());
         assertArrayEquals("".toCharArray(), new CharArray("").clear().get());
         assertArrayEquals("\0\0\0".toCharArray(), new CharArray("foo").clear().get());
     }
 
     @Test
-    public void testHashCode() {
+    void testHashCode() {
         assertEquals(new CharArray("foo").hashCode(), new CharArray("foo").hashCode());
         assertNotEquals(new CharArray("foo").hashCode(), new CharArray("bar").hashCode());
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         assertFalse(new CharArray("foo").toString().contains("foo"));
     }
 }
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionManagerTest.java b/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionManagerTest.java
index 7353db99..a9ade63a 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionManagerTest.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionManagerTest.java
@@ -55,14 +55,14 @@ public class PooledConnectionManagerTest {
     }
 
     @Test
-    public void testSetPasswordCharArray() {
+    void testSetPasswordCharArray() {
         final Fixture fixture = new Fixture();
         fixture.setPassword("p".toCharArray());
         assertArrayEquals("p".toCharArray(), fixture.getPassword());
     }
 
     @Test
-    public void testSetPasswordString() {
+    void testSetPasswordString() {
         final Fixture fixture = new Fixture();
         fixture.setPassword("p");
         assertArrayEquals("p".toCharArray(), fixture.getPassword());
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
index 7183a48e..924a9f85 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
@@ -57,7 +57,7 @@ public class TestCPDSConnectionFactory {
      * cleaned up when a PooledConnection throws a connectionError event.
      */
     @Test
-    public void testConnectionErrorCleanup() throws Exception {
+    void testConnectionErrorCleanup() throws Exception {
         // Setup factory
         final CPDSConnectionFactory factory = new CPDSConnectionFactory(cpds, null, Duration.ofMillis(-1), false, "userName", "password".toCharArray());
         try (final GenericObjectPool<PooledConnectionAndInfo> pool = new GenericObjectPool<>(factory)) {
@@ -118,7 +118,7 @@ public class TestCPDSConnectionFactory {
      * JIRA: DBCP-442
      */
     @Test
-    public void testNullValidationQuery() throws Exception {
+    void testNullValidationQuery() throws Exception {
         final CPDSConnectionFactory factory = new CPDSConnectionFactory(cpds, null, Duration.ofMillis(-1), false, "userName", "password".toCharArray());
         try (final GenericObjectPool<PooledConnectionAndInfo> pool = new GenericObjectPool<>(factory)) {
             factory.setPool(pool);
@@ -130,7 +130,7 @@ public class TestCPDSConnectionFactory {
     }
 
     @Test
-    public void testSetPasswordCharArray() {
+    void testSetPasswordCharArray() {
         final CPDSConnectionFactory factory = new CPDSConnectionFactory(cpds, null, Duration.ofMillis(-1), false, "userName", "password".toCharArray());
         final char[] pwd = { 'a' };
         factory.setPassword(pwd);
@@ -140,7 +140,7 @@ public class TestCPDSConnectionFactory {
     }
 
     @Test
-    public void testSetPasswordString() {
+    void testSetPasswordString() {
         final CPDSConnectionFactory factory = new CPDSConnectionFactory(cpds, null, Duration.ofMillis(-1), false, "userName", "password".toCharArray());
         final String pwd = "a";
         factory.setPassword(pwd);
@@ -155,7 +155,7 @@ public class TestCPDSConnectionFactory {
      * when PooledConnection itself is closed.
      */
     @Test
-    public void testSharedPoolDSDestroyOnReturn() throws Exception {
+    void testSharedPoolDSDestroyOnReturn() throws Exception {
         try (final PerUserPoolDataSource ds = new PerUserPoolDataSource()) {
             ds.setConnectionPoolDataSource(cpds);
             ds.setPerUserMaxTotal("userName", 10);
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java
index 4ab57eed..568eb223 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java
@@ -73,7 +73,7 @@ public class TestFactory {
         "defaultTransactionIsolation,    X",
         "defaultReadOnly,                true" })
     // @formatter:on
-    public void testJNDI2Pools(final String string, final String value) throws Exception {
+    void testJNDI2Pools(final String string, final String value) throws Exception {
         final Reference refObj = new Reference(SharedPoolDataSource.class.getName());
         refObj.add(new StringRefAddr(string, value));
         final Context context = new InitialContext();
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
index 0570627b..9836ff00 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
@@ -79,7 +79,7 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testConnection() throws SQLException, ClassNotFoundException {
+    void testConnection() throws SQLException, ClassNotFoundException {
         spds = new SharedPoolDataSource();
         pcds.setDriver(DRIVER);
         pcds.setUrl(URL);
@@ -93,24 +93,24 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testConnectionPoolDataSource() {
+    void testConnectionPoolDataSource() {
         assertEquals(pcds, spds.getConnectionPoolDataSource());
     }
 
     @Test
-    public void testConnectionPoolDataSourceAlreadySet() {
+    void testConnectionPoolDataSourceAlreadySet() {
         assertThrows(IllegalStateException.class, () -> spds.setConnectionPoolDataSource(new DriverAdapterCPDS()));
     }
 
     @Test
-    public void testConnectionPoolDataSourceAlreadySetUsingJndi() {
+    void testConnectionPoolDataSourceAlreadySetUsingJndi() {
         spds = new SharedPoolDataSource();
         spds.setDataSourceName("anything");
         assertThrows(IllegalStateException.class, () -> spds.setConnectionPoolDataSource(new DriverAdapterCPDS()));
     }
 
     @Test
-    public void testDataSourceName() {
+    void testDataSourceName() {
         spds = new SharedPoolDataSource();
         assertNull(spds.getDataSourceName());
         spds.setDataSourceName("anything");
@@ -118,19 +118,19 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testDataSourceNameAlreadySet() {
+    void testDataSourceNameAlreadySet() {
         assertThrows(IllegalStateException.class, () -> spds.setDataSourceName("anything"));
     }
 
     @Test
-    public void testDataSourceNameAlreadySetUsingJndi() {
+    void testDataSourceNameAlreadySetUsingJndi() {
         spds = new SharedPoolDataSource();
         spds.setDataSourceName("anything");
         assertThrows(IllegalStateException.class, () -> spds.setDataSourceName("anything"));
     }
 
     @Test
-    public void testDefaultBlockWhenExhausted() {
+    void testDefaultBlockWhenExhausted() {
         spds.setDefaultBlockWhenExhausted(true);
         assertTrue(spds.getDefaultBlockWhenExhausted());
         spds.setDefaultBlockWhenExhausted(false);
@@ -138,13 +138,13 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testDefaultEvictionPolicyClassName() {
+    void testDefaultEvictionPolicyClassName() {
         spds.setDefaultEvictionPolicyClassName(Object.class.getName());
         assertEquals(Object.class.getName(), spds.getDefaultEvictionPolicyClassName());
     }
 
     @Test
-    public void testDefaultLifo() {
+    void testDefaultLifo() {
         spds.setDefaultLifo(true);
         assertTrue(spds.getDefaultLifo());
         spds.setDefaultLifo(false);
@@ -152,13 +152,13 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testDefaultMinIdle() {
+    void testDefaultMinIdle() {
         spds.setDefaultMinIdle(10);
         assertEquals(10, spds.getDefaultMinIdle());
     }
 
     @Test
-    public void testDefaultReadOnly() {
+    void testDefaultReadOnly() {
         spds.setDefaultReadOnly(true);
         assertTrue(spds.isDefaultReadOnly());
         spds.setDefaultReadOnly(false);
@@ -166,13 +166,13 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testDefaultSoftMinEvictableIdleTimeMillis() {
+    void testDefaultSoftMinEvictableIdleTimeMillis() {
         spds.setDefaultSoftMinEvictableIdleTimeMillis(10);
         assertEquals(10, spds.getDefaultSoftMinEvictableIdleTimeMillis());
     }
 
     @Test
-    public void testDefaultTestOnCreate() {
+    void testDefaultTestOnCreate() {
         spds.setDefaultTestOnCreate(false);
         assertFalse(spds.getDefaultTestOnCreate());
         spds.setDefaultTestOnCreate(true);
@@ -180,20 +180,20 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testDefaultTransactionIsolation() {
+    void testDefaultTransactionIsolation() {
         assertEquals(InstanceKeyDataSource.UNKNOWN_TRANSACTIONISOLATION, spds.getDefaultTransactionIsolation());
         spds.setDefaultTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
         assertEquals(Connection.TRANSACTION_READ_COMMITTED, spds.getDefaultTransactionIsolation());
     }
 
     @Test
-    public void testDefaultTransactionIsolationInvalid() {
+    void testDefaultTransactionIsolationInvalid() {
         assertEquals(InstanceKeyDataSource.UNKNOWN_TRANSACTIONISOLATION, spds.getDefaultTransactionIsolation());
         assertThrows(IllegalArgumentException.class, () -> spds.setDefaultTransactionIsolation(Integer.MAX_VALUE));
     }
 
     @Test
-    public void testDescription() {
+    void testDescription() {
         spds.setDescription("anything");
         assertEquals("anything", spds.getDescription());
     }
@@ -205,7 +205,7 @@ public class TestInstanceKeyDataSource {
      * @throws Exception
      */
     @Test
-    public void testExceptionOnSetupDefaults() throws Exception {
+    void testExceptionOnSetupDefaults() throws Exception {
         try (final ThrowOnSetupDefaultsDataSource tds = new ThrowOnSetupDefaultsDataSource()) {
             final int numConnections = tds.getNumActive();
             assertThrows(SQLException.class, () -> tds.getConnection(USER, PASS));
@@ -214,13 +214,13 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testIsWrapperFor() throws Exception {
+    void testIsWrapperFor() throws Exception {
         assertTrue(spds.isWrapperFor(InstanceKeyDataSource.class));
         assertTrue(spds.isWrapperFor(AutoCloseable.class));
     }
 
     @Test
-    public void testJndiEnvironment() {
+    void testJndiEnvironment() {
         assertNull(spds.getJndiEnvironment("name"));
         final Properties properties = new Properties();
         properties.setProperty("name", "clarke");
@@ -231,12 +231,12 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testJndiNullProperties() {
+    void testJndiNullProperties() {
         assertThrows(NullPointerException.class, () -> spds.setJndiEnvironment(null));
     }
 
     @Test
-    public void testJndiPropertiesCleared() {
+    void testJndiPropertiesCleared() {
         spds.setJndiEnvironment("name", "king");
         assertEquals("king", spds.getJndiEnvironment("name"));
         final Properties properties = new Properties();
@@ -246,47 +246,47 @@ public class TestInstanceKeyDataSource {
     }
 
     @Test
-    public void testJndiPropertiesNotInitialized() {
+    void testJndiPropertiesNotInitialized() {
         assertNull(spds.getJndiEnvironment("name"));
         spds.setJndiEnvironment("name", "king");
         assertEquals("king", spds.getJndiEnvironment("name"));
     }
 
     @Test
-    public void testLoginTimeout() {
+    void testLoginTimeout() {
         spds.setLoginTimeout(10);
         assertEquals(10, spds.getLoginTimeout());
     }
 
     @SuppressWarnings("resource")
     @Test
-    public void testLogWriter() {
+    void testLogWriter() {
         spds.setLogWriter(new PrintWriter(System.out));
         assertNotNull(spds.getLogWriter());
     }
 
     @SuppressWarnings("resource")
     @Test
-    public void testLogWriterAutoInitialized() {
+    void testLogWriterAutoInitialized() {
         assertNotNull(spds.getLogWriter());
     }
 
     @Test
-    public void testMaxConnLifetimeMillis() {
+    void testMaxConnLifetimeMillis() {
         assertEquals(-1, spds.getMaxConnLifetimeMillis());
         spds.setMaxConnLifetimeMillis(10);
         assertEquals(10, spds.getMaxConnLifetimeMillis());
     }
 
     @Test
-    public void testRollbackAfterValidation() {
+    void testRollbackAfterValidation() {
         assertFalse(spds.isRollbackAfterValidation());
         spds.setRollbackAfterValidation(true);
         assertTrue(spds.isRollbackAfterValidation());
     }
 
     @Test
-    public void testRollbackAfterValidationWithConnectionCalled() throws SQLException {
+    void testRollbackAfterValidationWithConnectionCalled() throws SQLException {
         try (Connection connection = spds.getConnection()) {
             assertFalse(spds.isRollbackAfterValidation());
             assertThrows(IllegalStateException.class, () -> spds.setRollbackAfterValidation(true));
@@ -295,34 +295,34 @@ public class TestInstanceKeyDataSource {
 
     @SuppressWarnings("resource")
     @Test
-    public void testUnwrap() throws Exception {
+    void testUnwrap() throws Exception {
         assertSame(spds.unwrap(InstanceKeyDataSource.class), spds);
         assertSame(spds.unwrap(AutoCloseable.class), spds);
     }
 
     @Test
-    public void testValidationQuery() {
+    void testValidationQuery() {
         assertNull(spds.getValidationQuery());
         spds.setValidationQuery("anything");
         assertEquals("anything", spds.getValidationQuery());
     }
 
     @Test
-    public void testValidationQueryTimeout() {
+    void testValidationQueryTimeout() {
         assertEquals(-1, spds.getValidationQueryTimeout());
         spds.setValidationQueryTimeout(10);
         assertEquals(10, spds.getValidationQueryTimeout());
     }
 
     @Test
-    public void testValidationQueryTimeoutDuration() {
+    void testValidationQueryTimeoutDuration() {
         assertEquals(Duration.ofSeconds(-1), spds.getValidationQueryTimeoutDuration());
         spds.setValidationQueryTimeout(Duration.ofSeconds(10));
         assertEquals(Duration.ofSeconds(10), spds.getValidationQueryTimeoutDuration());
     }
 
     @Test
-    public void testValidationQueryWithConnectionCalled() throws SQLException {
+    void testValidationQueryWithConnectionCalled() throws SQLException {
         try (Connection connection = spds.getConnection()) {
             assertNull(spds.getValidationQuery());
             assertThrows(IllegalStateException.class, () -> spds.setValidationQuery("anything"));
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
index 82f6ff2a..a03fc491 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
@@ -59,7 +59,7 @@ public class TestKeyedCPDSConnectionFactory {
      * cleaned up when a PooledConnection throws a connectionError event.
      */
     @Test
-    public void testConnectionErrorCleanup() throws Exception {
+    void testConnectionErrorCleanup() throws Exception {
         // Setup factory
         final UserPassKey key = new UserPassKey("userName", "password");
         final KeyedCPDSConnectionFactory factory = new KeyedCPDSConnectionFactory(cpds, null, Duration.ofSeconds(-1), false);
@@ -121,7 +121,7 @@ public class TestKeyedCPDSConnectionFactory {
      * JIRA: DBCP-442
      */
     @Test
-    public void testNullValidationQuery() throws Exception {
+    void testNullValidationQuery() throws Exception {
         final UserPassKey key = new UserPassKey("userName", "password");
         final KeyedCPDSConnectionFactory factory = new KeyedCPDSConnectionFactory(cpds, null, Duration.ofSeconds(-1), false);
         try (final GenericKeyedObjectPool<UserPassKey, PooledConnectionAndInfo> pool = new GenericKeyedObjectPool<>(factory)) {
@@ -141,7 +141,7 @@ public class TestKeyedCPDSConnectionFactory {
      * when PooledConnection itself is closed.
      */
     @Test
-    public void testSharedPoolDSDestroyOnReturn() throws Exception {
+    void testSharedPoolDSDestroyOnReturn() throws Exception {
         try (final SharedPoolDataSource ds = new SharedPoolDataSource()) {
             ds.setConnectionPoolDataSource(cpds);
             ds.setMaxTotal(10);
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
index ab319a04..27000b99 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
@@ -93,7 +93,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * See DBCP-8
      */
     @Test
-    public void testChangePassword() throws Exception {
+    void testChangePassword() throws Exception {
         assertThrows(SQLException.class, () -> ds.getConnection(user, "bay"));
         final Connection con1 = ds.getConnection(user, "bar");
         final Connection con2 = ds.getConnection(user, "bar");
@@ -142,7 +142,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testClosingWithUserName() throws Exception {
+    void testClosingWithUserName() throws Exception {
         final Connection[] c = new Connection[getMaxTotal()];
         // open the maximum connections
         for (int i = 0; i < c.length; i++) {
@@ -172,7 +172,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * Tests https://issues.apache.org/jira/browse/DBCP-597
      */
     @Test
-    public void testDbcp597() throws SQLException {
+    void testDbcp597() throws SQLException {
         final PerUserPoolDataSource tds = (PerUserPoolDataSource) ds;
         tds.setDefaultTestOnBorrow(true);
         tds.setValidationQuery("SELECT 1");
@@ -189,7 +189,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testDefaultReadOnly() {
+    void testDefaultReadOnly() {
         try (PerUserPoolDataSource ds = new PerUserPoolDataSource()) {
             assertNull(ds.isDefaultReadOnly());
             ds.setDefaultReadOnly(true);
@@ -205,7 +205,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     // see issue https://issues.apache.org/bugzilla/show_bug.cgi?id=23843
     @Test
-    public void testDefaultUser1() throws Exception {
+    void testDefaultUser1() throws Exception {
         TesterDriver.addUser("mkh", "password");
         TesterDriver.addUser("hanafey", "password");
         TesterDriver.addUser("jsmith", "password");
@@ -226,7 +226,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     // see issue https://issues.apache.org/bugzilla/show_bug.cgi?id=23843
     @Test
-    public void testDefaultUser2() throws Exception {
+    void testDefaultUser2() throws Exception {
         TesterDriver.addUser("mkh", "password");
         TesterDriver.addUser("hanafey", "password");
         TesterDriver.addUser("jsmith", "password");
@@ -247,7 +247,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @SuppressWarnings("deprecation")
     @Test
-    public void testDepreactedAccessors() {
+    void testDepreactedAccessors() {
         try (final PerUserPoolDataSource ds = new PerUserPoolDataSource()) {
             int i = 0;
             //
@@ -297,7 +297,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * Switching 'u1 to 'u2' and 'p1' to 'p2' will exhibit the bug detailed in https://issues.apache.org/bugzilla/show_bug.cgi?id=18905
      */
     @Test
-    public void testIncorrectPassword() throws SQLException {
+    void testIncorrectPassword() throws SQLException {
         // Use bad password
         assertThrows(SQLException.class, () -> ds.getConnection("u1", "zlsafjk"));
 
@@ -335,7 +335,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * Verify that defaultMaxWaitMillis = 0 means immediate failure when pool is exhausted.
      */
     @Test
-    public void testMaxWaitMillisZero() throws Exception {
+    void testMaxWaitMillisZero() throws Exception {
         final PerUserPoolDataSource tds = (PerUserPoolDataSource) ds;
         tds.setDefaultMaxWait(Duration.ZERO);
         tds.setPerUserMaxTotal("u1", 1);
@@ -345,7 +345,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMultipleThreads1() throws Exception {
+    void testMultipleThreads1() throws Exception {
         // Override wait time in order to allow for Thread.sleep(1) sometimes taking a lot longer on
         // some JVMs, e.g. Windows.
         final Duration defaultMaxWaitDuration = Duration.ofMillis(430);
@@ -355,7 +355,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMultipleThreads2() throws Exception {
+    void testMultipleThreads2() throws Exception {
         final Duration defaultMaxWaitDuration = Duration.ofMillis(500);
         ((PerUserPoolDataSource) ds).setDefaultMaxWait(defaultMaxWaitDuration);
         ((PerUserPoolDataSource) ds).setPerUserMaxWait(user, defaultMaxWaitDuration);
@@ -384,7 +384,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * Test per user block when exhausted, with the backing map initialized before.
      */
     @Test
-    public void testPerUserBlockWhenExhaustedMapInitialized() {
+    void testPerUserBlockWhenExhaustedMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
         userDefaultBlockWhenExhausted.put("key", Boolean.FALSE);
@@ -406,7 +406,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * Test per user block when exhausted, with the backing map not initialized before. Instead we pass the map.
      */
     @Test
-    public void testPerUserBlockWhenExhaustedMapNotInitialized() {
+    void testPerUserBlockWhenExhaustedMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
         userDefaultBlockWhenExhausted.put("key", Boolean.TRUE);
@@ -419,7 +419,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * inexistent key, which should return the default value.
      */
     @Test
-    public void testPerUserBlockWhenExhaustedMapNotInitializedMissingKey() {
+    void testPerUserBlockWhenExhaustedMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> userDefaultBlockWhenExhausted = new HashMap<>();
         userDefaultBlockWhenExhausted.put("key", Boolean.FALSE);
@@ -433,7 +433,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * map, unless you pass a new map, using another internal/package method.
      */
     @Test
-    public void testPerUserBlockWhenExhaustedWithUserMapInitialized() {
+    void testPerUserBlockWhenExhaustedWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserBlockWhenExhausted(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserBlockWhenExhausted(user));
@@ -449,7 +449,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * beforehand.
      */
     @Test
-    public void testPerUserBlockWhenExhaustedWithUserMapNotInitialized() {
+    void testPerUserBlockWhenExhaustedWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserBlockWhenExhausted(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserBlockWhenExhausted(user));
@@ -460,7 +460,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
      * beforehand. Furthermore, we are now searching for an inexistent key, which should return the default value.
      */
     @Test
-    public void testPerUserBlockWhenExhaustedWithUserMapNotInitializedMissingKey() {
+    void testPerUserBlockWhenExhaustedWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserBlockWhenExhausted("whatismyuseragain?", Boolean.FALSE);
         assertEquals(Boolean.TRUE, ds.getPerUserBlockWhenExhausted("missingkey"));
@@ -472,7 +472,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user block when exhausted
 
     @Test
-    public void testPerUserDefaultAutoCommitMapInitialized() {
+    void testPerUserDefaultAutoCommitMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -486,7 +486,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultAutoCommitMapNotInitialized() {
+    void testPerUserDefaultAutoCommitMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -495,7 +495,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultAutoCommitMapNotInitializedMissingKey() {
+    void testPerUserDefaultAutoCommitMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -505,7 +505,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultAutoCommitWithUserMapInitialized() {
+    void testPerUserDefaultAutoCommitWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultAutoCommit(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultAutoCommit(user));
@@ -515,14 +515,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultAutoCommitWithUserMapNotInitialized() {
+    void testPerUserDefaultAutoCommitWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultAutoCommit(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultAutoCommit(user));
     }
 
     @Test
-    public void testPerUserDefaultAutoCommitWithUserMapNotInitializedMissingKey() {
+    void testPerUserDefaultAutoCommitWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultAutoCommit("whatismyuseragain?", Boolean.FALSE);
         // TODO this is not consistent with the other methods
@@ -532,7 +532,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user default auto commit
 
     @Test
-    public void testPerUserDefaultReadOnlyMapInitialized() {
+    void testPerUserDefaultReadOnlyMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -546,7 +546,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultReadOnlyMapNotInitialized() {
+    void testPerUserDefaultReadOnlyMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -555,7 +555,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultReadOnlyMapNotInitializedMissingKey() {
+    void testPerUserDefaultReadOnlyMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -565,7 +565,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultReadOnlyWithUserMapInitialized() {
+    void testPerUserDefaultReadOnlyWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultReadOnly(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultReadOnly(user));
@@ -575,14 +575,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultReadOnlyWithUserMapNotInitialized() {
+    void testPerUserDefaultReadOnlyWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultReadOnly(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserDefaultReadOnly(user));
     }
 
     @Test
-    public void testPerUserDefaultReadOnlyWithUserMapNotInitializedMissingKey() {
+    void testPerUserDefaultReadOnlyWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultReadOnly("whatismyuseragain?", Boolean.FALSE);
         // TODO this is not consistent with the other methods
@@ -592,7 +592,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user default read only
 
     @Test
-    public void testPerUserDefaultTransactionIsolationMapInitialized() {
+    void testPerUserDefaultTransactionIsolationMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -607,7 +607,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultTransactionIsolationMapNotInitialized() {
+    void testPerUserDefaultTransactionIsolationMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
@@ -616,7 +616,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultTransactionIsolationMapNotInitializedMissingKey() {
+    void testPerUserDefaultTransactionIsolationMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -626,7 +626,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultTransactionIsolationWithUserMapInitialized() {
+    void testPerUserDefaultTransactionIsolationWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultTransactionIsolation(user, 0);
         assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation(user));
@@ -636,14 +636,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDefaultTransactionIsolationWithUserMapNotInitialized() {
+    void testPerUserDefaultTransactionIsolationWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultTransactionIsolation(user, 0);
         assertEquals((Integer) 0, ds.getPerUserDefaultTransactionIsolation(user));
     }
 
     @Test
-    public void testPerUserDefaultTransactionIsolationWithUserMapNotInitializedMissingKey() {
+    void testPerUserDefaultTransactionIsolationWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserDefaultTransactionIsolation("whatismyuseragain?", 0);
         // TODO this is not consistent with the other methods
@@ -653,7 +653,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user default transaction isolation
 
     @Test
-    public void testPerUserDurationBetweenEvictionRunsMapInitialized() {
+    void testPerUserDurationBetweenEvictionRunsMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -670,7 +670,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDurationBetweenEvictionRunsMapNotInitialized() {
+    void testPerUserDurationBetweenEvictionRunsMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", DURATION_1_MILLISECOND);
@@ -680,7 +680,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserDurationBetweenEvictionRunsMapNotInitializedMissingKey() {
+    void testPerUserDurationBetweenEvictionRunsMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -690,7 +690,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserEvictionPolicyClassNameMapInitialized() {
+    void testPerUserEvictionPolicyClassNameMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, String> values = new HashMap<>();
         values.put("key", "bar");
@@ -704,7 +704,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserEvictionPolicyClassNameMapNotInitialized() {
+    void testPerUserEvictionPolicyClassNameMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, String> values = new HashMap<>();
         values.put("key", "test");
@@ -713,7 +713,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserEvictionPolicyClassNameMapNotInitializedMissingKey() {
+    void testPerUserEvictionPolicyClassNameMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, String> values = new HashMap<>();
         values.put("key", "bar");
@@ -724,7 +724,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user eviction policy class name
 
     @Test
-    public void testPerUserEvictionPolicyClassNameWithUserMapInitialized() {
+    void testPerUserEvictionPolicyClassNameWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserEvictionPolicyClassName(user, "bar");
         assertEquals("bar", ds.getPerUserEvictionPolicyClassName(user));
@@ -734,21 +734,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserEvictionPolicyClassNameWithUserMapNotInitialized() {
+    void testPerUserEvictionPolicyClassNameWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserEvictionPolicyClassName(user, "bar");
         assertEquals("bar", ds.getPerUserEvictionPolicyClassName(user));
     }
 
     @Test
-    public void testPerUserEvictionPolicyClassNameWithUserMapNotInitializedMissingKey() {
+    void testPerUserEvictionPolicyClassNameWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserEvictionPolicyClassName("whatismyuseragain?", "bar");
         assertEquals(ds.getDefaultEvictionPolicyClassName(), ds.getPerUserEvictionPolicyClassName("missingkey"));
     }
 
     @Test
-    public void testPerUserLifoMapInitialized() {
+    void testPerUserLifoMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -762,7 +762,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserLifoMapNotInitialized() {
+    void testPerUserLifoMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -771,7 +771,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserLifoMapNotInitializedMissingKey() {
+    void testPerUserLifoMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -782,7 +782,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user lifo
 
     @Test
-    public void testPerUserLifoWithUserMapInitialized() {
+    void testPerUserLifoWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserLifo(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserLifo(user));
@@ -792,21 +792,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserLifoWithUserMapNotInitialized() {
+    void testPerUserLifoWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserLifo(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserLifo(user));
     }
 
     @Test
-    public void testPerUserLifoWithUserMapNotInitializedMissingKey() {
+    void testPerUserLifoWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserLifo("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultLifo(), ds.getPerUserLifo("missingkey"));
     }
 
     @Test
-    public void testPerUserMaxIdleMapInitialized() {
+    void testPerUserMaxIdleMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -820,7 +820,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxIdleMapNotInitialized() {
+    void testPerUserMaxIdleMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
@@ -829,7 +829,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxIdleMapNotInitializedMissingKey() {
+    void testPerUserMaxIdleMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -840,7 +840,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user max idle
 
     @Test
-    public void testPerUserMaxIdleWithUserMapInitialized() {
+    void testPerUserMaxIdleWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxIdle(user));
@@ -850,21 +850,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxIdleWithUserMapNotInitialized() {
+    void testPerUserMaxIdleWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxIdle(user));
     }
 
     @Test
-    public void testPerUserMaxIdleWithUserMapNotInitializedMissingKey() {
+    void testPerUserMaxIdleWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxIdle("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultMaxIdle(), (Integer) ds.getPerUserMaxIdle("missingkey"));
     }
 
     @Test
-    public void testPerUserMaxTotalMapInitialized() {
+    void testPerUserMaxTotalMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -878,7 +878,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxTotalMapNotInitialized() {
+    void testPerUserMaxTotalMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
@@ -887,7 +887,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxTotalMapNotInitializedMissingKey() {
+    void testPerUserMaxTotalMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -896,7 +896,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxTotalWithUserMapInitialized() {
+    void testPerUserMaxTotalWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxTotal(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxTotal(user));
@@ -906,21 +906,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxTotalWithUserMapNotInitialized() {
+    void testPerUserMaxTotalWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxTotal(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMaxTotal(user));
     }
 
     @Test
-    public void testPerUserMaxTotalWithUserMapNotInitializedMissingKey() {
+    void testPerUserMaxTotalWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxTotal("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultMaxTotal(), (Integer) ds.getPerUserMaxTotal("missingkey"));
     }
 
     @Test
-    public void testPerUserMaxWaitDurationMapInitialized() {
+    void testPerUserMaxWaitDurationMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -934,7 +934,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxWaitDurationMapNotInitialized() {
+    void testPerUserMaxWaitDurationMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", DURATION_1_MILLISECOND);
@@ -943,7 +943,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMaxWaitDurationMapNotInitializedMissingKey() {
+    void testPerUserMaxWaitDurationMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -955,7 +955,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testPerUserMaxWaitMillisWithUserMapInitializedDeprecated() {
+    void testPerUserMaxWaitMillisWithUserMapInitializedDeprecated() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxWaitMillis(user, 0L);
         assertEquals(0L, ds.getPerUserMaxWaitMillis(user));
@@ -966,7 +966,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testPerUserMaxWaitMillisWithUserMapNotInitializedDeprecated() {
+    void testPerUserMaxWaitMillisWithUserMapNotInitializedDeprecated() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxWaitMillis(user, 0L);
         assertEquals(0L, ds.getPerUserMaxWaitMillis(user));
@@ -974,14 +974,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
 
     @Test
     @SuppressWarnings("deprecation")
-    public void testPerUserMaxWaitMillisWithUserMapNotInitializedMissingKeyDeprecated() {
+    void testPerUserMaxWaitMillisWithUserMapNotInitializedMissingKeyDeprecated() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMaxWaitMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultMaxWaitMillis(), ds.getPerUserMaxWaitMillis("missingkey"));
     }
 
     @Test
-    public void testPerUserMethods() throws Exception {
+    void testPerUserMethods() throws Exception {
         final PerUserPoolDataSource tds = (PerUserPoolDataSource) ds;
 
         // you need to set per user maxTotal otherwise there is no accounting
@@ -1030,7 +1030,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinEvictableIdleDurationMapInitialized() {
+    void testPerUserMinEvictableIdleDurationMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -1047,7 +1047,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinEvictableIdleDurationMapNotInitialized() {
+    void testPerUserMinEvictableIdleDurationMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", DURATION_1_MILLISECOND);
@@ -1059,7 +1059,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user min evictable idle time millis
 
     @Test
-    public void testPerUserMinEvictableIdleDurationMapNotInitializedMissingKey() {
+    void testPerUserMinEvictableIdleDurationMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -1069,7 +1069,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinEvictableIdleTimeMillisWithUserMapInitialized() {
+    void testPerUserMinEvictableIdleTimeMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinEvictableIdleTimeMillis(user, 0L);
         assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis(user));
@@ -1079,21 +1079,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
+    void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinEvictableIdleTimeMillis(user, 0L);
         assertEquals(0L, ds.getPerUserMinEvictableIdleTimeMillis(user));
     }
 
     @Test
-    public void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
+    void testPerUserMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinEvictableIdleTimeMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultMinEvictableIdleTimeMillis(), ds.getPerUserMinEvictableIdleTimeMillis("missingkey"));
     }
 
     @Test
-    public void testPerUserMinIdleMapInitialized() {
+    void testPerUserMinIdleMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -1107,7 +1107,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinIdleMapNotInitialized() {
+    void testPerUserMinIdleMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
@@ -1118,7 +1118,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user min idle
 
     @Test
-    public void testPerUserMinIdleMapNotInitializedMissingKey() {
+    void testPerUserMinIdleMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -1127,7 +1127,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinIdleWithUserMapInitialized() {
+    void testPerUserMinIdleWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMinIdle(user));
@@ -1137,21 +1137,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserMinIdleWithUserMapNotInitialized() {
+    void testPerUserMinIdleWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinIdle(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserMinIdle(user));
     }
 
     @Test
-    public void testPerUserMinIdleWithUserMapNotInitializedMissingKey() {
+    void testPerUserMinIdleWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserMinIdle("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultMinIdle(), (Integer) ds.getPerUserMinIdle("missingkey"));
     }
 
     @Test
-    public void testPerUserNumTestsPerEvictionRunMapInitialized() {
+    void testPerUserNumTestsPerEvictionRunMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -1165,7 +1165,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserNumTestsPerEvictionRunMapNotInitialized() {
+    void testPerUserNumTestsPerEvictionRunMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 1);
@@ -1176,7 +1176,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user num tests per eviction run
 
     @Test
-    public void testPerUserNumTestsPerEvictionRunMapNotInitializedMissingKey() {
+    void testPerUserNumTestsPerEvictionRunMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Integer> values = new HashMap<>();
         values.put("key", 0);
@@ -1185,7 +1185,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserNumTestsPerEvictionRunWithUserMapInitialized() {
+    void testPerUserNumTestsPerEvictionRunWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserNumTestsPerEvictionRun(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserNumTestsPerEvictionRun(user));
@@ -1195,21 +1195,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserNumTestsPerEvictionRunWithUserMapNotInitialized() {
+    void testPerUserNumTestsPerEvictionRunWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserNumTestsPerEvictionRun(user, 0);
         assertEquals((Integer) 0, (Integer) ds.getPerUserNumTestsPerEvictionRun(user));
     }
 
     @Test
-    public void testPerUserNumTestsPerEvictionRunWithUserMapNotInitializedMissingKey() {
+    void testPerUserNumTestsPerEvictionRunWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserNumTestsPerEvictionRun("whatismyuseragain?", 0);
         assertEquals((Integer) ds.getDefaultNumTestsPerEvictionRun(), (Integer) ds.getPerUserNumTestsPerEvictionRun("missingkey"));
     }
 
     @Test
-    public void testPerUserSoftMinEvictableIdleDurationMapInitialized() {
+    void testPerUserSoftMinEvictableIdleDurationMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -1226,7 +1226,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserSoftMinEvictableIdleDurationMapNotInitialized() {
+    void testPerUserSoftMinEvictableIdleDurationMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", DURATION_1_MILLISECOND);
@@ -1238,7 +1238,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user soft min evictable idle time millis
 
     @Test
-    public void testPerUserSoftMinEvictableIdleDurationMapNotInitializedMissingKey() {
+    void testPerUserSoftMinEvictableIdleDurationMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Duration> values = new HashMap<>();
         values.put("key", Duration.ZERO);
@@ -1248,7 +1248,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapInitialized() {
+    void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0L);
         assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
@@ -1258,21 +1258,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
+    void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserSoftMinEvictableIdleTimeMillis(user, 0L);
         assertEquals(0L, ds.getPerUserSoftMinEvictableIdleTimeMillis(user));
     }
 
     @Test
-    public void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
+    void testPerUserSoftMinEvictableIdleTimeMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserSoftMinEvictableIdleTimeMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultSoftMinEvictableIdleTimeMillis(), ds.getPerUserSoftMinEvictableIdleTimeMillis("missingkey"));
     }
 
     @Test
-    public void testPerUserTestOnBorrowMapInitialized() {
+    void testPerUserTestOnBorrowMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1286,7 +1286,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnBorrowMapNotInitialized() {
+    void testPerUserTestOnBorrowMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -1297,7 +1297,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user test on borrow
 
     @Test
-    public void testPerUserTestOnBorrowMapNotInitializedMissingKey() {
+    void testPerUserTestOnBorrowMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1306,7 +1306,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnBorrowWithUserMapInitialized() {
+    void testPerUserTestOnBorrowWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnBorrow(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnBorrow(user));
@@ -1316,21 +1316,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnBorrowWithUserMapNotInitialized() {
+    void testPerUserTestOnBorrowWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnBorrow(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnBorrow(user));
     }
 
     @Test
-    public void testPerUserTestOnBorrowWithUserMapNotInitializedMissingKey() {
+    void testPerUserTestOnBorrowWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnBorrow("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestOnBorrow(), ds.getPerUserTestOnBorrow("missingkey"));
     }
 
     @Test
-    public void testPerUserTestOnCreateMapInitialized() {
+    void testPerUserTestOnCreateMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1344,7 +1344,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnCreateMapNotInitialized() {
+    void testPerUserTestOnCreateMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -1355,7 +1355,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user test on create
 
     @Test
-    public void testPerUserTestOnCreateMapNotInitializedMissingKey() {
+    void testPerUserTestOnCreateMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1364,7 +1364,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnCreateWithUserMapInitialized() {
+    void testPerUserTestOnCreateWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnCreate(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnCreate(user));
@@ -1374,21 +1374,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnCreateWithUserMapNotInitialized() {
+    void testPerUserTestOnCreateWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnCreate(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnCreate(user));
     }
 
     @Test
-    public void testPerUserTestOnCreateWithUserMapNotInitializedMissingKey() {
+    void testPerUserTestOnCreateWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnCreate("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestOnCreate(), ds.getPerUserTestOnCreate("missingkey"));
     }
 
     @Test
-    public void testPerUserTestOnReturnMapInitialized() {
+    void testPerUserTestOnReturnMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1402,7 +1402,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnReturnMapNotInitialized() {
+    void testPerUserTestOnReturnMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -1411,7 +1411,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnReturnMapNotInitializedMissingKey() {
+    void testPerUserTestOnReturnMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1422,7 +1422,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user test on return
 
     @Test
-    public void testPerUserTestOnReturnWithUserMapInitialized() {
+    void testPerUserTestOnReturnWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnReturn(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnReturn(user));
@@ -1432,21 +1432,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestOnReturnWithUserMapNotInitialized() {
+    void testPerUserTestOnReturnWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnReturn(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestOnReturn(user));
     }
 
     @Test
-    public void testPerUserTestOnReturnWithUserMapNotInitializedMissingKey() {
+    void testPerUserTestOnReturnWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestOnReturn("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestOnReturn(), ds.getPerUserTestOnReturn("missingkey"));
     }
 
     @Test
-    public void testPerUserTestWhileIdleMapInitialized() {
+    void testPerUserTestWhileIdleMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1460,7 +1460,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestWhileIdleMapNotInitialized() {
+    void testPerUserTestWhileIdleMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.TRUE);
@@ -1469,7 +1469,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestWhileIdleMapNotInitializedMissingKey() {
+    void testPerUserTestWhileIdleMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         final Map<String, Boolean> values = new HashMap<>();
         values.put("key", Boolean.FALSE);
@@ -1478,7 +1478,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestWhileIdleWithUserMapInitialized() {
+    void testPerUserTestWhileIdleWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestWhileIdle(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestWhileIdle(user));
@@ -1488,21 +1488,21 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTestWhileIdleWithUserMapNotInitialized() {
+    void testPerUserTestWhileIdleWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestWhileIdle(user, Boolean.FALSE);
         assertEquals(Boolean.FALSE, ds.getPerUserTestWhileIdle(user));
     }
 
     @Test
-    public void testPerUserTestWhileIdleWithUserMapNotInitializedMissingKey() {
+    void testPerUserTestWhileIdleWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTestWhileIdle("whatismyuseragain?", Boolean.FALSE);
         assertEquals(ds.getDefaultTestWhileIdle(), ds.getPerUserTestWhileIdle("missingkey"));
     }
 
     @Test
-    public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapInitialized() {
+    void testPerUserTimeBetweenEvictionRunsMillisWithUserMapInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0L);
         assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
@@ -1512,14 +1512,14 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitialized() {
+    void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitialized() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTimeBetweenEvictionRunsMillis(user, 0L);
         assertEquals(0L, ds.getPerUserTimeBetweenEvictionRunsMillis(user));
     }
 
     @Test
-    public void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitializedMissingKey() {
+    void testPerUserTimeBetweenEvictionRunsMillisWithUserMapNotInitializedMissingKey() {
         final PerUserPoolDataSource ds = (PerUserPoolDataSource) this.ds;
         ds.setPerUserTimeBetweenEvictionRunsMillis("whatismyuseragain?", 0L);
         assertEquals(ds.getDefaultTimeBetweenEvictionRunsMillis(), ds.getPerUserTimeBetweenEvictionRunsMillis("missingkey"));
@@ -1528,7 +1528,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // -- per user time between eviction runs millis
 
     @Test
-    public void testSerialization() throws Exception {
+    void testSerialization() throws Exception {
         // make sure the pool has initialized
         final Connection conn = ds.getConnection();
         conn.close();
@@ -1612,7 +1612,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testSimpleWithUsername() throws Exception {
+    void testSimpleWithUsername() throws Exception {
         try (final Connection conn = ds.getConnection("u1", "p1")) {
             assertNotNull(conn);
             try (final PreparedStatement stmt = conn.prepareStatement("select * from dual")) {
@@ -1626,7 +1626,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testTransactionIsolationBehavior() throws Exception {
+    void testTransactionIsolationBehavior() throws Exception {
         try (Connection conn = getConnection()) {
             assertNotNull(conn);
             assertEquals(Connection.TRANSACTION_READ_COMMITTED, conn.getTransactionIsolation());
@@ -1645,7 +1645,7 @@ public class TestPerUserPoolDataSource extends TestConnectionPool {
     // see issue https://issues.apache.org/bugzilla/show_bug.cgi?id=23843
     // unregistered user is in the same pool as without user name
     @Test
-    public void testUnregisteredUser() throws Exception {
+    void testUnregisteredUser() throws Exception {
         final PerUserPoolDataSource tds = (PerUserPoolDataSource) ds;
 
         assertEquals(0, tds.getNumActive());
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestPoolKey.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestPoolKey.java
index 789c8514..d7939fc6 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestPoolKey.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestPoolKey.java
@@ -38,7 +38,7 @@ public class TestPoolKey {
     }
 
     @Test
-    public void testEquals() {
+    void testEquals() {
         assertEquals(poolKey, poolKey);
         assertNotEquals(poolKey, null);
         assertNotEquals(poolKey, new Object());
@@ -51,13 +51,13 @@ public class TestPoolKey {
     }
 
     @Test
-    public void testHashcode() {
+    void testHashcode() {
         assertEquals(poolKey.hashCode(), new PoolKey("ds", "user").hashCode());
         assertNotEquals(poolKey.hashCode(), anotherPoolKey.hashCode());
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         assertEquals(poolKey.toString(), new PoolKey("ds", "user").toString());
         assertNotEquals(poolKey.toString(), anotherPoolKey.toString());
     }
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
index c2e21b1b..0cde703e 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
@@ -326,7 +326,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
 
     // See DBCP-8
     @Test
-    public void testChangePassword() throws Exception {
+    void testChangePassword() throws Exception {
         assertThrows(SQLException.class, () -> ds.getConnection("foo", "bay"));
         final Connection con1 = ds.getConnection("foo", "bar");
         final Connection con2 = ds.getConnection("foo", "bar");
@@ -357,7 +357,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
      * @throws Exception
      */
     @Test
-    public void testClosePool() throws Exception {
+    void testClosePool() throws Exception {
         ((SharedPoolDataSource) ds).close();
         @SuppressWarnings("resource") // closed below
         final SharedPoolDataSource tds = new SharedPoolDataSource();
@@ -387,7 +387,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testClosingWithUserName() throws Exception {
+    void testClosingWithUserName() throws Exception {
         final Connection[] c = new Connection[getMaxTotal()];
         // open the maximum connections
         for (int i = 0; i < c.length; i++) {
@@ -414,7 +414,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testDbcp369() {
+    void testDbcp369() {
         final ArrayList<SharedPoolDataSource> dataSources = new ArrayList<>();
         for (int j = 0; j < 10000; j++) {
             dataSources.add(new SharedPoolDataSource());
@@ -451,7 +451,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
      * Tests https://issues.apache.org/jira/browse/DBCP-597
      */
     @Test
-    public void testDbcp597() throws SQLException {
+    void testDbcp597() throws SQLException {
         try (final SharedPoolDataSource sharedPoolDataSource = new SharedPoolDataSource()) {
             sharedPoolDataSource.setConnectionPoolDataSource(pcds);
             sharedPoolDataSource.setDefaultTestOnBorrow(true);
@@ -473,7 +473,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
      * Starting with a successful connection, then incorrect password, then correct password for same user illustrates JIRA: DBCP-245
      */
     @Test
-    public void testIncorrectPassword() throws SQLException {
+    void testIncorrectPassword() throws SQLException {
         ds.getConnection("u2", "p2").close();
         assertThrows(SQLException.class, () -> ds.getConnection("u1", "zlsafjk"), "Able to retrieve connection with incorrect password");
         // Use good password
@@ -503,7 +503,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMaxWaitMillis() throws Exception {
+    void testMaxWaitMillis() throws Exception {
         final int maxWaitMillis = 1000;
         final int theadCount = 20;
 
@@ -547,7 +547,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMultipleThreads1() throws Exception {
+    void testMultipleThreads1() throws Exception {
         // Override wait time in order to allow for Thread.sleep(1) sometimes taking a lot longer on
         // some JVMs, e.g. Windows.
         final Duration defaultMaxWaitDuration = Duration.ofMillis(430);
@@ -556,7 +556,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testMultipleThreads2() throws Exception {
+    void testMultipleThreads2() throws Exception {
         final Duration defaultMaxWaitDuration = Duration.ofMillis(500);
         ((SharedPoolDataSource) ds).setDefaultMaxWait(defaultMaxWaitDuration);
         multipleThreads(defaultMaxWaitDuration.multipliedBy(2), true, true, defaultMaxWaitDuration);
@@ -584,7 +584,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
      * Bugzilla Bug 24136 ClassCastException in DriverAdapterCPDS when setPoolPreparedStatements(true)
      */
     @Test
-    public void testPoolPrepareCall() throws SQLException {
+    void testPoolPrepareCall() throws SQLException {
         pcds.setPoolPreparedStatements(true);
         try (final Connection conn = ds.getConnection()) {
             assertNotNull(conn);
@@ -599,14 +599,14 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolPreparedCalls() throws Exception {
+    void testPoolPreparedCalls() throws Exception {
         doTestPoolCallableStatements(new CscbString());
         doTestPoolCallableStatements(new CscbStringIntInt());
         doTestPoolCallableStatements(new CscbStringIntIntInt());
     }
 
     @Test
-    public void testPoolPreparedStatements() throws Exception {
+    void testPoolPreparedStatements() throws Exception {
         doTestPoolPreparedStatements(new PscbString());
         doTestPoolPreparedStatements(new PscbStringIntInt());
         doTestPoolPreparedStatements(new PscbStringInt());
@@ -616,7 +616,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testPoolPrepareStatement() throws SQLException {
+    void testPoolPrepareStatement() throws SQLException {
         pcds.setPoolPreparedStatements(true);
 
         try (final Connection conn = ds.getConnection()) {
@@ -695,7 +695,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testSimpleWithUsername() throws Exception {
+    void testSimpleWithUsername() throws Exception {
         try (final Connection conn = ds.getConnection("u1", "p1")) {
             assertNotNull(conn);
             try (final PreparedStatement stmt = conn.prepareStatement("select * from dual")) {
@@ -709,7 +709,7 @@ public class TestSharedPoolDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testTransactionIsolationBehavior() throws Exception {
+    void testTransactionIsolationBehavior() throws Exception {
         try (final Connection conn = getConnection()) {
             assertNotNull(conn);
             assertEquals(Connection.TRANSACTION_READ_COMMITTED, conn.getTransactionIsolation());
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/TestUserPassKey.java b/src/test/java/org/apache/commons/dbcp2/datasources/TestUserPassKey.java
index b3438319..b8f56309 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestUserPassKey.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestUserPassKey.java
@@ -41,7 +41,7 @@ public class TestUserPassKey {
     }
 
     @Test
-    public void testEquals() {
+    void testEquals() {
         assertEquals(new UserPassKey("user"), new UserPassKey("user", (char[]) null));
         assertEquals(userPassKey, userPassKey);
         assertNotEquals(userPassKey, null);
@@ -52,26 +52,26 @@ public class TestUserPassKey {
     }
 
     @Test
-    public void testGettersAndSetters() {
+    void testGettersAndSetters() {
         assertEquals("user", userPassKey.getUserName());
         assertEquals("pass", userPassKey.getPassword());
         assertArrayEquals(Utils.toCharArray("pass"), userPassKey.getPasswordCharArray());
     }
 
     @Test
-    public void testHashcode() {
+    void testHashcode() {
         assertEquals(userPassKey.hashCode(), new UserPassKey("user", "pass").hashCode());
         assertNotEquals(userPassKey.hashCode(), anotherUserPassKey.hashCode());
     }
 
     @Test
-    public void testSerialization() {
+    void testSerialization() {
         assertEquals(userPassKey, SerializationUtils.roundtrip(userPassKey));
         assertEquals(anotherUserPassKey, SerializationUtils.roundtrip(anotherUserPassKey));
     }
 
     @Test
-    public void testToString() {
+    void testToString() {
         assertEquals(userPassKey.toString(), new UserPassKey("user", "pass").toString());
         assertNotEquals(userPassKey.toString(), anotherUserPassKey.toString());
     }
diff --git a/src/test/java/org/apache/commons/dbcp2/datasources/UserPassKeyTest.java b/src/test/java/org/apache/commons/dbcp2/datasources/UserPassKeyTest.java
index 2d26fd23..c649e6ee 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/UserPassKeyTest.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/UserPassKeyTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class UserPassKeyTest {
 
     @Test
-    public void testClear() {
+    void testClear() {
         // user name
         assertNull(new UserPassKey((String) null).clear().getUserName());
         assertEquals("", new UserPassKey("").clear().getUserName());
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
index 063ae016..52adca85 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
@@ -58,7 +58,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testCreateXaDataSourceNewInstance() throws SQLException, XAException {
+    void testCreateXaDataSourceNewInstance() throws SQLException, XAException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setXADataSource(JdbcDataSource.class.getCanonicalName());
             basicManagedDataSource.setDriverClassName(Driver.class.getName());
@@ -68,7 +68,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testCreateXaDataSourceNoInstanceSetAndNoDataSource() throws SQLException, XAException {
+    void testCreateXaDataSourceNoInstanceSetAndNoDataSource() throws SQLException, XAException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
             basicManagedDataSource.setUrl("jdbc:apache:commons:testdriver");
@@ -83,7 +83,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
      * when reallyClosed.
      */
     @Test
-    public void testReallyClose() throws Exception {
+    void testReallyClose() throws Exception {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setTransactionManager(new TransactionManagerImpl());
             basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
@@ -104,7 +104,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testRuntimeExceptionsAreRethrown() throws SQLException, XAException {
+    void testRuntimeExceptionsAreRethrown() throws SQLException, XAException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setTransactionManager(new TransactionManagerImpl());
             basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
@@ -118,7 +118,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testSetDriverName() throws SQLException {
+    void testSetDriverName() throws SQLException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setDriverClassName("adams");
             assertEquals("adams", basicManagedDataSource.getDriverClassName());
@@ -128,7 +128,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testSetNullXaDataSourceInstance() throws SQLException, XAException {
+    void testSetNullXaDataSourceInstance() throws SQLException, XAException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setTransactionManager(new TransactionManagerImpl());
             basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
@@ -143,7 +143,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
 
     /** DBCP-564 */
     @Test
-    public void testSetRollbackOnlyBeforeGetConnectionDoesNotLeak() throws Exception {
+    void testSetRollbackOnlyBeforeGetConnectionDoesNotLeak() throws Exception {
         final TransactionManager transactionManager = ((BasicManagedDataSource) ds).getTransactionManager();
         final int n = 3;
         ds.setMaxIdle(n);
@@ -163,7 +163,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testSetXaDataSourceInstance() throws SQLException, XAException {
+    void testSetXaDataSourceInstance() throws SQLException, XAException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setTransactionManager(new TransactionManagerImpl());
             basicManagedDataSource.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
@@ -177,14 +177,14 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testTransactionManagerNotSet() throws SQLException {
+    void testTransactionManagerNotSet() throws SQLException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             assertThrows(SQLException.class, basicManagedDataSource::createConnectionFactory);
         }
     }
 
     @Test
-    public void testTransactionSynchronizationRegistry() throws Exception {
+    void testTransactionSynchronizationRegistry() throws Exception {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setTransactionManager(new TransactionManagerImple());
             final TransactionSynchronizationRegistry tsr = new TransactionSynchronizationRegistryImple();
@@ -211,7 +211,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testXADataSource() throws SQLException {
+    void testXADataSource() throws SQLException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             basicManagedDataSource.setXADataSource("anything");
             assertEquals("anything", basicManagedDataSource.getXADataSource());
@@ -219,7 +219,7 @@ public class TestBasicManagedDataSource extends TestBasicDataSource {
     }
 
     @Test
-    public void testXaDataSourceInstance() throws SQLException {
+    void testXaDataSourceInstance() throws SQLException {
         try (final BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource()) {
             final XADataSource ds = new JdbcDataSource();
             basicManagedDataSource.setXaDataSourceInstance(ds);
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
index 07c5db46..b27c1e23 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java
@@ -107,7 +107,7 @@ public class TestConnectionWithNarayana {
     }
 
     @Test
-    public void testConnectionCommitAfterTimeout() throws Exception {
+    void testConnectionCommitAfterTimeout() throws Exception {
         mds.getTransactionManager().setTransactionTimeout(1);
         mds.getTransactionManager().begin();
         try (Connection conn = mds.getConnection()) {
@@ -124,7 +124,7 @@ public class TestConnectionWithNarayana {
     }
 
     @Test
-    public void testConnectionInTimeout() throws Exception {
+    void testConnectionInTimeout() throws Exception {
         Connection conn = null;
         PreparedStatement ps = null;
         for (int i = 0; i < 5; i++) {
@@ -182,7 +182,7 @@ public class TestConnectionWithNarayana {
     }
 
     @Test
-    public void testRepeatedGetConnectionInTimeout() throws Exception {
+    void testRepeatedGetConnectionInTimeout() throws Exception {
         mds.getTransactionManager().setTransactionTimeout(1);
         mds.getTransactionManager().begin();
         try {
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java b/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
index 2bc1e5a8..d22b841b 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
@@ -96,7 +96,7 @@ public class TestDataSourceXAConnectionFactory extends TestBasicDataSource {
      * JIRA: DBCP-355
      */
     @Test
-    public void testPhysicalClose() throws Exception {
+    void testPhysicalClose() throws Exception {
         bmds.setMaxIdle(1);
         final Connection conn1 = bmds.getConnection();
         final Connection conn2 = bmds.getConnection();
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
index e41530ae..cc15365d 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestLocalXaResource.java
@@ -362,7 +362,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testCommit() throws SQLException, XAException {
+    void testCommit() throws SQLException, XAException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
@@ -372,7 +372,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testCommitConnectionClosed() throws SQLException, XAException {
+    void testCommitConnectionClosed() throws SQLException, XAException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).closed = true;
         conn.setReadOnly(false);
@@ -381,7 +381,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testCommitConnectionNotReadOnly() throws SQLException, XAException {
+    void testCommitConnectionNotReadOnly() throws SQLException, XAException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(true);
@@ -391,7 +391,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testCommitInvalidXid() throws SQLException, XAException {
+    void testCommitInvalidXid() throws SQLException, XAException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
@@ -400,19 +400,19 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testCommitMissingXid() {
+    void testCommitMissingXid() {
         assertThrows(NullPointerException.class, () -> resource.commit(null, false));
     }
 
     @Test
-    public void testCommitNoTransaction() throws SQLException {
+    void testCommitNoTransaction() throws SQLException {
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
         assertThrows(XAException.class, () -> resource.commit(new TestXid(), false));
     }
 
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         assertEquals(0, resource.getTransactionTimeout());
         assertNull(resource.getXid());
         // the current implementation always return false, regardless of the input value
@@ -422,7 +422,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testForget() throws XAException {
+    void testForget() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.forget(xid);
@@ -430,7 +430,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testForgetDifferentXid() throws XAException {
+    void testForgetDifferentXid() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.forget(new TestXid());
@@ -438,7 +438,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testForgetMissingXid() throws XAException {
+    void testForgetMissingXid() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.forget(null);
@@ -446,13 +446,13 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testIsSame() {
+    void testIsSame() {
         assertTrue(resource.isSameRM(resource));
         assertFalse(resource.isSameRM(new LocalXAConnectionFactory.LocalXAResource(conn)));
     }
 
     @Test
-    public void testRollback() throws SQLException, XAException {
+    void testRollback() throws SQLException, XAException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
@@ -462,7 +462,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testRollbackInvalidXid() throws SQLException, XAException {
+    void testRollbackInvalidXid() throws SQLException, XAException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).closed = false;
         conn.setReadOnly(false);
@@ -471,7 +471,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testRollbackMissingXid() {
+    void testRollbackMissingXid() {
         assertThrows(NullPointerException.class, () -> resource.rollback(null));
     }
 
@@ -482,7 +482,7 @@ public class TestLocalXaResource {
      * @throws SQLException when there are errors with other SQL/DB parts
      */
     @Test
-    public void testStartExceptionOnGetAutoCommit() throws XAException, SQLException {
+    void testStartExceptionOnGetAutoCommit() throws XAException, SQLException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).throwWhenGetAutoCommit = true;
         conn.setAutoCommit(false);
@@ -497,26 +497,26 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testStartFailsWhenCannotSetAutoCommit() {
+    void testStartFailsWhenCannotSetAutoCommit() {
         final Xid xid = new TestXid();
         ((TestConnection) conn).throwWhenSetAutoCommit = true;
         assertThrows(XAException.class, () -> resource.start(xid, XAResource.TMNOFLAGS));
     }
 
     @Test
-    public void testStartInvalidFlag() {
+    void testStartInvalidFlag() {
         // currently, valid values are TMNOFLAGS and TMRESUME
         assertThrows(XAException.class, () -> resource.start(null, XAResource.TMENDRSCAN));
     }
 
     @Test
-    public void testStartNoFlagButAlreadyEnlisted() throws XAException {
+    void testStartNoFlagButAlreadyEnlisted() throws XAException {
         resource.start(new TestXid(), XAResource.TMNOFLAGS);
         assertThrows(XAException.class, () -> resource.start(new TestXid(), XAResource.TMNOFLAGS));
     }
 
     @Test
-    public void testStartNoFlagResume() throws XAException {
+    void testStartNoFlagResume() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
@@ -524,13 +524,13 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testStartNoFlagResumeButDifferentXid() throws XAException {
+    void testStartNoFlagResumeButDifferentXid() throws XAException {
         resource.start(new TestXid(), XAResource.TMNOFLAGS);
         assertThrows(XAException.class, () -> resource.start(new TestXid(), XAResource.TMRESUME));
     }
 
     @Test
-    public void testStartNoFlagResumeEnd() throws XAException {
+    void testStartNoFlagResumeEnd() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
@@ -540,7 +540,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testStartNoFlagResumeEndDifferentXid() throws XAException {
+    void testStartNoFlagResumeEndDifferentXid() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
@@ -549,7 +549,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testStartNoFlagResumeEndMissingXid() throws XAException {
+    void testStartNoFlagResumeEndMissingXid() throws XAException {
         final Xid xid = new TestXid();
         resource.start(xid, XAResource.TMNOFLAGS);
         resource.start(xid, XAResource.TMRESUME);
@@ -565,7 +565,7 @@ public class TestLocalXaResource {
      * @throws SQLException when there are errors with other SQL/DB parts
      */
     @Test
-    public void testStartReadOnlyConnectionExceptionOnGetAutoCommit() throws XAException, SQLException {
+    void testStartReadOnlyConnectionExceptionOnGetAutoCommit() throws XAException, SQLException {
         final Xid xid = new TestXid();
         ((TestConnection) conn).throwWhenGetAutoCommit = true;
         conn.setAutoCommit(false);
@@ -580,7 +580,7 @@ public class TestLocalXaResource {
     }
 
     @Test
-    public void testStartReadOnlyConnectionPrepare() throws XAException, SQLException {
+    void testStartReadOnlyConnectionPrepare() throws XAException, SQLException {
         final Xid xid = new TestXid();
         conn.setAutoCommit(false);
         conn.setReadOnly(true);
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
index da804510..4715bbcf 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
@@ -193,7 +193,7 @@ public class TestManagedConnection {
     }
 
     @Test
-    public void testConnectionReturnOnErrorWhenEnlistingXAResource() throws Exception {
+    void testConnectionReturnOnErrorWhenEnlistingXAResource() throws Exception {
         // see DBCP-433
         transactionManager.begin();
         assertThrows(SQLException.class, this::getConnection);
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnectionCachedState.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnectionCachedState.java
index a988957b..d32c7c12 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnectionCachedState.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnectionCachedState.java
@@ -111,7 +111,7 @@ public class TestManagedConnectionCachedState {
     }
 
     @Test
-    public void testConnectionCachedState() throws Exception {
+    void testConnectionCachedState() throws Exception {
         // see DBCP-568
 
         // begin a transaction
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
index 2cd540ee..8bc9ed67 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
@@ -105,7 +105,7 @@ public class TestManagedDataSource extends TestConnectionPool {
      * Verify the accessToUnderlyingConnectionAllowed properly limits access to the physical connection.
      */
     @Test
-    public void testAccessToUnderlyingConnectionAllowed() throws Exception {
+    void testAccessToUnderlyingConnectionAllowed() throws Exception {
         ds.setAccessToUnderlyingConnectionAllowed(true);
         try (ManagedConnection<?> connection = (ManagedConnection<?>) newConnection()) {
             assertTrue(connection.isAccessToUnderlyingConnectionAllowed());
@@ -122,7 +122,7 @@ public class TestManagedDataSource extends TestConnectionPool {
     }
 
     @Test
-    public void testConnectionReturnOnCommit() throws Exception {
+    void testConnectionReturnOnCommit() throws Exception {
         transactionManager.begin();
         try (DelegatingConnection<?> connectionA = (DelegatingConnection<?>) newConnection()) {
             // auto close.
@@ -134,7 +134,7 @@ public class TestManagedDataSource extends TestConnectionPool {
     }
... 236 lines suppressed ...