postgresql-jdbc.git / summary / log / commit / refs
commit b3417bd7731a1cdf705fbbddd87d15fefbfa2f5b
Author: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue Mar 17 09:50:34 2026 +0000
chore: suppress deprecations in test code to reduce build verbosity
Even though we deprecated some of the classes long ago, we still have to test
them, so we have to use deprecated classes in test code.
Perviously we ignored javac warnings in test code, and it did produce a number of
warnings like "warning: [deprecation] getTimestampUtils() in BaseConnection has been deprecated"
Explicit suppression would allow us to catch new warnings early,
and it would help LLMs by reducing the volume of the build logs
.../src/main/kotlin/build-logic.java.gradle.kts | 2 +-
.../test/osgi/DataSourceFactoryTest.java | 3 ++-
.../org/postgresql/jdbc/AbstractArraysTest.java | 2 ++
.../java/org/postgresql/test/jdbc2/DateTest.java | 1 +
.../org/postgresql/test/jdbc2/IntervalTest.java | 1 +
.../test/jdbc2/PreparedStatementTest.java | 1 +
.../org/postgresql/test/jdbc2/ResultSetTest.java | 1 +
.../java/org/postgresql/test/jdbc2/TimeTest.java | 2 ++
.../org/postgresql/test/jdbc2/TimestampTest.java | 2 ++
.../postgresql/test/jdbc2/TimezoneCachingTest.java | 5 +++++
.../optional/BaseDataSourceFailoverUrlsTest.java | 2 ++
.../test/jdbc2/optional/BaseDataSourceTest.java | 1 +
.../optional/CaseOptimiserDataSourceTest.java | 8 +++++---
.../test/jdbc2/optional/ConnectionPoolTest.java | 9 +++++----
.../test/jdbc2/optional/PoolingDataSourceTest.java | 21 +++++++++++++--------
.../test/jdbc2/optional/SimpleDataSourceTest.java | 4 ++--
.../optional/SimpleDataSourceWithSetURLTest.java | 5 +++--
.../optional/SimpleDataSourceWithUrlTest.java | 4 ++--
.../org/postgresql/test/jdbc4/WrapperTest.java | 1 +
.../test/osgi/PGDataSourceFactoryTest.java | 22 +++++++++++++---------
.../test/ssl/LibPQFactoryHostNameTest.java | 4 ++--
21 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index 4991443e..044a7243 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -75,7 +75,7 @@ tasks.configureEach<JavaCompile> {
compilerArgs.add("-Xmaxerrs")
compilerArgs.add("1")
}
- if (buildParameters.failOnJavacWarning && !name.contains("Test")) {
+ if (buildParameters.failOnJavacWarning) {
compilerArgs.add("-Werror")
}
}
diff --git a/pgjdbc-osgi-test/src/test/java/org/postgresql/test/osgi/DataSourceFactoryTest.java b/pgjdbc-osgi-test/src/test/java/org/postgresql/test/osgi/DataSourceFactoryTest.java
index 97ecc59d..6776acd6 100644
--- a/pgjdbc-osgi-test/src/test/java/org/postgresql/test/osgi/DataSourceFactoryTest.java
+++ b/pgjdbc-osgi-test/src/test/java/org/postgresql/test/osgi/DataSourceFactoryTest.java
@@ -74,7 +74,8 @@ public class DataSourceFactoryTest {
String filterCondition = "(&(objectClass=" + DataSourceFactory.class.getName() + ")"
+ "(" + DataSourceFactory.OSGI_JDBC_DRIVER_NAME + "=PostgreSQL JDBC Driver))";
Filter filter = bundleContext.createFilter(filterCondition);
- ServiceTracker tracker = new ServiceTracker(bundleContext, filter, null);
+ ServiceTracker<DataSourceFactory, DataSourceFactory> tracker =
+ new ServiceTracker<>(bundleContext, filter, null);
tracker.open();
Assert.assertNotNull("Unable to lookup dataSourceFactory with " + filterCondition,
tracker.getService());
diff --git a/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java b/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java
index fea46799..f6a8bcd4 100644
--- a/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/jdbc/AbstractArraysTest.java
@@ -386,6 +386,7 @@ public abstract class AbstractArraysTest<A> {
* {@inheritDoc}
*/
@Override
+ @SuppressWarnings("deprecation")
public TimestampUtils getTimestampUtils() {
throw new UnsupportedOperationException();
}
@@ -959,6 +960,7 @@ public abstract class AbstractArraysTest<A> {
* {@inheritDoc}
*/
@Override
+ @SuppressWarnings("deprecation")
public void addDataType(String type, String className) {
throw new UnsupportedOperationException();
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateTest.java
index 48532385..75d990f2 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DateTest.java
@@ -320,6 +320,7 @@ public class DateTest extends BaseTest4 {
st.close();
}
+ @SuppressWarnings("deprecation")
private static java.sql.Date makeDate(int y, int m, int d) {
return new java.sql.Date(y - 1900, m - 1, d);
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/IntervalTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/IntervalTest.java
index 5de34e23..790c2f82 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/IntervalTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/IntervalTest.java
@@ -487,6 +487,7 @@ class IntervalTest {
assertEquals(1, pgi.getMicroSeconds());
}
+ @SuppressWarnings("deprecation")
private static java.sql.Date makeDate(int y, int m, int d) {
return new java.sql.Date(y - 1900, m - 1, d);
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
index 9d16110e..7d67114d 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
@@ -1203,6 +1203,7 @@ public class PreparedStatementTest extends BaseTest4 {
}
@Test
+ @SuppressWarnings("deprecation")
public void testSetTinyIntFloat() throws SQLException {
PreparedStatement pstmt = con
.prepareStatement("CREATE temp TABLE tiny_int (max_val int4, min_val int4, null_val int4)");
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
index bce9ff95..f9dd6dcf 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -1427,6 +1427,7 @@ public class ResultSetTest extends BaseTest4 {
}
@Override
+ @SuppressWarnings("deprecation")
public Integer call() throws SQLException {
int year = expectedYear;
try (Statement statement = connection.createStatement()) {
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimeTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimeTest.java
index b0d4179a..e400716e 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimeTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimeTest.java
@@ -57,6 +57,7 @@ class TimeTest {
* Test use of calendar
*/
@Test
+ @SuppressWarnings("deprecation")
void getTimeZone() throws Exception {
final Time midnight = new Time(0, 0, 0);
Statement stmt = con.createStatement();
@@ -197,6 +198,7 @@ class TimeTest {
/*
* Helper for the TimeTests. It tests what should be in the db
*/
+ @SuppressWarnings("deprecation")
private void timeTest() throws SQLException {
Statement st = con.createStatement();
ResultSet rs;
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java
index 5d4dd397..5d3f92c2 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimestampTest.java
@@ -199,6 +199,7 @@ public class TimestampTest extends BaseTest4 {
* value (don't use setTimestamp) then see that we get back the same value from getTimestamp
*/
@Test
+ @SuppressWarnings("deprecation")
public void testGetTimestampWTZ() throws SQLException {
assumeTrue(TestUtil.haveIntegerDateTimes(con));
@@ -315,6 +316,7 @@ public class TimestampTest extends BaseTest4 {
* getTimestamp
*/
@Test
+ @SuppressWarnings("deprecation")
public void testGetTimestampWOTZ() throws SQLException {
assumeTrue(TestUtil.haveIntegerDateTimes(con));
//Refer to #896
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneCachingTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneCachingTest.java
index b700aa32..745d0d66 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneCachingTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/TimezoneCachingTest.java
@@ -39,6 +39,7 @@ public class TimezoneCachingTest extends BaseTest4 {
* Test to check the internal cached timezone of a prepared statement is set/cleared as expected.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testPreparedStatementCachedTimezoneInstance() throws SQLException {
Timestamp ts = new Timestamp(2016 - 1900, 0, 31, 0, 0, 0, 0);
Date date = new Date(2016 - 1900, 0, 31);
@@ -102,6 +103,7 @@ public class TimezoneCachingTest extends BaseTest4 {
* Test to check the internal cached timezone of a prepared statement is used as expected.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testPreparedStatementCachedTimezoneUsage() throws SQLException {
Timestamp ts = new Timestamp(2016 - 1900, 0, 31, 0, 0, 0, 0);
Statement stmt = null;
@@ -204,6 +206,7 @@ public class TimezoneCachingTest extends BaseTest4 {
* Test to check the internal cached timezone of a result set is set/cleared as expected.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testResultSetCachedTimezoneInstance() throws SQLException {
Timestamp ts = new Timestamp(2016 - 1900, 0, 31, 0, 0, 0, 0);
TimeZone tz = TimeZone.getDefault();
@@ -251,6 +254,7 @@ public class TimezoneCachingTest extends BaseTest4 {
* Test to check the internal cached timezone of a result set is used as expected.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testResultSetCachedTimezoneUsage() throws SQLException {
Statement stmt = null;
PreparedStatement pstmt = null;
@@ -339,6 +343,7 @@ public class TimezoneCachingTest extends BaseTest4 {
/* Set up the fixture for this test case: a connection to a database with
a table for this test. */
+ @SuppressWarnings("deprecation")
public void setUp() throws Exception {
super.setUp();
TimestampUtils timestampUtils = ((BaseConnection) con).getTimestampUtils();
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceFailoverUrlsTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceFailoverUrlsTest.java
index 2efc8d45..244b7a7d 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceFailoverUrlsTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceFailoverUrlsTest.java
@@ -49,6 +49,7 @@ class BaseDataSourceFailoverUrlsTest {
}
@Test
+ @SuppressWarnings("deprecation")
void nullPorts() {
BaseDataSource bds = newDS();
bds.setDatabaseName("database");
@@ -59,6 +60,7 @@ class BaseDataSourceFailoverUrlsTest {
}
@Test
+ @SuppressWarnings("deprecation")
void emptyPorts() {
BaseDataSource bds = newDS();
bds.setDatabaseName("database");
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
index 95ed5d1c..5635c131 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
@@ -94,6 +94,7 @@ public abstract class BaseDataSourceTest extends BaseTest4 {
*/
protected abstract void initializeDataSource() throws PSQLException;
+ @SuppressWarnings("deprecation")
public static void setupDataSource(BaseDataSource bds) throws PSQLException {
bds.setServerName(TestUtil.getServer());
bds.setPortNumber(TestUtil.getPort());
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/CaseOptimiserDataSourceTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/CaseOptimiserDataSourceTest.java
index abd41551..013c3dc3 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/CaseOptimiserDataSourceTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/CaseOptimiserDataSourceTest.java
@@ -5,12 +5,12 @@
package org.postgresql.test.jdbc2.optional;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.postgresql.core.BaseConnection;
import org.postgresql.ds.common.BaseDataSource;
-import org.postgresql.jdbc2.optional.SimpleDataSource;
import org.postgresql.test.TestUtil;
import org.postgresql.util.PSQLException;
@@ -49,7 +49,7 @@ public class CaseOptimiserDataSourceTest {
@BeforeEach
void setUp() throws SQLException {
try (Connection conn = getDataSourceConnection()) {
- assertTrue(conn instanceof BaseConnection);
+ assertInstanceOf(BaseConnection.class, conn);
BaseConnection bc = (BaseConnection) conn;
assertTrue(bc.isColumnSanitiserDisabled(),
"Expected state [TRUE] of base connection configuration failed test.");
@@ -91,14 +91,16 @@ public class CaseOptimiserDataSourceTest {
return bds.getConnection();
}
+ @SuppressWarnings("deprecation")
protected void initializeDataSource() throws PSQLException {
if (bds == null) {
- bds = new SimpleDataSource();
+ bds = new org.postgresql.jdbc2.optional.SimpleDataSource();
setupDataSource(bds);
bds.setDisableColumnSanitiser(true);
}
}
+ @SuppressWarnings("deprecation")
public static void setupDataSource(BaseDataSource bds) throws PSQLException {
bds.setServerName(TestUtil.getServer());
bds.setPortNumber(TestUtil.getPort());
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java
index 19d608de..9a96b51c 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/ConnectionPoolTest.java
@@ -14,7 +14,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
import org.postgresql.core.ServerVersion;
import org.postgresql.ds.PGConnectionPoolDataSource;
-import org.postgresql.jdbc2.optional.ConnectionPool;
import org.postgresql.test.TestUtil;
import org.postgresql.util.PSQLException;
@@ -49,9 +48,10 @@ public class ConnectionPoolTest extends BaseDataSourceTest {
* Creates and configures a ConnectionPool.
*/
@Override
+ @SuppressWarnings("deprecation")
protected void initializeDataSource() throws PSQLException {
if (bds == null) {
- bds = new ConnectionPool();
+ bds = new org.postgresql.jdbc2.optional.ConnectionPool();
setupDataSource(bds);
}
}
@@ -491,8 +491,9 @@ public class ConnectionPoolTest extends BaseDataSourceTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void testSerializable() throws IOException, ClassNotFoundException {
- ConnectionPool pool = new ConnectionPool();
+ org.postgresql.jdbc2.optional.ConnectionPool pool = new org.postgresql.jdbc2.optional.ConnectionPool();
pool.setDefaultAutoCommit(false);
pool.setServerName("db.myhost.com");
pool.setDatabaseName("mydb");
@@ -506,7 +507,7 @@ public class ConnectionPoolTest extends BaseDataSourceTest {
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- ConnectionPool pool2 = (ConnectionPool) ois.readObject();
+ org.postgresql.jdbc2.optional.ConnectionPool pool2 = (org.postgresql.jdbc2.optional.ConnectionPool) ois.readObject();
assertEquals(pool.isDefaultAutoCommit(), pool2.isDefaultAutoCommit());
assertEquals(pool.getServerName(), pool2.getServerName());
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java
index 3ed3f49c..04d8be2d 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/PoolingDataSourceTest.java
@@ -10,7 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.fail;
import org.postgresql.ds.common.BaseDataSource;
-import org.postgresql.jdbc2.optional.PoolingDataSource;
import org.postgresql.util.PSQLException;
import org.junit.jupiter.api.Test;
@@ -29,9 +28,10 @@ public class PoolingDataSourceTest extends BaseDataSourceTest {
private static final String DS_NAME = "JDBC 2 SE Test DataSource";
@Override
+ @SuppressWarnings("deprecation")
public void tearDown() throws SQLException {
- if (bds instanceof PoolingDataSource) {
- ((PoolingDataSource) bds).close();
+ if (bds instanceof org.postgresql.jdbc2.optional.PoolingDataSource) {
+ ((org.postgresql.jdbc2.optional.PoolingDataSource) bds).close();
}
super.tearDown();
}
@@ -40,13 +40,16 @@ public class PoolingDataSourceTest extends BaseDataSourceTest {
* Creates and configures a new SimpleDataSource.
*/
@Override
+ @SuppressWarnings("deprecation")
protected void initializeDataSource() throws PSQLException {
if (bds == null) {
- bds = new PoolingDataSource();
+ org.postgresql.jdbc2.optional.PoolingDataSource ds =
+ new org.postgresql.jdbc2.optional.PoolingDataSource();
+ bds = ds;
setupDataSource(bds);
- ((PoolingDataSource) bds).setDataSourceName(DS_NAME);
- ((PoolingDataSource) bds).setInitialConnections(2);
- ((PoolingDataSource) bds).setMaxConnections(10);
+ ds.setDataSourceName(DS_NAME);
+ ds.setInitialConnections(2);
+ ds.setMaxConnections(10);
}
}
@@ -76,9 +79,11 @@ public class PoolingDataSourceTest extends BaseDataSourceTest {
* Check that 2 DS instances can't use the same name.
*/
@Test
+ @SuppressWarnings("deprecation")
public void testCantReuseName() throws PSQLException {
initializeDataSource();
- PoolingDataSource pds = new PoolingDataSource();
+ org.postgresql.jdbc2.optional.PoolingDataSource pds =
+ new org.postgresql.jdbc2.optional.PoolingDataSource();
try {
pds.setDataSourceName(DS_NAME);
fail("Should have denied 2nd DataSource with same name");
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java
index c8b7fa15..2785c444 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceTest.java
@@ -8,7 +8,6 @@ package org.postgresql.test.jdbc2.optional;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.postgresql.ds.PGSimpleDataSource;
-import org.postgresql.jdbc2.optional.SimpleDataSource;
import org.postgresql.util.PSQLException;
import org.junit.jupiter.api.Test;
@@ -24,9 +23,10 @@ public class SimpleDataSourceTest extends BaseDataSourceTest {
* Creates and configures a new SimpleDataSource.
*/
@Override
+ @SuppressWarnings("deprecation")
protected void initializeDataSource() throws PSQLException {
if (bds == null) {
- bds = new SimpleDataSource();
+ bds = new org.postgresql.jdbc2.optional.SimpleDataSource();
setupDataSource(bds);
}
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithSetURLTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithSetURLTest.java
index 07eb4129..f636cadd 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithSetURLTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithSetURLTest.java
@@ -9,7 +9,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.postgresql.Driver.parseURL;
import org.postgresql.PGProperty;
-import org.postgresql.jdbc2.optional.SimpleDataSource;
import org.postgresql.test.TestUtil;
import org.postgresql.util.PSQLException;
@@ -25,9 +24,10 @@ public class SimpleDataSourceWithSetURLTest extends BaseDataSourceTest {
* Creates and configures a new SimpleDataSource using setURL method.
*/
@Override
+ @SuppressWarnings("deprecation")
protected void initializeDataSource() throws PSQLException {
if (bds == null) {
- bds = new SimpleDataSource();
+ bds = new org.postgresql.jdbc2.optional.SimpleDataSource();
bds.setURL(String.format("jdbc:postgresql://%s:%d/%s?prepareThreshold=%d", TestUtil.getServer(), TestUtil.getPort(), TestUtil.getDatabase(), TestUtil.getPrepareThreshold()));
bds.setUser(TestUtil.getUser());
bds.setPassword(TestUtil.getPassword());
@@ -49,6 +49,7 @@ public class SimpleDataSourceWithSetURLTest extends BaseDataSourceTest {
}
@Test
+ @SuppressWarnings("deprecation")
public void testSetURL() throws Exception {
initializeDataSource();
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithUrlTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithUrlTest.java
index 51f5fba4..2945dff8 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithUrlTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/optional/SimpleDataSourceWithUrlTest.java
@@ -5,7 +5,6 @@
package org.postgresql.test.jdbc2.optional;
-import org.postgresql.jdbc2.optional.SimpleDataSource;
import org.postgresql.test.TestUtil;
import org.postgresql.util.PSQLException;
@@ -19,9 +18,10 @@ public class SimpleDataSourceWithUrlTest extends BaseDataSourceTest {
* Creates and configures a new SimpleDataSource.
*/
@Override
+ @SuppressWarnings("deprecation")
protected void initializeDataSource() throws PSQLException {
if (bds == null) {
- bds = new SimpleDataSource();
+ bds = new org.postgresql.jdbc2.optional.SimpleDataSource();
bds.setUrl("jdbc:postgresql://" + TestUtil.getServer() + ":" + TestUtil.getPort() + "/"
+ TestUtil.getDatabase() + "?prepareThreshold=" + TestUtil.getPrepareThreshold());
bds.setUser(TestUtil.getUser());
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/WrapperTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/WrapperTest.java
index 4d631f33..25f6f46d 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/WrapperTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/WrapperTest.java
@@ -87,6 +87,7 @@ class WrapperTest {
}
@Test
+ @SuppressWarnings("deprecation")
void connectionUnwrapPGDataSource() throws SQLException {
PGSimpleDataSource dataSource = new PGSimpleDataSource();
dataSource.setDatabaseName(TestUtil.getDatabase());
diff --git a/pgjdbc/src/test/java/org/postgresql/test/osgi/PGDataSourceFactoryTest.java b/pgjdbc/src/test/java/org/postgresql/test/osgi/PGDataSourceFactoryTest.java
index d1d00f11..683eabce 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/osgi/PGDataSourceFactoryTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/osgi/PGDataSourceFactoryTest.java
@@ -6,12 +6,10 @@
package org.postgresql.test.osgi;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.postgresql.jdbc2.optional.ConnectionPool;
-import org.postgresql.jdbc2.optional.PoolingDataSource;
-import org.postgresql.jdbc2.optional.SimpleDataSource;
import org.postgresql.osgi.PGDataSourceFactory;
import org.postgresql.xa.PGXADataSource;
@@ -48,19 +46,22 @@ class PGDataSourceFactoryTest {
}
@Test
+ @SuppressWarnings("deprecation")
void createDataSourceSimple() throws Exception {
Properties properties = new Properties();
properties.put(DataSourceFactory.JDBC_DATABASE_NAME, "db");
properties.put("currentSchema", "schema");
DataSource dataSource = dataSourceFactory.createDataSource(properties);
assertNotNull(dataSource);
- assertTrue(dataSource instanceof SimpleDataSource);
- SimpleDataSource simpleDataSource = (SimpleDataSource) dataSource;
+ assertInstanceOf(org.postgresql.jdbc2.optional.SimpleDataSource.class, dataSource);
+ org.postgresql.jdbc2.optional.SimpleDataSource simpleDataSource =
+ (org.postgresql.jdbc2.optional.SimpleDataSource) dataSource;
assertEquals("db", simpleDataSource.getDatabaseName());
assertEquals("schema", simpleDataSource.getCurrentSchema());
}
@Test
+ @SuppressWarnings("deprecation")
void createDataSourcePooling() throws Exception {
Properties properties = new Properties();
properties.put(DataSourceFactory.JDBC_DATABASE_NAME, "db");
@@ -68,8 +69,9 @@ class PGDataSourceFactoryTest {
properties.put(DataSourceFactory.JDBC_MAX_POOL_SIZE, "10");
DataSource dataSource = dataSourceFactory.createDataSource(properties);
assertNotNull(dataSource);
- assertTrue(dataSource instanceof PoolingDataSource);
- PoolingDataSource poolingDataSource = (PoolingDataSource) dataSource;
+ assertInstanceOf(org.postgresql.jdbc2.optional.PoolingDataSource.class, dataSource);
+ org.postgresql.jdbc2.optional.PoolingDataSource poolingDataSource =
+ (org.postgresql.jdbc2.optional.PoolingDataSource) dataSource;
assertEquals("db", poolingDataSource.getDatabaseName());
assertEquals(5, poolingDataSource.getInitialConnections());
assertEquals(10, poolingDataSource.getMaxConnections());
@@ -82,14 +84,16 @@ class PGDataSourceFactoryTest {
}
@Test
+ @SuppressWarnings("deprecation")
void createConnectionPoolDataSourceConfigured() throws Exception {
Properties properties = new Properties();
properties.put(DataSourceFactory.JDBC_DATABASE_NAME, "db");
ConnectionPoolDataSource dataSource =
dataSourceFactory.createConnectionPoolDataSource(properties);
assertNotNull(dataSource);
- assertTrue(dataSource instanceof ConnectionPool);
- ConnectionPool connectionPoolDataSource = (ConnectionPool) dataSource;
+ assertInstanceOf(org.postgresql.jdbc2.optional.ConnectionPool.class, dataSource);
+ org.postgresql.jdbc2.optional.ConnectionPool connectionPoolDataSource =
+ (org.postgresql.jdbc2.optional.ConnectionPool) dataSource;
assertEquals("db", connectionPoolDataSource.getDatabaseName());
}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java b/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
index e8feab41..04f851ff 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/ssl/LibPQFactoryHostNameTest.java
@@ -8,7 +8,6 @@ package org.postgresql.test.ssl;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.postgresql.ssl.PGjdbcHostnameVerifier;
-import org.postgresql.ssl.jdbc4.LibPQFactory;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -41,8 +40,9 @@ public class LibPQFactoryHostNameTest {
@MethodSource("data")
@ParameterizedTest
+ @SuppressWarnings("deprecation")
void checkPattern(String hostname, String pattern, boolean expected) throws Exception {
- assertEquals(expected, LibPQFactory.verifyHostName(hostname, pattern), hostname + ", pattern: " + pattern);
+ assertEquals(expected, org.postgresql.ssl.jdbc4.LibPQFactory.verifyHostName(hostname, pattern), hostname + ", pattern: " + pattern);
assertEquals(expected, PGjdbcHostnameVerifier.INSTANCE.verifyHostName(hostname, pattern), hostname + ", pattern: " + pattern);
}
[parent: d3b7c8429a48]