minor #58653 [Cache] do not skip tests from data providers (xabbuh)

nicolas-grekas · nicolas-grekas · commit ee6d61b08045 · 2024-10-25T16:55:06.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Cache] do not skip tests from data providers | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- c2b27a3 do not skip tests from data providers
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -174,33 +174,29 @@ public static function provideServersSetting(): iterable
     }
 
     /**
-     * @dataProvider provideDsnWithOptions
+     * @requires extension memcached
      */
-    public function testDsnWithOptions(string $dsn, array $options, array $expectedOptions)
+    public function testOptionsFromDsnWinOverAdditionallyPassedOptions()
     {
-        $client = MemcachedAdapter::createConnection($dsn, $options);
+        $client = MemcachedAdapter::createConnection('memcached://localhost:11222?retry_timeout=10', [
+            \Memcached::OPT_RETRY_TIMEOUT => 8,
+        ]);
 
-        foreach ($expectedOptions as $option => $expect) {
-            $this->assertSame($expect, $client->getOption($option));
-        }
+        $this->assertSame(10, $client->getOption(\Memcached::OPT_RETRY_TIMEOUT));
     }
 
-    public static function provideDsnWithOptions(): iterable
+    /**
+     * @requires extension memcached
+     */
+    public function testOptionsFromDsnAndAdditionallyPassedOptionsAreMerged()
     {
-        if (!class_exists(\Memcached::class)) {
-            self::markTestSkipped('Extension memcached required.');
-        }
+        $client = MemcachedAdapter::createConnection('memcached://localhost:11222?socket_recv_size=1&socket_send_size=2', [
+            \Memcached::OPT_RETRY_TIMEOUT => 8,
+        ]);
 
-        yield [
-            'memcached://localhost:11222?retry_timeout=10',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_RETRY_TIMEOUT => 10],
-        ];
-        yield [
-            'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
-        ];
+        $this->assertSame(1, $client->getOption(\Memcached::OPT_SOCKET_RECV_SIZE));
+        $this->assertSame(2, $client->getOption(\Memcached::OPT_SOCKET_SEND_SIZE));
+        $this->assertSame(8, $client->getOption(\Memcached::OPT_RETRY_TIMEOUT));
     }
 
     public function testClear()
