Updated Throttle interface parity.

ScriptFUSION · Oct 23, 2022 · f66687a · f66687a
1 parent 9d436ca
commit f66687a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/Connector/ImportConnector.php b/src/Connector/ImportConnector.php
@@ -93,7 +93,7 @@ public function fetchAsync(AsyncDataSource $source): mixed
     {
         return retry(
             $this->maxFetchAttempts,
-            fn () => $this->throttle->watch($this->connector->fetchAsync(...), $source),
+            fn () => $this->throttle->async($this->connector->fetchAsync(...), $source),
             $this->createExceptionHandler()
         );
     }

diff --git a/test/Functional/ThrottlePrecedenceHierarchyTest.php b/test/Functional/ThrottlePrecedenceHierarchyTest.php
@@ -54,8 +54,8 @@ protected function setUp(): void
     public function testNonThrottledConnector(): void
     {
         $this->specification->setThrottle($this->specificationThrottle);
-        $this->specificationThrottle->expects('watch')->once()->andReturn(Future::complete());
-        $this->connectorThrottle->expects('watch')->never();
+        $this->specificationThrottle->expects('async')->once()->andReturn(Future::complete());
+        $this->connectorThrottle->expects('async')->never();
 
         $connector = ImportConnectorFactory::create(
             $this->provider,
@@ -72,8 +72,8 @@ public function testNonThrottledConnector(): void
      */
     public function testThrottledConnector(): void
     {
-        $this->specificationThrottle->expects('watch')->never();
-        $this->connectorThrottle->expects('watch')->once()->andReturn(Future::complete());
+        $this->specificationThrottle->expects('async')->never();
+        $this->connectorThrottle->expects('async')->once()->andReturn(Future::complete());
 
         $connector = ImportConnectorFactory::create(
             $this->provider,
@@ -91,8 +91,8 @@ public function testThrottledConnector(): void
     public function testThrottledConnectorOverride(): void
     {
         $this->specification->setThrottle($this->specificationThrottle);
-        $this->specificationThrottle->expects('watch')->once()->andReturn(Future::complete());
-        $this->connectorThrottle->expects('watch')->never();
+        $this->specificationThrottle->expects('async')->once()->andReturn(Future::complete());
+        $this->connectorThrottle->expects('async')->never();
 
         $connector = ImportConnectorFactory::create(
             $this->provider,

diff --git a/test/Integration/Connector/ImportConnectorTest.php b/test/Integration/Connector/ImportConnectorTest.php
@@ -119,7 +119,7 @@ public function testAsyncUserRecoverableExceptionHandler(): void
         try {
             $connector->fetchAsync($this->asyncSource);
         } catch (\Exception $e) {
-            self::assertSame($exception, $e);
+            self::assertSame($exception, $e, $e->getMessage());
         }
     }
 
@@ -143,7 +143,7 @@ public function testAsyncResourceRecoverableExceptionHandler(): void
         try {
             $connector->fetchAsync($this->asyncSource);
         } catch (\Exception $e) {
-            self::assertSame($exception, $e);
+            self::assertSame($exception, $e, $e->getMessage());
         }
     }
 
@@ -168,13 +168,13 @@ public function testAsyncUserAndResourceRecoverableExceptionHandlers(): void
         try {
             $connector->fetchAsync($this->asyncSource);
         } catch (\Exception $exception) {
-            self::assertSame($e1, $exception);
+            self::assertSame($e1, $exception, $exception->getMessage());
         }
 
         try {
             $connector->fetchAsync($this->asyncSource);
         } catch (\Exception $exception) {
-            self::assertSame($e2, $exception);
+            self::assertSame($e2, $exception, $exception->getMessage());
         }
     }
 

diff --git a/test/MockFactory.php b/test/MockFactory.php
@@ -91,7 +91,7 @@ public static function mockSingleRecordResource(Provider $provider): ProviderRes
     public static function mockThrottle(): Throttle|MockInterface
     {
         return \Mockery::mock(Throttle::class)
-            ->allows('watch')
+            ->allows('async')
                 ->andReturnUsing(fn (\Closure $closure, mixed ...$args) => async($closure, ...$args))
                 ->byDefault()
             ->getMock()