Use attributes for test data providers

php-lock · Dec 5, 2024 · 4a67bb6 · 4a67bb6
1 parent 29970e5
commit 4a67bb6
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 0 deletions.
diff --git a/tests/mutex/FlockMutexTest.php b/tests/mutex/FlockMutexTest.php
@@ -9,6 +9,7 @@
 use malkusch\lock\exception\TimeoutException;
 use malkusch\lock\mutex\FlockMutex;
 use malkusch\lock\util\PcntlTimeout;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class FlockMutexTest extends TestCase
@@ -41,6 +42,7 @@ protected function tearDown(): void
      *
      * @dataProvider provideTimeoutableStrategiesCases
      */
+    #[DataProvider('provideTimeoutableStrategiesCases')]
     public function testCodeExecutedOutsideLockIsNotThrown(int $strategy): void
     {
         $this->mutex->strategy = $strategy; // @phpstan-ignore property.private
@@ -57,6 +59,7 @@ public function testCodeExecutedOutsideLockIsNotThrown(int $strategy): void
      *
      * @dataProvider provideTimeoutableStrategiesCases
      */
+    #[DataProvider('provideTimeoutableStrategiesCases')]
     public function testTimeoutOccurs(int $strategy): void
     {
         $this->expectException(TimeoutException::class);

diff --git a/tests/mutex/MemcachedMutexTest.php b/tests/mutex/MemcachedMutexTest.php
@@ -7,6 +7,7 @@
 use malkusch\lock\exception\LockReleaseException;
 use malkusch\lock\exception\TimeoutException;
 use malkusch\lock\mutex\MemcachedMutex;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -15,6 +16,7 @@
  *
  * @requires extension memcached
  */
+#[RequiresPhpExtension('memcached')]
 class MemcachedMutexTest extends TestCase
 {
     /** @var \Memcached|MockObject */

diff --git a/tests/mutex/MutexConcurrencyTest.php b/tests/mutex/MutexConcurrencyTest.php
@@ -14,6 +14,7 @@
 use malkusch\lock\mutex\PredisMutex;
 use malkusch\lock\mutex\SemaphoreMutex;
 use malkusch\lock\mutex\TransactionalMutex;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Constraint\IsType;
 use PHPUnit\Framework\TestCase;
 use Predis\Client;
@@ -84,6 +85,7 @@ private function fork(int $concurrency, \Closure $code): void
      *
      * @dataProvider provideHighContentionCases
      */
+    #[DataProvider('provideHighContentionCases')]
     public function testHighContention(\Closure $code, \Closure $mutexFactory): void
     {
         $concurrency = 10;
@@ -196,6 +198,7 @@ static function ($timeout = 3) use ($dsn, $user, $password) {
      *
      * @dataProvider provideExecutionIsSerializedWhenLockedCases
      */
+    #[DataProvider('provideExecutionIsSerializedWhenLockedCases')]
     public function testExecutionIsSerializedWhenLocked(\Closure $mutexFactory): void
     {
         $time = \microtime(true);

diff --git a/tests/mutex/MutexTest.php b/tests/mutex/MutexTest.php
@@ -18,6 +18,7 @@
 use malkusch\lock\mutex\SpinlockMutex;
 use malkusch\lock\mutex\TransactionalMutex;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Predis\Client;
 
@@ -192,6 +193,7 @@ static function ($uri) {
      *
      * @dataProvider provideMutexFactoriesCases
      */
+    #[DataProvider('provideMutexFactoriesCases')]
     public function testSynchronizedDelegates(\Closure $mutexFactory): void
     {
         /** @var Mutex $mutex */
@@ -209,6 +211,7 @@ public function testSynchronizedDelegates(\Closure $mutexFactory): void
      *
      * @dataProvider provideMutexFactoriesCases
      */
+    #[DataProvider('provideMutexFactoriesCases')]
     public function testRelease(\Closure $mutexFactory): void
     {
         $mutex = $mutexFactory();
@@ -225,6 +228,7 @@ public function testRelease(\Closure $mutexFactory): void
      *
      * @dataProvider provideMutexFactoriesCases
      */
+    #[DataProvider('provideMutexFactoriesCases')]
     public function testSynchronizedPassesExceptionThrough(\Closure $mutexFactory): void
     {
         $this->expectException(\DomainException::class);

diff --git a/tests/mutex/PHPRedisMutexTest.php b/tests/mutex/PHPRedisMutexTest.php
@@ -8,6 +8,9 @@
 use malkusch\lock\exception\LockReleaseException;
 use malkusch\lock\exception\MutexException;
 use malkusch\lock\mutex\PHPRedisMutex;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 
 if (\PHP_MAJOR_VERSION >= 8) {
@@ -63,6 +66,8 @@ public function set($key, $value, $options = null)
  *
  * @group redis
  */
+#[RequiresPhpExtension('redis')]
+#[Group('redis')]
 class PHPRedisMutexTest extends TestCase
 {
     /** @var \Redis[] */
@@ -210,6 +215,7 @@ public function testEvalScriptFails(): void
      *
      * @dataProvider provideSerializersAndCompressorsCases
      */
+    #[DataProvider('provideSerializersAndCompressorsCases')]
     public function testSerializersAndCompressors($serializer, $compressor): void
     {
         foreach ($this->connections as $connection) {

diff --git a/tests/mutex/PredisMutexTest.php b/tests/mutex/PredisMutexTest.php
@@ -7,6 +7,7 @@
 use malkusch\lock\exception\LockAcquireException;
 use malkusch\lock\exception\LockReleaseException;
 use malkusch\lock\mutex\PredisMutex;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Predis\ClientInterface;
@@ -16,6 +17,7 @@
 /**
  * @group redis
  */
+#[Group('redis')]
 class PredisMutexTest extends TestCase
 {
     /** @var ClientInterface|MockObject */

diff --git a/tests/mutex/RedisMutexTest.php b/tests/mutex/RedisMutexTest.php
@@ -11,12 +11,15 @@
 use malkusch\lock\mutex\RedisMutex;
 use phpmock\environment\SleepEnvironmentBuilder;
 use phpmock\phpunit\PHPMock;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @group redis
  */
+#[Group('redis')]
 class RedisMutexTest extends TestCase
 {
     use PHPMock;
@@ -64,6 +67,7 @@ static function ($id): array {
      *
      * @dataProvider provideMinorityCases
      */
+    #[DataProvider('provideMinorityCases')]
     public function testTooFewServerToAcquire(int $count, int $available): void
     {
         $this->expectException(LockAcquireException::class);
@@ -99,6 +103,7 @@ static function () use (&$i, $available): bool {
      *
      * @dataProvider provideMajorityCases
      */
+    #[DataProvider('provideMajorityCases')]
     public function testFaultTolerance(int $count, int $available): void
     {
         $mutex = $this->buildRedisMutex($count);
@@ -132,6 +137,7 @@ static function () use (&$i, $available): bool {
      *
      * @dataProvider provideMinorityCases
      */
+    #[DataProvider('provideMinorityCases')]
     public function testAcquireTooFewKeys($count, $available): void
     {
         $this->expectException(TimeoutException::class);
@@ -164,6 +170,7 @@ static function () use (&$i, $available): bool {
      *
      * @dataProvider provideTimingOutCases
      */
+    #[DataProvider('provideTimingOutCases')]
     public function testTimingOut(int $count, float $timeout, float $delay): void
     {
         $timeoutStr = (string) round($timeout, 6);
@@ -211,6 +218,7 @@ public static function provideTimingOutCases(): iterable
      *
      * @dataProvider provideMajorityCases
      */
+    #[DataProvider('provideMajorityCases')]
     public function testAcquireWithMajority(int $count, int $available): void
     {
         $mutex = $this->buildRedisMutex($count);
@@ -240,6 +248,7 @@ static function () use (&$i, $available): bool {
      *
      * @dataProvider provideMinorityCases
      */
+    #[DataProvider('provideMinorityCases')]
     public function testTooFewServersToRelease(int $count, int $available): void
     {
         $mutex = $this->buildRedisMutex($count);
@@ -275,6 +284,7 @@ static function () use (&$i, $available): bool {
      *
      * @dataProvider provideMinorityCases
      */
+    #[DataProvider('provideMinorityCases')]
     public function testReleaseTooFewKeys(int $count, int $available): void
     {
         $mutex = $this->buildRedisMutex($count);

diff --git a/tests/mutex/TransactionalMutexTest.php b/tests/mutex/TransactionalMutexTest.php
@@ -6,6 +6,7 @@
 
 use malkusch\lock\exception\LockAcquireException;
 use malkusch\lock\mutex\TransactionalMutex;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -18,6 +19,7 @@ class TransactionalMutexTest extends TestCase
      *
      * @dataProvider provideInvalidErrorModeCases
      */
+    #[DataProvider('provideInvalidErrorModeCases')]
     public function testInvalidErrorMode(int $mode): void
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -109,6 +111,7 @@ public function testFailExceptionRollsback(): void
      *
      * @dataProvider provideReplayTransactionCases
      */
+    #[DataProvider('provideReplayTransactionCases')]
     public function testReplayTransaction(\Exception $exception): void
     {
         $pdo = $this->buildMySqlPdo();

diff --git a/tests/util/DoubleCheckedLockingTest.php b/tests/util/DoubleCheckedLockingTest.php
@@ -6,6 +6,7 @@
 
 use malkusch\lock\mutex\Mutex;
 use malkusch\lock\util\DoubleCheckedLocking;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -87,6 +88,7 @@ public function testLockedCheckAndExecution(): void
      *
      * @dataProvider provideCodeNotExecutedCases
      */
+    #[DataProvider('provideCodeNotExecutedCases')]
     public function testCodeNotExecuted(\Closure $check): void
     {
         $this->mutex->expects(self::any())