Check for mongodb/mongodb lib in lock tests

GromNaN · GromNaN · commit 6602c0266cf3 · 2023-10-27T22:37:11.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -32,13 +32,16 @@ class MongoDbSessionHandlerTest extends TestCase
     private $storage;
     public $options;
 
-    protected function setUp(): void
+    public static function setUpBeforeClass(): void
     {
-        parent::setUp();
-
         if (!class_exists(Client::class)) {
-            $this->markTestSkipped('The mongodb/mongodb package is required.');
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
         }
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
 
         $this->mongo = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()
diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreFactoryTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use MongoDB\Collection;
+use PHPUnit\Framework\SkippedTestSuiteError;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Lock\Store\MongoDbStore;
 use Symfony\Component\Lock\Store\StoreFactory;
@@ -22,9 +24,16 @@
  */
 class MongoDbStoreFactoryTest extends TestCase
 {
+    public static function setupBeforeClass(): void
+    {
+        if (!class_exists(Client::class)) {
+            throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
+        }
+    }
+
     public function testCreateMongoDbCollectionStore()
     {
-        $store = StoreFactory::createStore($this->createMock(\MongoDB\Collection::class));
+        $store = StoreFactory::createStore($this->createMock(Collection::class));
 
         $this->assertInstanceOf(MongoDbStore::class, $store);
     }
diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php
@@ -32,7 +32,7 @@ class MongoDbStoreTest extends AbstractStoreTestCase
 
     public static function setupBeforeClass(): void
     {
-        if (!class_exists(\MongoDB\Client::class)) {
+        if (!class_exists(Client::class)) {
             throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class MongoDbStoreTest extends AbstractStoreTestCase`
`32`	`32`
`33`	`33`	`public static function setupBeforeClass(): void`
`34`	`34`	`{`
`35`		`- if (!class_exists(\MongoDB\Client::class)) {`
	`35`	`+ if (!class_exists(Client::class)) {`
`36`	`36`	`throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');`
`37`	`37`	`}`
`38`	`38`