Merge pull request #11195 from annando/issue-10966

[friendica.git] / tests / src / Core / Lock / RedisCacheLockTest.php

diff --git a/tests/src/Core/Lock/RedisCacheLockTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php
index fb9bc80b7d5c58e7cd9ebf02d4ac46726d99e66f..cc0184bb83b5b1136d709206546923f9266b18b6 100644 (file)
--- a/tests/src/Core/Lock/RedisCacheLockTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,9 +21,11 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Cache\RedisCache;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Lock\CacheLock;
+use Exception;
+use Friendica\Core\Cache\Type\RedisCache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Lock\Type\CacheLock;
+use Mockery;
 
 /**
  * @requires extension redis
@@ -33,9 +35,10 @@ class RedisCacheLockTest extends LockTest
 {
        protected function getInstance()
        {
-               $configMock = \Mockery::mock(IConfig::class);
+               $configMock = Mockery::mock(IManageConfigValues::class);
 
                $host = $_SERVER['REDIS_HOST'] ?? 'localhost';
+               $port = $_SERVER['REDIS_PORT'] ?? 6379;
 
                $configMock
                        ->shouldReceive('get')
@@ -44,12 +47,12 @@ class RedisCacheLockTest extends LockTest
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'redis_port')
-                       ->andReturn(null);
+                       ->andReturn($port);
 
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'redis_db', 0)
-                       ->andReturn(3);
+                       ->andReturn(0);
                $configMock
                        ->shouldReceive('get')
                        ->with('system', 'redis_password')
@@ -59,9 +62,9 @@ class RedisCacheLockTest extends LockTest
 
                try {
                        $cache = new RedisCache($host, $configMock);
-                       $lock = new CacheLock($cache);
-               } catch (\Exception $e) {
-                       $this->markTestSkipped('Redis is not available');
+                       $lock = new \Friendica\Core\Lock\Type\CacheLock($cache);
+               } catch (Exception $e) {
+                       static::markTestSkipped('Redis is not available. Error: ' . $e->getMessage());
                }
 
                return $lock;