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 2024/11/23 05:32:37 UTC
(commons-dbcp) branch master updated: Add basic missing tests in TestDelegatingConnection
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 cef23df8 Add basic missing tests in TestDelegatingConnection
cef23df8 is described below
commit cef23df8a91f22cef33f5cdfa45f2ee3ed788019
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 23 00:32:28 2024 -0500
Add basic missing tests in TestDelegatingConnection
---
.../commons/dbcp2/TestDelegatingConnection.java | 185 ++++++++++++++++++++-
1 file changed, 176 insertions(+), 9 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
index ad712526..f29273c6 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
@@ -20,33 +20,38 @@ package org.apache.commons.dbcp2;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
+import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.Savepoint;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
+ * Tests {@link DelegatingConnection}.
*/
public class TestDelegatingConnection {
/**
- * Delegate that doesn't support read-only or auto-commit.
- * It will merely take the input value of setReadOnly and
- * setAutoCommit and discard it, to keep false.
+ * Delegate that doesn't support read-only or auto-commit. It will merely take the input value of setReadOnly and setAutoCommit and discard it, to keep
+ * false.
*/
static class NoReadOnlyOrAutoCommitConnection extends TesterConnection {
private final boolean readOnly = false;
private final boolean autoCommit = false;
public NoReadOnlyOrAutoCommitConnection() {
- super("","");
+ super("", "");
}
@Override
@@ -71,13 +76,12 @@ public class TestDelegatingConnection {
}
/**
- * Delegate that will throw RTE on toString
- * Used to validate fix for DBCP-241
+ * Delegate that will throw RTE on toString Used to validate fix for DBCP-241
*/
static class RTEGeneratingConnection extends TesterConnection {
public RTEGeneratingConnection() {
- super("","");
+ super("", "");
}
@Override
@@ -90,9 +94,15 @@ public class TestDelegatingConnection {
private DelegatingConnection<? extends Connection> delegatingConnection;
private Connection connection;
private Connection connection2;
+ private DelegatingConnection<? extends Connection> h2DConnection;
private TesterStatement testerStatement;
private TesterResultSet testerResultSet;
+ @AfterEach
+ public void afterEach() throws SQLException {
+ h2DConnection.close();
+ }
+
@BeforeEach
public void setUp() throws Exception {
connection = new TesterConnection("test", "test");
@@ -100,6 +110,13 @@ public class TestDelegatingConnection {
delegatingConnection = new DelegatingConnection<>(connection);
testerStatement = new TesterStatement(delegatingConnection);
testerResultSet = new TesterResultSet(testerStatement);
+ h2DConnection = new DelegatingConnection<>(DriverManager.getConnection("jdbc:h2:mem:test"));
+ }
+
+ @Test
+ public void testAbort() throws Exception {
+ h2DConnection.abort(r -> {
+ });
}
@Test
@@ -153,7 +170,8 @@ public class TestDelegatingConnection {
delegatingConnection = new DelegatingConnection<>(pc);
pc.close();
delegatingConnection.close();
- try (PreparedStatement ps = delegatingConnection.prepareStatement("")){}
+ try (PreparedStatement ps = delegatingConnection.prepareStatement("")) {
+ }
fail("Expecting SQLException");
} catch (final SQLException ex) {
assertTrue(ex.getMessage().endsWith("is closed."));
@@ -169,6 +187,11 @@ public class TestDelegatingConnection {
}
}
+ @Test
+ public void testCommit() throws Exception {
+ h2DConnection.commit();
+ }
+
@Test
public void testConnectionToString() throws Exception {
final String s = delegatingConnection.toString();
@@ -176,11 +199,82 @@ public class TestDelegatingConnection {
assertFalse(s.isEmpty());
}
+ @Test
+ public void testCreateArrayOf() throws Exception {
+ assertNotNull(h2DConnection.createArrayOf("CHARACTER", new Object[] { "A", "B" }));
+ }
+
+ @Test
+ public void testCreateBlob() throws Exception {
+ assertNotNull(h2DConnection.createBlob());
+ }
+
+ @Test
+ public void testCreateClob() throws Exception {
+ assertNotNull(h2DConnection.createClob());
+ }
+
+ @Test
+ public void testCreateNClob() throws Exception {
+ assertNotNull(h2DConnection.createNClob());
+ }
+
+ @Test
+ public void testCreateSQLXML() throws Exception {
+ assertNotNull(h2DConnection.createSQLXML());
+ }
+
+ @Test
+ public void testCreateStruct() throws Exception {
+ // not supported by H2
+ assertThrows(SQLException.class, () -> h2DConnection.createStruct("CHARACTER", new Object[] { "A", "B" }));
+ }
+
+ @Test
+ public void testGetCacheState() throws Exception {
+ assertTrue(h2DConnection.getCacheState());
+ }
+
+ @Test
+ public void testGetClientInfo() throws Exception {
+ assertNotNull(h2DConnection.getClientInfo());
+ }
+
+ @Test
+ public void testGetClientInfoString() throws Exception {
+ assertNull(h2DConnection.getClientInfo("xyz"));
+ }
+
+ @Test
+ public void testGetDefaultQueryTimeout() throws Exception {
+ assertNull(h2DConnection.getDefaultQueryTimeout());
+ }
+
+ @Test
+ public void testGetDefaultQueryTimeoutDuration() throws Exception {
+ assertNull(h2DConnection.getDefaultQueryTimeoutDuration());
+ }
+
@Test
public void testGetDelegate() throws Exception {
assertEquals(connection, delegatingConnection.getDelegate());
}
+ @Test
+ public void testGetHoldability() throws Exception {
+ assertEquals(1, h2DConnection.getHoldability());
+ }
+
+ @Test
+ public void testGetNetworkTimeout() throws Exception {
+ assertEquals(0, h2DConnection.getNetworkTimeout());
+ }
+
+ @Test
+ public void testGetTypeMap() throws Exception {
+ assertNull(h2DConnection.getTypeMap());
+ }
+
@Test
public void testIsClosed() throws Exception {
delegatingConnection.checkOpen();
@@ -197,6 +291,19 @@ public class TestDelegatingConnection {
assertTrue(delegatingConnection.isClosed());
}
+ @SuppressWarnings("resource")
+ @Test
+ public 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 {
+ assertNotNull(h2DConnection.nativeSQL("select 1"));
+ }
+
@Test
public void testPassivateWithResultSetCloseException() {
try {
@@ -226,7 +333,7 @@ public class TestDelegatingConnection {
Assertions.assertEquals(2, ((SQLExceptionList) e).getCauseList().size());
} finally {
testerStatement.setSqlExceptionOnClose(false);
- testerResultSet.setSqlExceptionOnClose(false);
+ testerResultSet.setSqlExceptionOnClose(false);
}
}
@@ -256,4 +363,64 @@ public class TestDelegatingConnection {
assertFalse(delCon.isReadOnly());
}
+ @Test
+ public void testReleaseSavepoint() throws Exception {
+ final Savepoint s = h2DConnection.setSavepoint();
+ h2DConnection.releaseSavepoint(s);
+ }
+
+ @Test
+ public void testRollback() throws Exception {
+ h2DConnection.rollback();
+ }
+
+ @Test
+ public void testRollbackSavepoint() throws Exception {
+ h2DConnection.setAutoCommit(false);
+ try {
+ h2DConnection.rollback(h2DConnection.setSavepoint());
+ } finally {
+ h2DConnection.setAutoCommit(true);
+ }
+ }
+
+ @Test
+ public void testSetClientInfo() throws Exception {
+ // TODO
+ // h2DConnection.setClientInfo("ApplicationName", "app1");
+ }
+
+ @Test
+ public void testSetDefaultQueryTimeout() throws Exception {
+ final int expected = 1;
+ delegatingConnection.setDefaultQueryTimeout(expected);
+ assertEquals(expected, delegatingConnection.getDefaultQueryTimeout());
+ }
+
+ @Test
+ public void testSetHoldability() throws Exception {
+ final int expected = 1;
+ h2DConnection.setHoldability(expected);
+ assertEquals(expected, h2DConnection.getHoldability());
+ }
+
+ @Test
+ public void testSetNetworkTimeout() throws Exception {
+ h2DConnection.setNetworkTimeout(r -> {}, 1);
+ assertEquals(0, h2DConnection.getNetworkTimeout());
+ }
+
+ @Test
+ public void testSetSavepoint() throws Exception {
+ h2DConnection.setSavepoint();
+ }
+
+ @SuppressWarnings("javadoc")
+ @Test
+ public void testUnwrap() throws Exception {
+ assertNotNull(delegatingConnection.unwrap(delegatingConnection.getClass()));
+ assertNotNull(delegatingConnection.unwrap(delegatingConnection.getDelegate().getClass()));
+ assertThrows(SQLException.class, () -> delegatingConnection.unwrap(Integer.class));
+ }
+
}