[commons-pool] branch master updated: Getting a PooledObject's active duration returns a negative duration when the object is borrowed but not returned. Affects: - PooledObject.getActiveDuration() - PooledObject.getActiveTime() - PooledObject.getActiveTimeMillis()

[ggregory]

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 cfc1464  Getting a PooledObject's active duration returns a negative 
duration when the object is borrowed but not returned. Affects: - 
PooledObject.getActiveDuration() - PooledObject.getActiveTime() - 
PooledObject.getActiveTimeMillis()
cfc1464 is described below

commit cfc1464a8a306c819ff186fd167b29b7c1552096
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Aug 12 17:47:00 2021 -0400

    Getting a PooledObject's active duration returns a negative duration
    when the object is borrowed but not returned. Affects:
    - PooledObject.getActiveDuration()
    - PooledObject.getActiveTime()
    - PooledObject.getActiveTimeMillis()
---
 pom.xml                                                        |  6 ++++++
 .../org/apache/commons/pool2/impl/TestDefaultPooledObject.java |  7 ++++---
 .../org/apache/commons/pool2/impl/TestGenericObjectPool.java   | 10 ++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index de095e0..c6708e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,12 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <distributionManagement>
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 9dd7c97..361db47 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
@@ -16,8 +16,9 @@
  */
 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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,8 +41,8 @@ public class TestDefaultPooledObject {
         Thread.sleep(200);
         assertFalse(dpo.getActiveDuration().isNegative());
         assertFalse(dpo.getActiveDuration().isZero());
-        assertEquals(dpo.getActiveDuration().toMillis(), 
dpo.getActiveTimeMillis());
-        assertEquals(dpo.getActiveDuration(), dpo.getActiveTime());
+        assertThat(dpo.getActiveDuration().toMillis(), 
lessThanOrEqualTo(dpo.getActiveTimeMillis()));
+        assertThat(dpo.getActiveDuration(), 
lessThanOrEqualTo(dpo.getActiveTime()));
     }
 
     /**
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 96ff12f..d40a4f6 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -18,6 +18,8 @@
 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.assertNotEquals;
@@ -1907,16 +1909,16 @@ public class TestGenericObjectPool extends 
TestBaseObjectPool {
         Thread.sleep(200);
         assertFalse(dpo.getActiveDuration().isNegative());
         assertFalse(dpo.getActiveDuration().isZero());
-        assertEquals(dpo.getActiveDuration().toMillis(), 
dpo.getActiveTimeMillis());
-        assertEquals(dpo.getActiveDuration(), dpo.getActiveTime());
+        assertThat(dpo.getActiveDuration().toMillis(), 
lessThanOrEqualTo(dpo.getActiveTimeMillis()));
+        assertThat(dpo.getActiveDuration(), 
lessThanOrEqualTo(dpo.getActiveTime()));
 
         // Return
         genericObjectPool.returnObject(object);
 
         assertFalse(dpo.getActiveDuration().isNegative());
         assertFalse(dpo.getActiveDuration().isZero());
-        assertEquals(dpo.getActiveDuration().toMillis(), 
dpo.getActiveTimeMillis());
-        assertEquals(dpo.getActiveDuration(), dpo.getActiveTime());
+        assertThat(dpo.getActiveDuration().toMillis(), 
lessThanOrEqualTo(dpo.getActiveTimeMillis()));
+        assertThat(dpo.getActiveDuration(), 
lessThanOrEqualTo(dpo.getActiveTime()));
     }
 
     @Test