This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4deb6d877b4955170782fca6d55fb1a63b3ece72 Author: remm <[email protected]> AuthorDate: Fri Oct 23 20:55:18 2026 +0200 Cleanup after jdbc-pool testsuite refactoring Since there are so many defects to fix, the intent of the refactoring was to have a decent base testsuite that will be heavily expanded upon while adding fixes. Most tests are now based on a real database. Also takes much less time to run (except TestInterceptorSemantics which may need some improvements), another very important thing to allow efficient work. Will sync the Ant build eventually with the updated testsuite. --- .../java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java | 1 - .../src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java | 1 - .../org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java | 1 - .../test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java | 1 - .../test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java | 2 -- .../test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java | 1 - .../org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java | 2 -- .../src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java | 1 - .../src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java | 2 -- .../src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java | 1 - .../src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java | 1 - .../java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java | 4 ---- .../test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java | 1 - .../src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java | 1 - .../src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java | 3 --- .../src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java | 2 -- .../apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java | 4 ---- .../apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java | 1 - .../org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java | 1 - .../apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java | 1 - .../apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java | 3 --- .../src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java | 1 - 22 files changed, 36 deletions(-) diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java index bc8c2e7074..fca2da18f2 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAlternateCredentials.java @@ -37,7 +37,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected functionality of borrowing with credentials other than the diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java index 168e7381b1..99893195c9 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestAsyncBorrow.java @@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected functionality of the asynchronous borrow API diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java index 58f57605d2..702f4493cb 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionAcquireRelease.java @@ -36,7 +36,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected functionality of borrowing connections from the pool, diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java index 129787bdad..fe7b2110c6 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestConnectionSetup.java @@ -30,7 +30,6 @@ import org.junit.jupiter.params.provider.NullAndEmptySource; import org.junit.jupiter.params.provider.ValueSource; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState; /** diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java index 9a24c4c73b..e029d66218 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestFairBlockingQueue.java @@ -32,8 +32,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; -import org.apache.tomcat.jdbc.pool.FairBlockingQueue; - /** * Expected functionality of the idle-connection queue the pool uses when * the fair queue is enabled: unbounded offering, most-recently-used diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java index 717c424c23..ca6542cd9e 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestInterruptedWaiter.java @@ -28,7 +28,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * A borrower that is interrupted while waiting for a connection must diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java index e28325318b..da51846752 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestJdbcInterceptorConfigParsing.java @@ -24,10 +24,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; -import org.apache.tomcat.jdbc.pool.PoolProperties; import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition; import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty; -import org.apache.tomcat.jdbc.pool.TrapException; /** * Configuration only, no database and no pool: how the diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java index fc0da056c5..742594f788 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolEviction.java @@ -30,7 +30,6 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected pool sizing behaviour: idle capping on return, the min-idle diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java index fc1ece4043..820b1ad8f6 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPoolProperties.java @@ -25,8 +25,6 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.apache.tomcat.jdbc.pool.PoolProperties; - /** * Configuration only, no database and no pool: {@code PoolProperties} * renders itself for logging and diagnostics. The rendering must not leak diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java index 080221cb3b..94f0aac8ae 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestProxyContract.java @@ -32,7 +32,6 @@ import javax.sql.PooledConnection; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected contract of the {@link java.sql.Connection} object the pool diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java index 3fad4679db..8ed869f046 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestPurge.java @@ -24,7 +24,6 @@ import java.sql.Connection; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected functionality of {@code purge()} and {@code purgeOnReturn()}: diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java index aac9e0bfad..d6246ce82c 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestShouldForceReconnect.java @@ -28,10 +28,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.apache.tomcat.jdbc.pool.ConnectionPool; -import org.apache.tomcat.jdbc.pool.PoolProperties; -import org.apache.tomcat.jdbc.pool.PooledConnection; - /** * The credential half of the pool's decision "must this idle session be * re-established for the borrower that asks for it?", checked in diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java index 7bd8e2845e..d055e86614 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestStatementExecution.java @@ -33,7 +33,6 @@ import java.sql.Statement; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected functionality of executing statements (DDL, DML, queries, diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java index bd66b09c8e..1c93d1229d 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestTransaction.java @@ -26,7 +26,6 @@ import java.sql.Statement; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; /** * Expected transaction functionality of pooled connections: commit, diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java index c4dae4eb81..63f6114235 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestValidation.java @@ -30,9 +30,6 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.PooledConnection; -import org.apache.tomcat.jdbc.pool.Validator; /** * Expected validation functionality of the pool: which checks run when, diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java index 69c433e849..afb26a93b5 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/TestXaConnection.java @@ -34,8 +34,6 @@ import javax.transaction.xa.Xid; import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; -import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.XADataSource; /** * Expected XA functionality: with a real XA-capable data source diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java index d21e305fbb..3f10dc88b8 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorLifecycle.java @@ -18,12 +18,10 @@ package org.apache.tomcat.jdbc.pool.interceptor; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.lang.reflect.Proxy; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; @@ -33,8 +31,6 @@ import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.JdbcInterceptor; -import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport; /** * Expected functionality of the interceptor configuration a resource diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java index dc9d549844..28e590890d 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptorSemantics.java @@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport; /** * Expected functionality of the interceptor chain, exercised against diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java index b4f948135b..008002b153 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestSessionState.java @@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState; /** * Expected functionality of session state across borrowers: a borrower diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java index 48c444b791..bb2d69b753 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementCacheReuse.java @@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.interceptor.StatementCache; /** * Expected functionality of the pool's own statement cache: a prepared diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java index 5f903ca1bd..1747b1dab3 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestStatementLifecycle.java @@ -38,9 +38,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.interceptor.StatementCache; -import org.apache.tomcat.jdbc.pool.interceptor.StatementDecoratorInterceptor; -import org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer; /** * Expected functionality of the statement decorators: statements an diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java index 1256f1cb8d..7759b5a479 100644 --- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java +++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/jmx/TestJmxMonitor.java @@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test; import org.apache.tomcat.jdbc.JdbcPoolBaseTest; import org.apache.tomcat.jdbc.pool.DataSource; -import org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean; /** * Expected JMX monitoring functionality. A container registers the --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
