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 2021/06/23 11:24:13 UTC
[commons-dbcp] branch master updated: Simplify Assertions (#113)
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 0d05cc7 Simplify Assertions (#113)
0d05cc7 is described below
commit 0d05cc7efe5db15bfcd11b67fccfdb49c1374419
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Jun 23 13:24:03 2021 +0200
Simplify Assertions (#113)
---
src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java | 3 ++-
src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java | 3 ++-
.../apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java | 3 ++-
.../commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
index 1ce6917..71c0d7e 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -473,7 +474,7 @@ public abstract class TestConnectionPool {
conn[i] = newConnection();
for(int j=0;j<i;j++) {
assertNotSame(conn[j], conn[i]);
- assertFalse(conn[j].equals(conn[i]));
+ assertNotEquals(conn[j], conn[i]);
}
}
for (final Connection element : conn) {
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
index 3de17b5..0a76425 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
@@ -19,6 +19,7 @@ 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.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -165,7 +166,7 @@ public class TestPoolingDriver extends TestConnectionPool {
conn[i] = DriverManager.getConnection("jdbc:apache:commons:dbcp:neusoftim");
for(int j=0;j<i;j++) {
assertNotSame(conn[j], conn[i]);
- assertFalse(conn[j].equals(conn[i]));
+ assertNotEquals(conn[j], conn[i]);
}
}
for(int i=0;i<25;i++) {
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 43d1eab..66381ce 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
@@ -19,6 +19,7 @@ package org.apache.commons.dbcp2.datasources;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -115,7 +116,7 @@ public class TestCPDSConnectionFactory {
// Ask for another connection
final PooledConnection pcon3 = pool.borrowObject().getPooledConnection();
- assertFalse(pcon3.equals(pcon1)); // better not get baddie back
+ assertNotEquals(pcon3, pcon1); // better not get baddie back
assertFalse(pc.getListeners().contains(factory)); // verify cleanup
assertEquals(2, pool.getNumActive());
assertEquals(0, pool.getNumIdle());
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 a62937e..538d090 100644
--- a/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
@@ -19,6 +19,7 @@ package org.apache.commons.dbcp2.datasources;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -123,7 +124,7 @@ public class TestKeyedCPDSConnectionFactory {
final PooledConnection pcon3 =
pool.borrowObject(key)
.getPooledConnection();
- assertFalse(pcon3.equals(pcon1)); // better not get baddie back
+ assertNotEquals(pcon3, pcon1); // better not get baddie back
assertFalse(pc.getListeners().contains(factory)); // verify cleanup
assertEquals(2, pool.getNumActive(key));
assertEquals(0, pool.getNumIdle(key));