This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/POOL_2_X by this push:
new 9e85a36c Use simpler and better JUnit APIs
9e85a36c is described below
commit 9e85a36ca2e8c019212725c28b65454bcc420f35
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jan 18 17:05:02 2025 -0500
Use simpler and better JUnit APIs
---
pom.xml | 6 ---
.../pool2/impl/TestDefaultPooledObject.java | 25 +++++------
.../commons/pool2/impl/TestGenericObjectPool.java | 51 +++++++++++-----------
3 files changed, 36 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index e4b79920..0a2c12fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,12 +71,6 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
index f445e1a3..d2088eb2 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
@@ -16,12 +16,10 @@
*/
package org.apache.commons.pool2.impl;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
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.assertTrue;
import java.time.Duration;
import java.util.ArrayList;
@@ -101,14 +99,13 @@ public class TestDefaultPooledObject {
assertFalse(dpo.getActiveDuration().isNegative());
assertFalse(dpo.getActiveDuration().isZero());
// We use greaterThanOrEqualTo instead of equal because "now" many be
different when each argument is evaluated.
- assertThat(1L, lessThanOrEqualTo(2L)); // sanity check
- assertThat(Duration.ZERO,
lessThanOrEqualTo(Duration.ZERO.plusNanos(1))); // sanity check
- assertThat(dpo.getActiveDuration(),
lessThanOrEqualTo(dpo.getIdleDuration()));
+ assertTrue(Duration.ZERO.compareTo(Duration.ZERO.plusNanos(1)) <= 0);
+ assertTrue(dpo.getActiveDuration().compareTo(dpo.getIdleDuration()) <=
0);
// Deprecated
- assertThat(dpo.getActiveDuration().toMillis(),
lessThanOrEqualTo(dpo.getActiveTimeMillis()));
- assertThat(dpo.getActiveDuration(),
lessThanOrEqualTo(dpo.getActiveTime()));
- assertThat(dpo.getActiveDuration(),
lessThanOrEqualTo(dpo.getIdleTime()));
- assertThat(dpo.getActiveDuration().toMillis(),
lessThanOrEqualTo(dpo.getIdleTimeMillis()));
+ assertTrue(dpo.getActiveDuration().toMillis() <=
dpo.getActiveTimeMillis());
+ assertTrue(dpo.getActiveDuration().compareTo(dpo.getActiveTime()) <=
0);
+ assertTrue(dpo.getActiveDuration().compareTo(dpo.getIdleTime()) <= 0);
+ assertTrue(dpo.getActiveDuration().toMillis() <=
dpo.getIdleTimeMillis());
}
@Test
@@ -141,7 +138,7 @@ public class TestDefaultPooledObject {
final Duration duration2 = dpo.getFullDuration();
assertNotNull(duration2);
assertFalse(duration2.isNegative());
- assertThat(duration1, lessThan(duration2));
+ assertTrue(duration1.compareTo(duration2) < 0);
}
@Test
@@ -155,11 +152,11 @@ public class TestDefaultPooledObject {
assertFalse(dpo.getIdleDuration().isNegative());
assertFalse(dpo.getIdleDuration().isZero());
// We use greaterThanOrEqualTo instead of equal because "now" many be
different when each argument is evaluated.
- assertThat(dpo.getIdleDuration(),
lessThanOrEqualTo(dpo.getActiveDuration()));
+ assertTrue(dpo.getIdleDuration().compareTo(dpo.getActiveDuration()) <=
0);
// Deprecated
// assertThat(dpo.getIdleDuration().toMillis(),
lessThanOrEqualTo(dpo.getIdleTimeMillis()));
// assertThat(dpo.getIdleDuration(),
lessThanOrEqualTo(dpo.getIdleTime()));
- assertThat(dpo.getIdleDuration(),
lessThanOrEqualTo(dpo.getActiveTime()));
- assertThat(dpo.getIdleDuration().toMillis(),
lessThanOrEqualTo(dpo.getActiveTimeMillis()));
+ assertTrue(dpo.getIdleDuration().compareTo(dpo.getActiveTime()) <= 0);
+ assertTrue(dpo.getIdleDuration().toMillis() <=
dpo.getActiveTimeMillis());
}
}
\ No newline at end of file
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 a67531df..0060d752 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -17,8 +17,6 @@
package org.apache.commons.pool2.impl;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -47,6 +45,7 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -1137,12 +1136,13 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
final Instant lastReturnInstant1 = po.getLastReturnInstant();
final Instant lastUsedInstant1 = po.getLastUsedInstant();
- assertThat(po.getCreateInstant(),
lessThanOrEqualTo(lastBorrowInstant1));
- assertThat(po.getCreateInstant(),
lessThanOrEqualTo(lastReturnInstant1));
- assertThat(po.getCreateInstant(), lessThanOrEqualTo(lastUsedInstant1));
- assertThat(po.getCreateTime(),
lessThanOrEqualTo(lastBorrowInstant1.toEpochMilli()));
- assertThat(po.getCreateTime(),
lessThanOrEqualTo(lastReturnInstant1.toEpochMilli()));
- assertThat(po.getCreateTime(),
lessThanOrEqualTo(lastUsedInstant1.toEpochMilli()));
+ assertTrue(po.getCreateInstant().compareTo(lastBorrowInstant1) <= 0);
+ assertTrue(po.getCreateInstant().compareTo(lastReturnInstant1) <= 0);
+ assertTrue(po.getCreateInstant().compareTo(lastUsedInstant1) <= 0);
+ // Deprecated
+ assertTrue(po.getCreateTime() <= lastBorrowInstant1.toEpochMilli());
+ assertTrue(po.getCreateTime() <= lastReturnInstant1.toEpochMilli());
+ assertTrue(po.getCreateTime() <= lastUsedInstant1.toEpochMilli());
// Sleep MUST be "long enough" to detect that more than 0 milliseconds
have elapsed.
// Need an API in Java 8 to get the clock granularity.
@@ -1151,35 +1151,34 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
assertFalse(po.getActiveDuration().isNegative());
assertFalse(po.getActiveDuration().isZero());
// We use greaterThanOrEqualTo instead of equal because "now" many be
different when each argument is evaluated.
- assertThat(1L, lessThanOrEqualTo(2L)); // sanity check
- assertThat(Duration.ZERO,
lessThanOrEqualTo(Duration.ZERO.plusNanos(1))); // sanity check
- assertThat(po.getActiveDuration(),
lessThanOrEqualTo(po.getIdleDuration()));
+ assertTrue(Duration.ZERO.compareTo(Duration.ZERO.plusNanos(1)) <= 0);
// sanity check
+ assertTrue(po.getActiveDuration().compareTo(po.getIdleDuration()) <=
0);
// Deprecated
- assertThat(po.getActiveDuration().toMillis(),
lessThanOrEqualTo(po.getActiveTimeMillis()));
- assertThat(po.getActiveDuration(),
lessThanOrEqualTo(po.getActiveTime()));
+ assertTrue(po.getActiveDuration().toMillis() <=
po.getActiveTimeMillis());
+ assertTrue(po.getActiveDuration().compareTo(po.getIdleDuration()) <=
0);
//
// TODO How to compare ID with AD since other tests may have touched
the PO?
- assertThat(po.getActiveDuration(),
lessThanOrEqualTo(po.getIdleTime()));
- assertThat(po.getActiveDuration().toMillis(),
lessThanOrEqualTo(po.getIdleTimeMillis()));
+ assertTrue(po.getActiveDuration().compareTo(po.getIdleTime()) <= 0);
+ assertTrue(po.getActiveDuration().toMillis() <=
po.getIdleTimeMillis());
//
- assertThat(po.getCreateInstant(),
lessThanOrEqualTo(po.getLastBorrowInstant()));
- assertThat(po.getCreateInstant(),
lessThanOrEqualTo(po.getLastReturnInstant()));
- assertThat(po.getCreateInstant(),
lessThanOrEqualTo(po.getLastUsedInstant()));
+ assertTrue(po.getCreateInstant().compareTo(po.getLastBorrowInstant())
<= 0);
+ assertTrue(po.getCreateInstant().compareTo(po.getLastReturnInstant())
<= 0);
+ assertTrue(po.getCreateInstant().compareTo(po.getLastUsedInstant()) <=
0);
- assertThat(lastBorrowInstant1,
lessThanOrEqualTo(po.getLastBorrowInstant()));
- assertThat(lastReturnInstant1,
lessThanOrEqualTo(po.getLastReturnInstant()));
- assertThat(lastUsedInstant1,
lessThanOrEqualTo(po.getLastUsedInstant()));
+ assertTrue(lastBorrowInstant1.compareTo(po.getLastBorrowInstant()) <=
0);
+ assertTrue(lastReturnInstant1.compareTo(po.getLastReturnInstant()) <=
0);
+ assertTrue(lastUsedInstant1.compareTo(po.getLastUsedInstant()) <= 0);
genericObjectPool.returnObject(object);
assertFalse(po.getActiveDuration().isNegative());
assertFalse(po.getActiveDuration().isZero());
- assertThat(po.getActiveDuration().toMillis(),
lessThanOrEqualTo(po.getActiveTimeMillis()));
- assertThat(po.getActiveDuration(),
lessThanOrEqualTo(po.getActiveTime()));
+ assertTrue(po.getActiveDuration().toMillis() <=
po.getActiveTimeMillis());
+ assertTrue(po.getActiveDuration().compareTo(po.getActiveTime()) <= 0);
- assertThat(lastBorrowInstant1,
lessThanOrEqualTo(po.getLastBorrowInstant()));
- assertThat(lastReturnInstant1,
lessThanOrEqualTo(po.getLastReturnInstant()));
- assertThat(lastUsedInstant1,
lessThanOrEqualTo(po.getLastUsedInstant()));
+ assertTrue(lastBorrowInstant1.compareTo(po.getLastBorrowInstant()) <=
0);
+ assertTrue(lastReturnInstant1.compareTo(po.getLastReturnInstant()) <=
0);
+ assertTrue(lastUsedInstant1.compareTo(po.getLastUsedInstant()) <= 0);
}
/**
