tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Adding possibility to use a different cache-backend for locking and caching

Browse source 
- Renaming *LockDriver to *Lock since it isn't a "driver" anymore
This commit is contained in:
Philipp Holzer 2019-08-04 15:42:39 +02:00
commit 34e4968c06
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
19 changed files with 149 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tests/functional/DependencyCheckTest.php
View file

@ -4,8 +4,11 @@ namespace functional;
use Dice\Dice;
use Friendica\App;
use Friendica\Core\Cache\ICache;
use Friendica\Core\Cache\IMemoryCache;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Configuration;
use Friendica\Core\Lock\ILock;
use Friendica\Database\Database;
use Friendica\Test\Util\VFSTrait;
use Friendica\Util\BasePath;
@ -133,6 +136,31 @@ class dependencyCheck extends TestCase
/** @var LoggerInterface $logger */
$logger = $this->dice->create('$devLogger', ['dev']);
self::assertInstanceOf(LoggerInterface::class, $logger);
$this->assertInstanceOf(LoggerInterface::class, $logger);
}
public function testCache()
{
/** @var ICache $cache */
$cache = $this->dice->create(ICache::class);
$this->assertInstanceOf(ICache::class, $cache);
}
public function testMemoryCache()
{
/** @var IMemoryCache $cache */
$cache = $this->dice->create(IMemoryCache::class);
// We need to check "just" ICache, because the default Cache is DB-Cache, which isn't a memorycache
$this->assertInstanceOf(ICache::class, $cache);
}
public function testLock()
{
/** @var ILock $cache */
$lock = $this->dice->create(ILock::class);
$this->assertInstanceOf(ILock::class, $lock);
}
}

4
tests/src/Core/Lock/APCuCacheLockTest.php
View file

@ -3,7 +3,7 @@
namespace Friendica\Test\src\Core\Lock;
use Friendica\Core\Cache\APCuCache;
use Friendica\Core\Lock\CacheLockDriver;
use Friendica\Core\Lock\CacheLock;
class APCuCacheLockTest extends LockTest
{
@ -18,6 +18,6 @@ class APCuCacheLockTest extends LockTest
protected function getInstance()
{
return new CacheLockDriver(new APCuCache('localhost'));
return new CacheLock(new APCuCache('localhost'));
}
}

4
tests/src/Core/Lock/ArrayCacheLockTest.php
View file

@ -3,13 +3,13 @@
namespace Friendica\Test\src\Core\Lock;
use Friendica\Core\Cache\ArrayCache;
use Friendica\Core\Lock\CacheLockDriver;
use Friendica\Core\Lock\CacheLock;
class ArrayCacheLockTest extends LockTest
{
protected function getInstance()
{
return new CacheLockDriver(new ArrayCache('localhost'));
return new CacheLock(new ArrayCache('localhost'));
}
public function testLockTTL()

4
tests/src/Core/Lock/MemcacheCacheLockTest.php
View file

@ -5,7 +5,7 @@ namespace Friendica\Test\src\Core\Lock;
use Friendica\Core\Cache\MemcacheCache;
use Friendica\Core\Config\Configuration;
use Friendica\Core\Lock\CacheLockDriver;
use Friendica\Core\Lock\CacheLock;
/**
* @requires extension Memcache
@ -25,6 +25,6 @@ class MemcacheCacheLockTest extends LockTest
->with('system', 'memcache_port')
->andReturn(11211);
return new CacheLockDriver(new MemcacheCache('localhost', $configMock));
return new CacheLock(new MemcacheCache('localhost', $configMock));
}
}

4
tests/src/Core/Lock/MemcachedCacheLockTest.php
View file

@ -5,7 +5,7 @@ namespace Friendica\Test\src\Core\Lock;
use Friendica\Core\Cache\MemcachedCache;
use Friendica\Core\Config\Configuration;
use Friendica\Core\Lock\CacheLockDriver;
use Friendica\Core\Lock\CacheLock;
use Psr\Log\NullLogger;
/**
@ -24,6 +24,6 @@ class MemcachedCacheLockTest extends LockTest
$logger = new NullLogger();
return new CacheLockDriver(new MemcachedCache('localhost', $configMock, $logger));
return new CacheLock(new MemcachedCache('localhost', $configMock, $logger));
}
}

4
tests/src/Core/Lock/RedisCacheLockTest.php
View file

@ -5,7 +5,7 @@ namespace Friendica\Test\src\Core\Lock;
use Friendica\Core\Cache\RedisCache;
use Friendica\Core\Config\Configuration;
use Friendica\Core\Lock\CacheLockDriver;
use Friendica\Core\Lock\CacheLock;
/**
* @requires extension redis
@ -34,6 +34,6 @@ class RedisCacheLockTest extends LockTest
->with('system', 'redis_password')
->andReturn(null);
return new CacheLockDriver(new RedisCache('localhost', $configMock));
return new CacheLock(new RedisCache('localhost', $configMock));
}
}