Update tests

amphp · Dec 13, 2023 · 732790d · 732790d
1 parent 70ac3e1
commit 732790d
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 36 deletions.
diff --git a/test/ConnectionPoolTest.php b/test/ConnectionPoolTest.php
@@ -6,6 +6,7 @@
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Sql\Common\ConnectionPool;
 use Amp\Sql\Common\PooledResult;
+use Amp\Sql\Common\Test\Stub\StubPooledResult;
 use Amp\Sql\Connection;
 use Amp\Sql\Result;
 use Amp\Sql\SqlConfig;
@@ -67,14 +68,7 @@ private function createPool(SqlConnector $connector, int $maxConnections = 100,
             ->getMockForAbstractClass();
 
         $pool->method('createResult')
-            ->willReturnCallback(function (Result $result, \Closure $release): PooledResult {
-                return new class($result, $release) extends PooledResult {
-                    protected function newInstanceFrom(Result $result, \Closure $release): PooledResult
-                    {
-                        return new self($result, $release);
-                    }
-                };
-            });
+            ->willReturnCallback(fn (Result $result, \Closure $release) => new StubPooledResult($result, $release));
 
         return $pool;
     }

diff --git a/test/PooledResultTest.php b/test/PooledResultTest.php
@@ -4,6 +4,8 @@
 
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Sql\Common\PooledResult;
+use Amp\Sql\Common\Test\Stub\StubPooledResult;
+use Amp\Sql\Common\Test\Stub\StubResult;
 use Amp\Sql\Result;
 use function Amp\delay;
 
@@ -17,33 +19,16 @@ public function testIdleConnectionsRemovedAfterTimeout()
             $invoked = true;
         };
 
-        $secondResult = $this->createMock(PooledResult::class);
-        $secondResult->method('getIterator')
-            ->willReturn(new \ArrayIterator([['column' => 'value']]));
-        $secondResult->method('getNextResult')
-            ->willReturn(null);
+        $row = ['column' => 'value'];
+        $stubResult = new StubResult([$row]);
 
-        $firstResult = $this->createMock(PooledResult::class);
-        $firstResult->method('getIterator')
-            ->willReturn(new \ArrayIterator([['column' => 'value']]));
-        $firstResult->method('getNextResult')
-            ->willReturn($secondResult);
+        $secondResult = new StubPooledResult($stubResult);
+        $firstResult = new StubPooledResult($stubResult, next: $secondResult);
+        $pooledResult = new StubPooledResult($stubResult, $release, $firstResult);
 
-        $result = $this->getMockBuilder(PooledResult::class)
-            ->setConstructorArgs([$firstResult, $release])
-            ->getMockForAbstractClass();
+        $iterator = $pooledResult->getIterator();
 
-        $result->expects(self::once())
-            ->method('newInstanceFrom')
-            ->willReturnCallback(function (Result $result, \Closure $release): PooledResult {
-                return $this->getMockBuilder(PooledResult::class)
-                    ->setConstructorArgs([$result, $release])
-                    ->getMockForAbstractClass();
-            });
-
-        $iterator = $result->getIterator();
-
-        $this->assertSame(['column' => 'value'], $iterator->current());
+        $this->assertSame($row, $iterator->current());
 
         $this->assertFalse($invoked);
 
@@ -52,15 +37,15 @@ public function testIdleConnectionsRemovedAfterTimeout()
 
         $this->assertFalse($invoked); // Next result set available.
 
-        $result = $result->getNextResult();
-        $iterator = $result->getIterator();
+        $pooledResult = $pooledResult->getNextResult();
+        $iterator = $pooledResult->getIterator();
 
-        $this->assertSame(['column' => 'value'], $iterator->current());
+        $this->assertSame($row, $iterator->current());
 
         $iterator->next();
         $this->assertFalse($iterator->valid());
 
-        $result->getNextResult();
+        $pooledResult->getNextResult();
 
         delay(0); // Tick event loop to dispose of result set.
 

diff --git a/test/Stub/StubPooledResult.php b/test/Stub/StubPooledResult.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Amp\Sql\Common\Test\Stub;
+
+use Amp\Sql\Common\PooledResult;
+use Amp\Sql\Result;
+
+final class StubPooledResult extends PooledResult
+{
+    public function __construct(Result $result, ?\Closure $release = null, private readonly ?Result $next = null)
+    {
+        parent::__construct($result, $release ?? fn () => null);
+    }
+
+    public function getNextResult(): ?Result
+    {
+        return $this->next;
+    }
+
+    protected static function newInstanceFrom(Result $result, \Closure $release): Result
+    {
+        return new self($result, $release);
+    }
+}
diff --git a/test/Stub/StubResult.php b/test/Stub/StubResult.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Amp\Sql\Common\Test\Stub;
+
+use Amp\Sql\Result;
+
+final class StubResult implements Result, \IteratorAggregate
+{
+    private readonly array $rows;
+
+    private int $current = 0;
+
+    public function __construct(array $rows, private readonly ?Result $next = null)
+    {
+        $this->rows = array_values($rows);
+    }
+
+    public function getIterator(): \Iterator
+    {
+        yield from $this->rows;
+    }
+
+    public function fetchRow(): ?array
+    {
+        return $this->rows[$this->current++] ?? null;
+    }
+
+    public function getNextResult(): ?Result
+    {
+        return $this->next;
+    }
+
+    public function getRowCount(): ?int
+    {
+        return count($this->rows);
+    }
+
+    public function getColumnCount(): ?int
+    {
+        return null;
+    }
+}