Merge 30ba8e1 into 5ffbba5

pom.xml

@@ -154,6 +154,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.9.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <distributionManagement>

src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolFactoryCreateFailure.java

@@ -29,34 +29,18 @@
 import org.apache.commons.pool2.Waiter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import java.lang.Exception;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.spy;
+import java.lang.Object;
 
 /**
  * @author Pavel Kolesov as contributed in POOL-340
  */
 public class TestGenericObjectPoolFactoryCreateFailure {
 
-    private static class SingleObjectFactory extends BasePooledObjectFactory<Object> {
-        private final AtomicBoolean created = new AtomicBoolean();
-
-        @Override
-        public Object create() throws Exception {
-            if (!created.getAndSet(true)) {
-                return new Object();
-            }
-            throw new Exception("Already created");
-        }
-
-        @Override
-        public boolean validateObject(final PooledObject<Object> p) {
-            return true;
-        }
-
-        @Override
-        public PooledObject<Object> wrap(final Object obj) {
-            return new DefaultPooledObject<>(new Object());
-        }
-    }
-
     private static class WinnerRunnable implements Runnable {
         private final CountDownLatch barrier;
         private final AtomicBoolean failed;
@@ -98,8 +82,22 @@ private static void println(final String msg) {
 
     @Test
     @Timeout(value = 10_000, unit = TimeUnit.MILLISECONDS)
-    public void testBorrowObjectStuck() {
-        final SingleObjectFactory factory = new SingleObjectFactory();
+    public void testBorrowObjectStuck() throws Exception {
+        // Create variables for tracking behaviors of mock object
+        AtomicBoolean factoryCreated = new AtomicBoolean();
+        // Construct mock object
+        final BasePooledObjectFactory<Object> factory = spy(BasePooledObjectFactory.class);
+        // Method Stubs
+        doAnswer((stubInvo) -> {
+            return new DefaultPooledObject<>(new Object());
+        }).when(factory).wrap(any(Object.class));
+        doAnswer((stubInvo) -> {
+            if (!factoryCreated.getAndSet(true)) {
+                return new Object();
+            }
+            throw new Exception("Already created");
+        }).when(factory).create();
+        doReturn(true).when(factory).validateObject(any(PooledObject.class));
         final GenericObjectPoolConfig<Object> config = new GenericObjectPoolConfig<>();
         config.setMaxIdle(1);
         config.setMaxTotal(1);
@@ -121,7 +119,7 @@ public void testBorrowObjectStuck() {
             thread1.start();
 
             // wait for object to be created
-            while (!factory.created.get()) {
+            while (!factoryCreated.get()) {
                 Waiter.sleepQuietly(5);
             }