allow reusing the same instance of ExponentialBackoff multiple times

Crowdstar · May 5, 2023 · 72b8937 · 72b8937
1 parent fb5d1f0
commit 72b8937
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/ExponentialBackoff.php b/src/ExponentialBackoff.php
@@ -101,6 +101,8 @@ public function __construct(AbstractRetryCondition $retryCondition, int $sapi =
      */
     public function run(Closure $c, ...$params)
     {
+         $this->currentAttempts = 1; // Force to reset # of current attempts.
+
         do {
             $result = $e = null;
 

diff --git a/tests/unit/ExponentialBackoffTest.php b/tests/unit/ExponentialBackoffTest.php
@@ -66,19 +66,23 @@ public function __construct(Helper $helper)
                         }
                         public function met($result, ?Exception $e): bool
                         {
-                            return $this->helper->reachExpectedAttempts();
+                            return $this->helper->getCurrentAttempts() - 1 > $this->helper->getExpectedFailedAttempts();
                         }
                     }
                 ),
                 function () use ($helper) {
-                    return $helper->getValue();
+                    return $helper->getValueAfterExpectedNumberOfFailedAttemptsWithEmptyReturnValuesReturned();
                 },
                 'fetch a value after 3 failed attempts through a self-defined retry function.',
             ],
         ];
     }
 
     /**
+     * There are two cases covered in this test:
+     *     1. Test successful retries with exponential backoff.
+     *     2. Test reusing the same instance of ExponentialBackoff multiple times.
+     *
      * @dataProvider dataSuccessfulRetries
      * @covers \CrowdStar\Backoff\ExponentialBackoff::run()
      */
@@ -88,10 +92,14 @@ public function testSuccessfulRetries(
         Closure $c,
         string $message
     ): void {
-        $helper->reset();
         $this->assertSame(1, getCurrentAttempts($backoff), 'current iteration should be 1 (not yet started)');
-        $this->assertSame($helper->getValue(), $backoff->run($c), $message);
-        $this->assertSame(4, getCurrentAttempts($backoff), 'current iteration should be 4 (after 4 attempts)');
+
+        // Reuse the same instance of ExponentialBackoff multiple times.
+        for ($i = 0; $i < 2; $i++) {
+            $helper->reset();
+            $this->assertSame($helper->getValue(), $backoff->run($c), $message);
+            $this->assertSame(4, getCurrentAttempts($backoff), 'current iteration should be 4 (after 4 attempts)');
+        }
     }
 
     public function dataDelays(): array