Fix redis store tests

tvdijen · tvdijen · commit 3003df52683e · 2024-01-30T08:51:48.000+01:00
diff --git a/tests/src/SimpleSAML/Store/RedisStoreTest.php b/tests/src/SimpleSAML/Store/RedisStoreTest.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Test\Store;
 
-use PHPUnit\Framework\{MockObject\MockObject, TestCase};
+use PHPUnit\Framework\TestCase;
 use Predis\Client;
 use SimpleSAML\{Configuration, Store};
 
@@ -21,8 +21,8 @@
  */
 class RedisStoreTest extends TestCase
 {
-    /** @var \PHPUnit\Framework\MockObject\MockObject */
-    protected MockObject $mocked_redis;
+    /** @var \Predis\Client */
+    protected Client $client;
 
     /** @var \SimpleSAML\Store\RedisStore */
     protected Store\RedisStore $store;
@@ -37,24 +37,43 @@ protected function setUp(): void
     {
         $this->config = [];
 
-        $this->mocked_redis = $this->getMockBuilder(Client::class)
-                                   ->onlyMethods(['get', 'set', 'setex', 'del', 'disconnect', '__destruct'])
-                                   ->disableOriginalConstructor()
-                                   ->getMock();
-
-        $this->mocked_redis->method('get')
-                           ->will($this->returnCallback([$this, 'getMocked']));
-
-        $this->mocked_redis->method('set')
-                           ->will($this->returnCallback([$this, 'setMocked']));
-
-        $this->mocked_redis->method('setex')
-                           ->will($this->returnCallback([$this, 'setexMocked']));
-
-        $this->mocked_redis->method('del')
-                           ->will($this->returnCallback([$this, 'delMocked']));
-
-        $this->store = new Store\RedisStore($this->mocked_redis);
+        $this->client = new class ($this) extends Client
+        {
+            public function __construct(
+                protected TestCase $unitTest
+            ) {
+            }
+
+            public function __deconstruct()
+            {
+            }
+
+            public function disconnect(): void
+            {
+            }
+
+            public function get(string $str): ?string
+            {
+                return $this->unitTest->getMocked($str);
+            }
+
+            public function set(string $str, mixed $value): void
+            {
+                $this->unitTest->setMocked($str, $value);
+            }
+
+            public function setEx(string $str, int $expire, mixed $value): void
+            {
+                $this->unitTest->setExMocked($str, $expire, $value);
+            }
+
+            public function del(string $str): void
+            {
+                $this->unitTest->delMocked($str);
+            }
+        };
+
+        $this->store = new Store\RedisStore($this->client);
     }
 
 
@@ -72,7 +91,7 @@ public function getMocked(string $key): ?string
      * @param string $key
      * @param mixed $value
      */
-    public function setMocked(string $key, $value): void
+    public function setMocked(string $key, mixed $value): void
     {
         $this->config[$key] = $value;
     }
@@ -83,7 +102,7 @@ public function setMocked(string $key, $value): void
      * @param int $expire
      * @param mixed $value
      */
-    public function setexMocked(string $key, int $expire, $value): void
+    public function setexMocked(string $key, int $expire, mixed $value): void
     {
         // Testing expiring data is more trouble than it's worth for now
         $this->setMocked($key, $value);
diff --git a/tests/src/SimpleSAML/Store/StoreFactoryTest.php b/tests/src/SimpleSAML/Store/StoreFactoryTest.php
@@ -5,7 +5,6 @@
 namespace SimpleSAML\Test;
 
 use PHPUnit\Framework\{MockObject\MockObject, TestCase};
-use Predis\Client;
 use ReflectionClass;
 use SimpleSAML\{Configuration, Store};
 use SimpleSAML\Error\CriticalConfigurationError;
@@ -88,10 +87,6 @@ public function redisStore(): void
 
         /** @psalm-var \SimpleSAML\Store\RedisStore $store */
         $store = StoreFactory::getInstance($storeType);
-        $store->redis = $this->getMockBuilder(Client::class)
-                           ->onlyMethods(['get', 'set', 'setex', 'del', 'disconnect', '__destruct'])
-                           ->disableOriginalConstructor()
-                           ->getMock();
 
         $this->assertInstanceOf(Store\RedisStore::class, $store);
     }
