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 2018/07/08 20:09:15 UTC
commons-dbcp git commit: Change indirect accesses to static members
to direct accesses (accesses through subtypes).
Repository: commons-dbcp
Updated Branches:
refs/heads/master 71f02c7b6 -> 6fdbd4f12
Change indirect accesses to static members to direct accesses (accesses
through subtypes).
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/6fdbd4f1
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/6fdbd4f1
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/6fdbd4f1
Branch: refs/heads/master
Commit: 6fdbd4f12282791d95d636d427e65b383f46febd
Parents: 71f02c7
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Jul 8 14:09:13 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jul 8 14:09:13 2018 -0600
----------------------------------------------------------------------
.../org/apache/commons/dbcp2/TestPStmtKey.java | 18 +++++++++---------
.../datasources/TestInstanceKeyDataSource.java | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6fdbd4f1/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
index a1002e8..2029cb6 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtKey.java
@@ -221,34 +221,34 @@ public class TestPStmtKey {
@Test
public void testEquals() {
final PStmtKey pStmtKey = new PStmtKey("SELECT 1", "catalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT);
assertTrue(pStmtKey.equals(pStmtKey));
assertFalse(pStmtKey.equals(null));
assertFalse(pStmtKey.equals(new Object()));
assertFalse(pStmtKey.equals(new PStmtKey("SELECT 2", "catalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT)));
assertFalse(pStmtKey.equals(new PStmtKey("SELECT 1", "anothercatalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT)));
assertFalse(pStmtKey.equals(new PStmtKey("SELECT 1", "catalog", "private",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT)));
assertFalse(pStmtKey.equals(new PStmtKey("SELECT 1", "catalog", "public",
- ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_SENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT)));
assertFalse(pStmtKey.equals(new PStmtKey("SELECT 1", "catalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_UPDATABLE,
StatementType.CALLABLE_STATEMENT)));
assertFalse(pStmtKey.equals(new PStmtKey("SELECT 1", "catalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.PREPARED_STATEMENT)));
assertTrue(pStmtKey.equals(new PStmtKey("SELECT 1", "catalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT)));
assertEquals(pStmtKey.hashCode(), new PStmtKey("SELECT 1", "catalog", "public",
- ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY,
+ java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, java.sql.ResultSet.CONCUR_READ_ONLY,
StatementType.CALLABLE_STATEMENT).hashCode());
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6fdbd4f1/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
----------------------------------------------------------------------
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 59a351d..37ff8f6 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
@@ -136,14 +136,14 @@ public class TestInstanceKeyDataSource {
@Test
public void testDefaultTransactionIsolation() {
- assertEquals(SharedPoolDataSource.UNKNOWN_TRANSACTIONISOLATION, spds.getDefaultTransactionIsolation());
+ assertEquals(InstanceKeyDataSource.UNKNOWN_TRANSACTIONISOLATION, spds.getDefaultTransactionIsolation());
spds.setDefaultTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
assertEquals(Connection.TRANSACTION_READ_COMMITTED, spds.getDefaultTransactionIsolation());
}
@Test(expected=IllegalArgumentException.class)
public void testDefaultTransactionIsolationInvalid() {
- assertEquals(SharedPoolDataSource.UNKNOWN_TRANSACTIONISOLATION, spds.getDefaultTransactionIsolation());
+ assertEquals(InstanceKeyDataSource.UNKNOWN_TRANSACTIONISOLATION, spds.getDefaultTransactionIsolation());
spds.setDefaultTransactionIsolation(Integer.MAX_VALUE);
}