Update assertion calls

Author: trowski

test/RetrySqlConnectorTest.php

@@ -26,7 +26,7 @@ public function testSuccessfulConnect()
 
         $connection = $retry->connect($config);
 
-        $this->assertInstanceOf(SqlConnection::class, $connection);
+        self::assertInstanceOf(SqlConnection::class, $connection);
     }
 
     public function testFirstTryFailConnect()
@@ -53,7 +53,7 @@ public function testFirstTryFailConnect()
 
         $connection = $retry->connect($config);
 
-        $this->assertInstanceOf(SqlConnection::class, $connection);
+        self::assertInstanceOf(SqlConnection::class, $connection);
     }
 
     public function testFailingConnect()

test/SqlCommonConnectionPoolTest.php

@@ -84,19 +84,19 @@ public function testIdleConnectionsRemovedAfterTimeout()
             $futures[] = async(fn () => $pool->query("SELECT $i"));
         }
 
-        $this->assertCount($count, Future\await($futures));
+        self::assertCount($count, Future\await($futures));
 
         unset($futures); // Remove references to results so they are destructed.
 
-        $this->assertSame($count, $pool->getConnectionCount());
+        self::assertSame($count, $pool->getConnectionCount());
 
         delay(1);
 
-        $this->assertSame($count, $pool->getConnectionCount());
+        self::assertSame($count, $pool->getConnectionCount());
 
         delay(1);
 
-        $this->assertSame(0, $pool->getConnectionCount());
+        self::assertSame(0, $pool->getConnectionCount());
     }
 
     public function testMaxConnectionCount()
@@ -118,6 +118,6 @@ public function testMaxConnectionCount()
 
         Future\await($futures);
 
-        $this->assertSame($maxConnections, $pool->getConnectionCount());
+        self::assertSame($maxConnections, $pool->getConnectionCount());
     }
 }

test/SqlPooledResultTest.php

@@ -25,36 +25,36 @@ public function testIdleConnectionsRemovedAfterTimeout()
 
         $iterator = $pooledResult->getIterator();
 
-        $this->assertSame($expectedRow, $iterator->current());
+        self::assertSame($expectedRow, $iterator->current());
 
-        $this->assertFalse($invoked);
+        self::assertFalse($invoked);
 
         $iterator->next();
-        $this->assertFalse($iterator->valid());
+        self::assertFalse($iterator->valid());
 
-        $this->assertFalse($invoked); // Next result set available.
+        self::assertFalse($invoked); // Next result set available.
 
         $pooledResult = $pooledResult->getNextResult();
         $iterator = $pooledResult->getIterator();
 
-        $this->assertSame($expectedRow, $iterator->current());
+        self::assertSame($expectedRow, $iterator->current());
 
         $iterator->next();
-        $this->assertFalse($iterator->valid());
+        self::assertFalse($iterator->valid());
 
         $pooledResult = $pooledResult->getNextResult();
         unset($pooledResult); // Manually unset to trigger destructor.
 
         delay(0); // Tick event loop to dispose of result set.
 
-        $this->assertTrue($invoked); // No next result set, so release callback invoked.
+        self::assertTrue($invoked); // No next result set, so release callback invoked.
     }
 
     public function testIteratorRetainsReference(): void
     {
         $expectedRow = ['column' => 'value'];
         $expectedRows = [$expectedRow, $expectedRow, $expectedRow];
-        $stubResult = new StubSqlResult([$expectedRow, $expectedRow, $expectedRow]);
+        $stubResult = new StubSqlResult($expectedRows);
 
         $invoked = false;
         $release = function () use (&$invoked) {
@@ -75,6 +75,6 @@ public function testIteratorRetainsReference(): void
 
         delay(0); // Tick event loop to dispose of result set.
 
-        $this->assertTrue($invoked);
+        self::assertTrue($invoked);
     }
 }

test/SqlStatementPoolTest.php

@@ -32,15 +32,15 @@ public function testActiveStatementsRemainAfterTimeout()
             ->setConstructorArgs([$pool, 'SELECT 1', $this->createCallback(1, fn () => $statement)])
             ->getMockForAbstractClass();
 
-        $this->assertFalse($statementPool->isClosed());
-        $this->assertSame(\time(), $statementPool->getLastUsedAt());
+        self::assertFalse($statementPool->isClosed());
+        self::assertSame(\time(), $statementPool->getLastUsedAt());
 
         delay(1.5); // Give timeout watcher enough time to execute.
 
         $statementPool->execute();
 
-        $this->assertFalse($statementPool->isClosed());
-        $this->assertSame(\time(), $statementPool->getLastUsedAt());
+        self::assertFalse($statementPool->isClosed());
+        self::assertSame(\time(), $statementPool->getLastUsedAt());
     }
 
     public function testIdleStatementsRemovedAfterTimeout()
@@ -69,16 +69,16 @@ public function testIdleStatementsRemovedAfterTimeout()
             ->setConstructorArgs([$pool, 'SELECT 1', $this->createCallback(2, $createStatement)])
             ->getMockForAbstractClass();
 
-        $this->assertFalse($statementPool->isClosed());
-        $this->assertSame(\time(), $statementPool->getLastUsedAt());
+        self::assertFalse($statementPool->isClosed());
+        self::assertSame(\time(), $statementPool->getLastUsedAt());
 
         $statementPool->execute();
 
         delay(1.5); // Give timeout watcher enough time to execute.
 
         $statementPool->execute();
 
-        $this->assertFalse($statementPool->isClosed());
-        $this->assertSame(\time(), $statementPool->getLastUsedAt());
+        self::assertFalse($statementPool->isClosed());
+        self::assertSame(\time(), $statementPool->getLastUsedAt());
     }
 }