[commons-pool] branch master updated: Fix tests (again, failing on GH, ok, locally).

[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 490f937  Fix tests (again, failing on GH, ok, locally).
490f937 is described below

commit 490f937c6f09dcea4a952d9049116056ed319698
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Aug 13 10:46:35 2021 -0400

    Fix tests (again, failing on GH, ok, locally).
---
 .../pool2/impl/TestDefaultPooledObject.java        | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

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 49cb6f9..40cb288 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestDefaultPooledObject.java
@@ -17,11 +17,12 @@
 package org.apache.commons.pool2.impl;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -49,12 +50,14 @@ 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(dpo.getActiveDuration(), 
greaterThanOrEqualTo(dpo.getIdleDuration()));
+        assertThat(1L, lessThanOrEqualTo(2L)); // sanity check
+        assertThat(Duration.ZERO, 
lessThanOrEqualTo(Duration.ZERO.plusNanos(1))); // sanity check
+        assertThat(dpo.getActiveDuration(), 
lessThanOrEqualTo(dpo.getIdleDuration()));
         // Depreacted
-        assertThat(dpo.getActiveDuration().toMillis(), 
greaterThanOrEqualTo(dpo.getActiveTimeMillis()));
-        assertThat(dpo.getActiveDuration(), 
greaterThanOrEqualTo(dpo.getActiveTime()));
-        assertThat(dpo.getActiveDuration(), 
greaterThanOrEqualTo(dpo.getIdleTime()));
-        assertThat(dpo.getActiveDuration().toMillis(), 
greaterThanOrEqualTo(dpo.getIdleTimeMillis()));
+        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()));
     }
 
     @Test
@@ -70,10 +73,10 @@ public class TestDefaultPooledObject {
         // We use greaterThanOrEqualTo instead of equal because "now" many be 
different when each argument is evaluated.
         assertThat(dpo.getIdleDuration(), 
greaterThanOrEqualTo(dpo.getActiveDuration()));
         // Depreacted
-        assertThat(dpo.getIdleDuration().toMillis(), 
greaterThanOrEqualTo(dpo.getIdleTimeMillis()));
-        assertThat(dpo.getIdleDuration(), 
greaterThanOrEqualTo(dpo.getIdleTime()));
-        assertThat(dpo.getIdleDuration(), 
greaterThanOrEqualTo(dpo.getActiveTime()));
-        assertThat(dpo.getIdleDuration().toMillis(), 
greaterThanOrEqualTo(dpo.getActiveTimeMillis()));
+        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()));
     }
 
     @Test