Replace usages of SkippedTestSuiteError with markTestSkipped() call

symfony · Sep 28, 2023 · b0878f1 · b0878f1
1 parent 1d57d1a
commit b0878f1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 21 deletions.
diff --git a/Tests/Store/MemcachedStoreTest.php b/Tests/Store/MemcachedStoreTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use PHPUnit\Framework\SkippedTestSuiteError;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
@@ -31,7 +30,7 @@ class MemcachedStoreTest extends AbstractStoreTestCase
     public static function setUpBeforeClass(): void
     {
         if (version_compare(phpversion('memcached'), '3.1.6', '<')) {
-            throw new SkippedTestSuiteError('Extension memcached > 3.1.5 required.');
+            self::markTestSkipped('Extension memcached > 3.1.5 required.');
         }
 
         $memcached = new \Memcached();
@@ -40,7 +39,7 @@ public static function setUpBeforeClass(): void
         $code = $memcached->getResultCode();
 
         if (\Memcached::RES_SUCCESS !== $code && \Memcached::RES_NOTFOUND !== $code) {
-            throw new SkippedTestSuiteError('Unable to connect to the memcache host');
+            self::markTestSkipped('Unable to connect to the memcache host');
         }
     }
 

diff --git a/Tests/Store/MongoDbStoreTest.php b/Tests/Store/MongoDbStoreTest.php
@@ -13,7 +13,6 @@
 
 use MongoDB\Client;
 use MongoDB\Driver\Exception\ConnectionTimeoutException;
-use PHPUnit\Framework\SkippedTestSuiteError;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
@@ -33,14 +32,14 @@ class MongoDbStoreTest extends AbstractStoreTestCase
     public static function setupBeforeClass(): void
     {
         if (!class_exists(\MongoDB\Client::class)) {
-            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
+            self::markTestSkipped('The mongodb/mongodb package is required.');
         }
 
         $client = self::getMongoClient();
         try {
             $client->listDatabases();
         } catch (ConnectionTimeoutException $e) {
-            throw new SkippedTestSuiteError('MongoDB server not found.');
+            self::markTestSkipped('MongoDB server not found.');
         }
     }
 

diff --git a/Tests/Store/PredisStoreTest.php b/Tests/Store/PredisStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use PHPUnit\Framework\SkippedTestSuiteError;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
@@ -26,7 +24,7 @@ public static function setUpBeforeClass(): void
         try {
             $redis->connect();
         } catch (\Exception $e) {
-            throw new SkippedTestSuiteError($e->getMessage());
+            self::markTestSkipped($e->getMessage());
         }
     }
 

diff --git a/Tests/Store/RedisArrayStoreTest.php b/Tests/Store/RedisArrayStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use PHPUnit\Framework\SkippedTestSuiteError;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
@@ -25,12 +23,12 @@ class RedisArrayStoreTest extends AbstractRedisStoreTestCase
     public static function setUpBeforeClass(): void
     {
         if (!class_exists(\RedisArray::class)) {
-            throw new SkippedTestSuiteError('The RedisArray class is required.');
+            self::markTestSkipped('The RedisArray class is required.');
         }
         try {
             (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
-            throw new SkippedTestSuiteError($e->getMessage());
+            self::markTestSkipped($e->getMessage());
         }
     }
 

diff --git a/Tests/Store/RedisClusterStoreTest.php b/Tests/Store/RedisClusterStoreTest.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use PHPUnit\Framework\SkippedTestSuiteError;
-
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
@@ -25,10 +23,10 @@ class RedisClusterStoreTest extends AbstractRedisStoreTestCase
     public static function setUpBeforeClass(): void
     {
         if (!class_exists(\RedisCluster::class)) {
-            throw new SkippedTestSuiteError('The RedisCluster class is required.');
+            self::markTestSkipped('The RedisCluster class is required.');
         }
         if (!getenv('REDIS_CLUSTER_HOSTS')) {
-            throw new SkippedTestSuiteError('REDIS_CLUSTER_HOSTS env var is not defined.');
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
         }
     }
 

diff --git a/Tests/Store/RedisStoreTest.php b/Tests/Store/RedisStoreTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
-use PHPUnit\Framework\SkippedTestSuiteError;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Store\RedisStore;
 
@@ -31,7 +30,7 @@ public static function setUpBeforeClass(): void
         try {
             (new \Redis())->connect(...explode(':', getenv('REDIS_HOST')));
         } catch (\Exception $e) {
-            throw new SkippedTestSuiteError($e->getMessage());
+            self::markTestSkipped($e->getMessage());
         }
     }
 

diff --git a/Tests/Store/RelayStoreTest.php b/Tests/Store/RelayStoreTest.php
@@ -11,7 +11,6 @@
 
 namespace Store;
 
-use PHPUnit\Framework\SkippedTestSuiteError;
 use Relay\Relay;
 use Symfony\Component\Lock\Tests\Store\AbstractRedisStoreTestCase;
 use Symfony\Component\Lock\Tests\Store\SharedLockStoreTestTrait;
@@ -30,7 +29,7 @@ public static function setUpBeforeClass(): void
         try {
             new Relay(...explode(':', getenv('REDIS_HOST')));
         } catch (\Relay\Exception $e) {
-            throw new SkippedTestSuiteError($e->getMessage());
+            self::markTestSkipped($e->getMessage());
         }
     }