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/05/27 12:16:12 UTC
[commons-pool] branch master updated: Change assertions with
simpler but equivalent calls. (#77)
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-pool.git
The following commit(s) were added to refs/heads/master by this push:
new c78aa6c Change assertions with simpler but equivalent calls. (#77)
c78aa6c is described below
commit c78aa6c17132cb41466c06d7cbb87b1f5a58c333
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu May 27 14:16:05 2021 +0200
Change assertions with simpler but equivalent calls. (#77)
---
.../pool2/impl/TestAbandonedObjectPool.java | 4 +--
.../pool2/impl/TestGenericKeyedObjectPool.java | 34 +++++++++++-----------
.../commons/pool2/impl/TestGenericObjectPool.java | 34 +++++++++++-----------
.../pool2/impl/TestLinkedBlockingDeque.java | 2 +-
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
index 0fccfcb..b300251 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
@@ -364,7 +364,7 @@ public class TestAbandonedObjectPool {
}
// Now, the number of active instances should be 0
- assertTrue( pool.getNumActive() == 0,"numActive should have been 0, was " + pool.getNumActive());
+ assertEquals(0, pool.getNumActive(), "numActive should have been 0, was " + pool.getNumActive());
}
public void testDestroyModeAbandoned() throws Exception {
@@ -423,7 +423,7 @@ public class TestAbandonedObjectPool {
pool.returnObject(obj); // evictor will run during validation
final PooledTestObject obj2 = pool.borrowObject();
assertEquals(obj, obj2); // should get original back
- assertTrue(!obj2.isDestroyed()); // and not destroyed
+ assertFalse(obj2.isDestroyed()); // and not destroyed
}
/**
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index 7e88f49..3759758 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -524,7 +524,7 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
assertTrue(lifo ? objZeroA.equals("04") : objZeroA.equals("02"));
assertEquals(2, intPool.getNumIdle(KEY_ZERO));
final String objZeroB = intPool.borrowObject(KEY_ZERO);
- assertTrue(objZeroB.equals("03"));
+ assertEquals("03", objZeroB);
assertEquals(1, intPool.getNumIdle(KEY_ZERO));
intPool.evict(); // Kill remaining 0 survivor and (1,5)
@@ -2085,27 +2085,27 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
gkoPool.preparePool(key);
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
final String[] active = new String[5];
active[0] = gkoPool.borrowObject(key);
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
for(int i=1 ; i<5 ; i++) {
active[i] = gkoPool.borrowObject(key);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
for(int i=0 ; i<5 ; i++) {
gkoPool.returnObject(key, active[i]);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 10,"Should be 10 idle, found " + gkoPool.getNumIdle());
+ assertEquals(10, gkoPool.getNumIdle(), "Should be 10 idle, found " + gkoPool.getNumIdle());
}
@Test
@@ -2122,44 +2122,44 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
final String key = "A";
gkoPool.preparePool(key);
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " +
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " +
gkoPool.getNumIdle());
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
final String[] active = new String[10];
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
for(int i=0 ; i<5 ; i++) {
active[i] = gkoPool.borrowObject(key);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
for(int i=0 ; i<5 ; i++) {
gkoPool.returnObject(key, active[i]);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 10,"Should be 10 idle, found " + gkoPool.getNumIdle());
+ assertEquals(10, gkoPool.getNumIdle(), "Should be 10 idle, found " + gkoPool.getNumIdle());
for(int i=0 ; i<10 ; i++) {
active[i] = gkoPool.borrowObject(key);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 0,"Should be 0 idle, found " + gkoPool.getNumIdle());
+ assertEquals(0, gkoPool.getNumIdle(), "Should be 0 idle, found " + gkoPool.getNumIdle());
for(int i=0 ; i<10 ; i++) {
gkoPool.returnObject(key, active[i]);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 10,"Should be 10 idle, found " + gkoPool.getNumIdle());
+ assertEquals(10, gkoPool.getNumIdle(), "Should be 10 idle, found " + gkoPool.getNumIdle());
}
@Test
@@ -2178,13 +2178,13 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
final String key = "A";
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 0,"Should be 0 idle, found " + gkoPool.getNumIdle());
+ assertEquals(0, gkoPool.getNumIdle(), "Should be 0 idle, found " + gkoPool.getNumIdle());
final Object active = gkoPool.borrowObject(key);
assertNotNull(active);
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(gkoPool.getNumIdle() == 5,"Should be 5 idle, found " + gkoPool.getNumIdle());
+ assertEquals(5, gkoPool.getNumIdle(), "Should be 5 idle, found " + gkoPool.getNumIdle());
}
/**
@@ -2371,19 +2371,19 @@ public class TestGenericKeyedObjectPool extends TestKeyedObjectPool {
gkoPool.setTestOnBorrow(true);
assertTrue(gkoPool.getTestOnBorrow());
gkoPool.setTestOnBorrow(false);
- assertTrue(!gkoPool.getTestOnBorrow());
+ assertFalse(gkoPool.getTestOnBorrow());
}
{
gkoPool.setTestOnReturn(true);
assertTrue(gkoPool.getTestOnReturn());
gkoPool.setTestOnReturn(false);
- assertTrue(!gkoPool.getTestOnReturn());
+ assertFalse(gkoPool.getTestOnReturn());
}
{
gkoPool.setTestWhileIdle(true);
assertTrue(gkoPool.getTestWhileIdle());
gkoPool.setTestWhileIdle(false);
- assertTrue(!gkoPool.getTestWhileIdle());
+ assertFalse(gkoPool.getTestWhileIdle());
}
{
gkoPool.setTimeBetweenEvictionRunsMillis(11235L);
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index 008f945..3fdf764 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -667,8 +667,8 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
// Order, oldest to youngest, is "0", "1", ...,"4"
genericObjectPool.evict(); // Should evict "0" and "1"
final Object obj = genericObjectPool.borrowObject();
- assertTrue(!obj.equals("0"),"oldest not evicted");
- assertTrue(!obj.equals("1"),"second oldest not evicted");
+ assertFalse(obj.equals("0"), "oldest not evicted");
+ assertFalse(obj.equals("1"), "second oldest not evicted");
// 2 should be next out for FIFO, 4 for LIFO
assertEquals(lifo ? "4" : "2" , obj,"Wrong instance returned");
}
@@ -1405,7 +1405,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
genericObjectPool.setTimeBetweenEvictionRuns(Duration.ofMillis(100));
borrowerThread.start(); // Off to the races
borrowerThread.join();
- assertTrue(!borrower.failed());
+ assertFalse(borrower.failed());
}
@Test
@@ -2304,27 +2304,27 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
genericObjectPool.setTestWhileIdle(true);
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 5,"Should be 5 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(5, genericObjectPool.getNumIdle(), "Should be 5 idle, found " + genericObjectPool.getNumIdle());
final String[] active = new String[5];
active[0] = genericObjectPool.borrowObject();
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 5,"Should be 5 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(5, genericObjectPool.getNumIdle(), "Should be 5 idle, found " + genericObjectPool.getNumIdle());
for(int i=1 ; i<5 ; i++) {
active[i] = genericObjectPool.borrowObject();
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 5,"Should be 5 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(5, genericObjectPool.getNumIdle(), "Should be 5 idle, found " + genericObjectPool.getNumIdle());
for(int i=0 ; i<5 ; i++) {
genericObjectPool.returnObject(active[i]);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 10,"Should be 10 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(10, genericObjectPool.getNumIdle(), "Should be 10 idle, found " + genericObjectPool.getNumIdle());
}
@Test
@@ -2339,40 +2339,40 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
genericObjectPool.setTestWhileIdle(true);
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 5,"Should be 5 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(5, genericObjectPool.getNumIdle(), "Should be 5 idle, found " + genericObjectPool.getNumIdle());
final String[] active = new String[10];
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 5,"Should be 5 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(5, genericObjectPool.getNumIdle(), "Should be 5 idle, found " + genericObjectPool.getNumIdle());
for (int i = 0; i < 5; i++) {
active[i] = genericObjectPool.borrowObject();
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 5,"Should be 5 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(5, genericObjectPool.getNumIdle(), "Should be 5 idle, found " + genericObjectPool.getNumIdle());
for(int i = 0 ; i < 5 ; i++) {
genericObjectPool.returnObject(active[i]);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 10,"Should be 10 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(10, genericObjectPool.getNumIdle(), "Should be 10 idle, found " + genericObjectPool.getNumIdle());
for (int i = 0; i < 10; i++) {
active[i] = genericObjectPool.borrowObject();
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 0,"Should be 0 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(0, genericObjectPool.getNumIdle(), "Should be 0 idle, found " + genericObjectPool.getNumIdle());
for (int i = 0; i < 10; i++) {
genericObjectPool.returnObject(active[i]);
}
try { Thread.sleep(150L); } catch(final InterruptedException e) { }
- assertTrue(genericObjectPool.getNumIdle() == 10,"Should be 10 idle, found " + genericObjectPool.getNumIdle());
+ assertEquals(10, genericObjectPool.getNumIdle(), "Should be 10 idle, found " + genericObjectPool.getNumIdle());
}
/**
@@ -2608,7 +2608,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
{
// The object receives an Exception during its creation to prevent
// memory leaks. See BaseGenericObjectPool constructor for more details.
- assertTrue(false == "".equals(genericObjectPool.getCreationStackTrace()));
+ assertEquals(false, "".equals(genericObjectPool.getCreationStackTrace()));
}
{
assertEquals(0, genericObjectPool.getBorrowedCount());
@@ -2668,19 +2668,19 @@ public class TestGenericObjectPool extends TestBaseObjectPool {
genericObjectPool.setTestOnBorrow(true);
assertTrue(genericObjectPool.getTestOnBorrow());
genericObjectPool.setTestOnBorrow(false);
- assertTrue(!genericObjectPool.getTestOnBorrow());
+ assertFalse(genericObjectPool.getTestOnBorrow());
}
{
genericObjectPool.setTestOnReturn(true);
assertTrue(genericObjectPool.getTestOnReturn());
genericObjectPool.setTestOnReturn(false);
- assertTrue(!genericObjectPool.getTestOnReturn());
+ assertFalse(genericObjectPool.getTestOnReturn());
}
{
genericObjectPool.setTestWhileIdle(true);
assertTrue(genericObjectPool.getTestWhileIdle());
genericObjectPool.setTestWhileIdle(false);
- assertTrue(!genericObjectPool.getTestWhileIdle());
+ assertFalse(genericObjectPool.getTestWhileIdle());
}
{
genericObjectPool.setTimeBetweenEvictionRunsMillis(11235L);
diff --git a/src/test/java/org/apache/commons/pool2/impl/TestLinkedBlockingDeque.java b/src/test/java/org/apache/commons/pool2/impl/TestLinkedBlockingDeque.java
index 8aac00f..f4730e1 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestLinkedBlockingDeque.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestLinkedBlockingDeque.java
@@ -473,7 +473,7 @@ public class TestLinkedBlockingDeque {
deque.add(ONE);
deque.add(ONE);
assertTrue(deque.removeLastOccurrence(ONE));
- assertTrue(deque.size() == 1);
+ assertEquals(1, deque.size());
}
@Test