mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-07 18:44:26 +02:00
Add a bunch of tests for StatsCaching
This commit is contained in:
parent
892fa595da
commit
b222aa0c48
15 changed files with 477 additions and 43 deletions
|
@ -153,6 +153,7 @@
|
||||||
"dms/phpunit-arraysubset-asserts": "^0.3.1",
|
"dms/phpunit-arraysubset-asserts": "^0.3.1",
|
||||||
"mikey179/vfsstream": "^1.6",
|
"mikey179/vfsstream": "^1.6",
|
||||||
"mockery/mockery": "^1.3",
|
"mockery/mockery": "^1.3",
|
||||||
|
"php-mock/php-mock-mockery": "^1.5",
|
||||||
"php-mock/php-mock-phpunit": "^2.10",
|
"php-mock/php-mock-phpunit": "^2.10",
|
||||||
"phpmd/phpmd": "^2.15",
|
"phpmd/phpmd": "^2.15",
|
||||||
"phpstan/phpstan": "^2.0",
|
"phpstan/phpstan": "^2.0",
|
||||||
|
|
67
composer.lock
generated
67
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "b77bf714197f04022a5feb001bf07852",
|
"content-hash": "32af97f73ec49df2a6cfe98f11bc1d60",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "asika/simple-console",
|
"name": "asika/simple-console",
|
||||||
|
@ -5441,6 +5441,71 @@
|
||||||
],
|
],
|
||||||
"time": "2024-02-10T21:37:25+00:00"
|
"time": "2024-02-10T21:37:25+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "php-mock/php-mock-mockery",
|
||||||
|
"version": "1.5.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/php-mock/php-mock-mockery.git",
|
||||||
|
"reference": "291994acdc26daf1e3c659cfbe58b01eeb180b7f"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/php-mock/php-mock-mockery/zipball/291994acdc26daf1e3c659cfbe58b01eeb180b7f",
|
||||||
|
"reference": "291994acdc26daf1e3c659cfbe58b01eeb180b7f",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"mockery/mockery": "^1",
|
||||||
|
"php": ">=5.6",
|
||||||
|
"php-mock/php-mock-integration": "^2.2.1 || ^3.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^4|^5|^8"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"phpmock\\mockery\\": "classes/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"WTFPL"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Markus Malkusch",
|
||||||
|
"email": "markus@malkusch.de",
|
||||||
|
"homepage": "http://markus.malkusch.de",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Mock built-in PHP functions (e.g. time()) with Mockery. This package relies on PHP's namespace fallback policy. No further extension is needed.",
|
||||||
|
"homepage": "https://github.com/php-mock/php-mock-mockery",
|
||||||
|
"keywords": [
|
||||||
|
"BDD",
|
||||||
|
"TDD",
|
||||||
|
"function",
|
||||||
|
"mock",
|
||||||
|
"mockery",
|
||||||
|
"stub",
|
||||||
|
"test",
|
||||||
|
"test double",
|
||||||
|
"testing"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/php-mock/php-mock-mockery/issues",
|
||||||
|
"source": "https://github.com/php-mock/php-mock-mockery/tree/1.5.0"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://github.com/michalbundyra",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2025-03-08T19:46:20+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "php-mock/php-mock-phpunit",
|
"name": "php-mock/php-mock-phpunit",
|
||||||
"version": "2.10.0",
|
"version": "2.10.0",
|
||||||
|
|
|
@ -15,6 +15,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Lock\Capability\ICanLock;
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
use Friendica\Core\Lock\Type\CacheLock;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
|
use Friendica\Network\HTTPException\NotFoundException;
|
||||||
use Friendica\Util\Profiler;
|
use Friendica\Util\Profiler;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Friendica\Network\HTTPException;
|
use Friendica\Network\HTTPException;
|
||||||
|
@ -41,9 +42,12 @@ class StatsCaching extends BaseModule
|
||||||
|
|
||||||
private function isAllowed(array $request): bool
|
private function isAllowed(array $request): bool
|
||||||
{
|
{
|
||||||
return empty(!$request['key']) && $request['key'] == $this->config->get('system', 'stats_key');
|
return !empty($request['key']) && $request['key'] == $this->config->get('system', 'stats_key');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws NotFoundException In case the rquest isn't allowed
|
||||||
|
*/
|
||||||
protected function content(array $request = []): string
|
protected function content(array $request = []): string
|
||||||
{
|
{
|
||||||
if (!$this->isAllowed($request)) {
|
if (!$this->isAllowed($request)) {
|
||||||
|
@ -98,6 +102,7 @@ class StatsCaching extends BaseModule
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->jsonExit($data);
|
$this->response->setType('json', 'application/json; charset=utf-8');
|
||||||
|
$this->response->addContent(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
26
tests/CacheLockTestCase.php
Normal file
26
tests/CacheLockTestCase.php
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// Copyright (C) 2010-2024, the Friendica project
|
||||||
|
// SPDX-FileCopyrightText: 2010-2024 the Friendica project
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
namespace Friendica\Test;
|
||||||
|
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
|
|
||||||
|
abstract class CacheLockTestCase extends LockTestCase
|
||||||
|
{
|
||||||
|
abstract protected function getCache(): ICanCacheInMemory;
|
||||||
|
|
||||||
|
abstract protected function getInstance(): ICanLock;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test if the getStats() result is identically to the getCacheStats()
|
||||||
|
*/
|
||||||
|
public function testGetStats()
|
||||||
|
{
|
||||||
|
self::assertSame(array_keys($this->getCache()->getStats()), array_keys($this->instance->getCacheStats()));
|
||||||
|
}
|
||||||
|
}
|
|
@ -7,22 +7,21 @@
|
||||||
|
|
||||||
namespace Friendica\Test;
|
namespace Friendica\Test;
|
||||||
|
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCache;
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
use Friendica\Core\Lock\Capability\ICanLock;
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
use Friendica\Test\MockedTestCase;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
|
|
||||||
abstract class LockTestCase extends MockedTestCase
|
abstract class LockTestCase extends MockedTestCase
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var int Start time of the mock (used for time operations)
|
* Start time of the mock (used for time operations)
|
||||||
*/
|
*/
|
||||||
protected $startTime = 1417011228;
|
protected int $startTime = 1417011228;
|
||||||
|
protected ICanLock $instance;
|
||||||
|
|
||||||
/**
|
abstract protected function getInstance(): ICanLock;
|
||||||
* @var ICanLock
|
|
||||||
*/
|
|
||||||
protected $instance;
|
|
||||||
|
|
||||||
abstract protected function getInstance();
|
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
|
@ -205,4 +204,6 @@ abstract class LockTestCase extends MockedTestCase
|
||||||
self::assertFalse($this->instance->isLocked('wrongLock'));
|
self::assertFalse($this->instance->isLocked('wrongLock'));
|
||||||
self::assertFalse($this->instance->release('wrongLock'));
|
self::assertFalse($this->instance->release('wrongLock'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,4 +33,12 @@ class ArrayCacheTest extends MemoryCacheTestCase
|
||||||
self::markTestSkipped("Array Cache doesn't support TTL");
|
self::markTestSkipped("Array Cache doesn't support TTL");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @small
|
||||||
|
*/
|
||||||
|
public function testGetStats()
|
||||||
|
{
|
||||||
|
self::assertEmpty($this->cache->getStats());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
56
tests/src/Core/Cache/ProfilerCacheDecoratorTest.php
Normal file
56
tests/src/Core/Cache/ProfilerCacheDecoratorTest.php
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// Copyright (C) 2010-2024, the Friendica project
|
||||||
|
// SPDX-FileCopyrightText: 2010-2024 the Friendica project
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
namespace Core\Cache;
|
||||||
|
|
||||||
|
use Friendica\Core\Cache\Type\ArrayCache;
|
||||||
|
use Friendica\Core\Cache\Type\ProfilerCacheDecorator;
|
||||||
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
|
use Friendica\Test\MemoryCacheTestCase;
|
||||||
|
use Friendica\Util\Profiler;
|
||||||
|
|
||||||
|
class ProfilerCacheDecoratorTest extends MemoryCacheTestCase
|
||||||
|
{
|
||||||
|
protected function getInstance()
|
||||||
|
{
|
||||||
|
$config = \Mockery::mock(IManageConfigValues::class);
|
||||||
|
$config->shouldReceive('get')->with('system', 'profiler')->once()->andReturn(false);
|
||||||
|
$config->shouldReceive('get')->with('rendertime', 'callstack')->once()->andReturn(false);
|
||||||
|
|
||||||
|
$this->cache = new ProfilerCacheDecorator(new ArrayCache('localhost'), new Profiler($config));
|
||||||
|
return $this->cache;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function tearDown(): void
|
||||||
|
{
|
||||||
|
$this->cache->clear(false);
|
||||||
|
parent::tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @doesNotPerformAssertions
|
||||||
|
*/
|
||||||
|
public function testTTL()
|
||||||
|
{
|
||||||
|
// Array Cache doesn't support TTL
|
||||||
|
self::markTestSkipped("Array Cache doesn't support TTL");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @small
|
||||||
|
*/
|
||||||
|
public function testGetStats()
|
||||||
|
{
|
||||||
|
self::assertEmpty($this->cache->getStats());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetName()
|
||||||
|
{
|
||||||
|
self::assertStringEndsWith(' (with profiler)', $this->instance->getName());
|
||||||
|
}
|
||||||
|
}
|
|
@ -7,26 +7,39 @@
|
||||||
|
|
||||||
namespace Friendica\Test\src\Core\Lock;
|
namespace Friendica\Test\src\Core\Lock;
|
||||||
|
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
use Friendica\Core\Cache\Type\APCuCache;
|
use Friendica\Core\Cache\Type\APCuCache;
|
||||||
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
use Friendica\Core\Lock\Type\CacheLock;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
use Friendica\Test\LockTestCase;
|
use Friendica\Test\CacheLockTestCase;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @group APCU
|
* @group APCU
|
||||||
*/
|
*/
|
||||||
class APCuCacheLockTest extends LockTestCase
|
class APCuCacheLockTest extends CacheLockTestCase
|
||||||
{
|
{
|
||||||
|
private APCuCache $cache;
|
||||||
|
private ICanLock $lock;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
if (!APCuCache::isAvailable()) {
|
if (!APCuCache::isAvailable()) {
|
||||||
static::markTestSkipped('APCu is not available');
|
static::markTestSkipped('APCu is not available');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->cache = new APCuCache('localhost');
|
||||||
|
$this->lock = new CacheLock($this->cache);
|
||||||
|
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getInstance()
|
protected function getInstance(): CacheLock
|
||||||
{
|
{
|
||||||
return new CacheLock(new APCuCache('localhost'));
|
return $this->lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getCache(): ICanCacheInMemory
|
||||||
|
{
|
||||||
|
return $this->cache;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,15 +7,32 @@
|
||||||
|
|
||||||
namespace Friendica\Test\src\Core\Lock;
|
namespace Friendica\Test\src\Core\Lock;
|
||||||
|
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
use Friendica\Core\Cache\Type\ArrayCache;
|
use Friendica\Core\Cache\Type\ArrayCache;
|
||||||
use Friendica\Core\Lock\Type\CacheLock;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
use Friendica\Test\LockTestCase;
|
use Friendica\Test\CacheLockTestCase;
|
||||||
|
|
||||||
class ArrayCacheLockTest extends LockTestCase
|
class ArrayCacheLockTest extends CacheLockTestCase
|
||||||
{
|
{
|
||||||
protected function getInstance()
|
private CacheLock $lock;
|
||||||
|
private ArrayCache $cache;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
return new CacheLock(new ArrayCache('localhost'));
|
$this->cache = new ArrayCache('localhost');
|
||||||
|
$this->lock = new CacheLock($this->cache);
|
||||||
|
|
||||||
|
parent::setUp();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getInstance(): CacheLock
|
||||||
|
{
|
||||||
|
return $this->lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getCache(): ICanCacheInMemory
|
||||||
|
{
|
||||||
|
return $this->cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
namespace Friendica\Test\src\Core\Lock;
|
namespace Friendica\Test\src\Core\Lock;
|
||||||
|
|
||||||
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
use Friendica\Core\Lock\Type\DatabaseLock;
|
use Friendica\Core\Lock\Type\DatabaseLock;
|
||||||
use Friendica\Test\LockTestCase;
|
use Friendica\Test\LockTestCase;
|
||||||
use Friendica\Test\Util\CreateDatabaseTrait;
|
use Friendica\Test\Util\CreateDatabaseTrait;
|
||||||
|
@ -26,7 +27,7 @@ class DatabaseLockDriverTest extends LockTestCase
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getInstance()
|
protected function getInstance(): ICanLock
|
||||||
{
|
{
|
||||||
return new DatabaseLock($this->getDbInstance(), $this->pid);
|
return new DatabaseLock($this->getDbInstance(), $this->pid);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,19 +8,23 @@
|
||||||
namespace Friendica\Test\src\Core\Lock;
|
namespace Friendica\Test\src\Core\Lock;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
use Friendica\Core\Cache\Type\MemcacheCache;
|
use Friendica\Core\Cache\Type\MemcacheCache;
|
||||||
use Friendica\Core\Config\Capability\IManageConfigValues;
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
use Friendica\Core\Lock\Type\CacheLock;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
use Friendica\Test\LockTestCase;
|
use Friendica\Test\CacheLockTestCase;
|
||||||
use Mockery;
|
use Mockery;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @requires extension Memcache
|
* @requires extension Memcache
|
||||||
* @group MEMCACHE
|
* @group MEMCACHE
|
||||||
*/
|
*/
|
||||||
class MemcacheCacheLockTest extends LockTestCase
|
class MemcacheCacheLockTest extends CacheLockTestCase
|
||||||
{
|
{
|
||||||
protected function getInstance()
|
private CacheLock $lock;
|
||||||
|
private MemcacheCache $cache;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$configMock = Mockery::mock(IManageConfigValues::class);
|
$configMock = Mockery::mock(IManageConfigValues::class);
|
||||||
|
|
||||||
|
@ -36,16 +40,24 @@ class MemcacheCacheLockTest extends LockTestCase
|
||||||
->with('system', 'memcache_port')
|
->with('system', 'memcache_port')
|
||||||
->andReturn($port);
|
->andReturn($port);
|
||||||
|
|
||||||
$lock = null;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$cache = new MemcacheCache($host, $configMock);
|
$this->cache = new MemcacheCache($host, $configMock);
|
||||||
$lock = new CacheLock($cache);
|
$this->lock = new CacheLock($this->cache);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
static::markTestSkipped('Memcache is not available');
|
static::markTestSkipped('Memcache is not available');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $lock;
|
parent::setUp();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getInstance(): CacheLock
|
||||||
|
{
|
||||||
|
return $this->lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getCache(): ICanCacheInMemory
|
||||||
|
{
|
||||||
|
return $this->cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,9 +8,11 @@
|
||||||
namespace Friendica\Test\src\Core\Lock;
|
namespace Friendica\Test\src\Core\Lock;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
use Friendica\Core\Cache\Type\MemcachedCache;
|
use Friendica\Core\Cache\Type\MemcachedCache;
|
||||||
use Friendica\Core\Config\Capability\IManageConfigValues;
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
use Friendica\Core\Lock\Type\CacheLock;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
|
use Friendica\Test\CacheLockTestCase;
|
||||||
use Friendica\Test\LockTestCase;
|
use Friendica\Test\LockTestCase;
|
||||||
use Mockery;
|
use Mockery;
|
||||||
use Psr\Log\NullLogger;
|
use Psr\Log\NullLogger;
|
||||||
|
@ -19,9 +21,12 @@ use Psr\Log\NullLogger;
|
||||||
* @requires extension memcached
|
* @requires extension memcached
|
||||||
* @group MEMCACHED
|
* @group MEMCACHED
|
||||||
*/
|
*/
|
||||||
class MemcachedCacheLockTest extends LockTestCase
|
class MemcachedCacheLockTest extends CacheLockTestCase
|
||||||
{
|
{
|
||||||
protected function getInstance()
|
private MemcachedCache $cache;
|
||||||
|
private CacheLock $lock;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$configMock = Mockery::mock(IManageConfigValues::class);
|
$configMock = Mockery::mock(IManageConfigValues::class);
|
||||||
|
|
||||||
|
@ -35,16 +40,24 @@ class MemcachedCacheLockTest extends LockTestCase
|
||||||
|
|
||||||
$logger = new NullLogger();
|
$logger = new NullLogger();
|
||||||
|
|
||||||
$lock = null;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$cache = new MemcachedCache($host, $configMock, $logger);
|
$this->cache = new MemcachedCache($host, $configMock, $logger);
|
||||||
$lock = new CacheLock($cache);
|
$this->lock = new CacheLock($this->cache);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
static::markTestSkipped('Memcached is not available');
|
static::markTestSkipped('Memcached is not available');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $lock;
|
parent::setUp();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getInstance(): CacheLock
|
||||||
|
{
|
||||||
|
return $this->lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getCache(): ICanCacheInMemory
|
||||||
|
{
|
||||||
|
return $this->cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,9 +8,11 @@
|
||||||
namespace Friendica\Test\src\Core\Lock;
|
namespace Friendica\Test\src\Core\Lock;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCacheInMemory;
|
||||||
use Friendica\Core\Cache\Type\RedisCache;
|
use Friendica\Core\Cache\Type\RedisCache;
|
||||||
use Friendica\Core\Config\Capability\IManageConfigValues;
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
use Friendica\Core\Lock\Type\CacheLock;
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
|
use Friendica\Test\CacheLockTestCase;
|
||||||
use Friendica\Test\LockTestCase;
|
use Friendica\Test\LockTestCase;
|
||||||
use Mockery;
|
use Mockery;
|
||||||
|
|
||||||
|
@ -18,9 +20,9 @@ use Mockery;
|
||||||
* @requires extension redis
|
* @requires extension redis
|
||||||
* @group REDIS
|
* @group REDIS
|
||||||
*/
|
*/
|
||||||
class RedisCacheLockTest extends LockTestCase
|
class RedisCacheLockTest extends CacheLockTestCase
|
||||||
{
|
{
|
||||||
protected function getInstance()
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$configMock = Mockery::mock(IManageConfigValues::class);
|
$configMock = Mockery::mock(IManageConfigValues::class);
|
||||||
|
|
||||||
|
@ -45,15 +47,23 @@ class RedisCacheLockTest extends LockTestCase
|
||||||
->with('system', 'redis_password')
|
->with('system', 'redis_password')
|
||||||
->andReturn(null);
|
->andReturn(null);
|
||||||
|
|
||||||
$lock = null;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$cache = new RedisCache($host, $configMock);
|
$this->cache = new RedisCache($host, $configMock);
|
||||||
$lock = new CacheLock($cache);
|
$this->lock = new CacheLock($this->cache);
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
static::markTestSkipped('Redis is not available. Error: ' . $e->getMessage());
|
static::markTestSkipped('Redis is not available. Error: ' . $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return $lock;
|
parent::setUp();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getInstance(): CAcheLock
|
||||||
|
{
|
||||||
|
return $this->lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getCache(): ICanCacheInMemory
|
||||||
|
{
|
||||||
|
return $this->cache;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ use Friendica\App;
|
||||||
use Friendica\Core\Config\Capability\IManageConfigValues;
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
use Friendica\Core\Config\Model\ReadOnlyFileConfig;
|
use Friendica\Core\Config\Model\ReadOnlyFileConfig;
|
||||||
use Friendica\Core\Config\ValueObject\Cache;
|
use Friendica\Core\Config\ValueObject\Cache;
|
||||||
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
use Friendica\Core\Lock\Type\SemaphoreLock;
|
use Friendica\Core\Lock\Type\SemaphoreLock;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
@ -40,7 +41,7 @@ class SemaphoreLockTest extends LockTestCase
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getInstance()
|
protected function getInstance(): ICanLock
|
||||||
{
|
{
|
||||||
return new SemaphoreLock();
|
return new SemaphoreLock();
|
||||||
}
|
}
|
||||||
|
|
205
tests/src/Module/StatsCachingTest.php
Normal file
205
tests/src/Module/StatsCachingTest.php
Normal file
|
@ -0,0 +1,205 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// Copyright (C) 2010-2024, the Friendica project
|
||||||
|
// SPDX-FileCopyrightText: 2010-2024 the Friendica project
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
namespace Friendica\Test\src\Module;
|
||||||
|
|
||||||
|
use Friendica\Capabilities\ICanCreateResponses;
|
||||||
|
use Friendica\Core\Cache\Capability\ICanCache;
|
||||||
|
use Friendica\Core\Cache\Type\ArrayCache;
|
||||||
|
use Friendica\Core\Cache\Type\DatabaseCache;
|
||||||
|
use Friendica\Core\Config\Capability\IManageConfigValues;
|
||||||
|
use Friendica\Core\Lock\Capability\ICanLock;
|
||||||
|
use Friendica\Core\Lock\Type\CacheLock;
|
||||||
|
use Friendica\Core\Lock\Type\DatabaseLock;
|
||||||
|
use Friendica\DI;
|
||||||
|
use Friendica\Module\Special\HTTPException;
|
||||||
|
use Friendica\Module\StatsCaching;
|
||||||
|
use Friendica\Test\FixtureTestCase;
|
||||||
|
use Mockery\MockInterface;
|
||||||
|
use phpmock\mockery\PHPMockery;
|
||||||
|
|
||||||
|
class StatsCachingTest extends FixtureTestCase
|
||||||
|
{
|
||||||
|
/** @var MockInterface|HTTPException */
|
||||||
|
protected $httpExceptionMock;
|
||||||
|
|
||||||
|
protected ICanCache $cache;
|
||||||
|
protected ICanLock $lock;
|
||||||
|
|
||||||
|
/** @var MockInterface|IManageConfigValues */
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
$this->httpExceptionMock = \Mockery::mock(HTTPException::class);
|
||||||
|
$this->config = \Mockery::mock(IManageConfigValues::class);
|
||||||
|
$this->cache = new ArrayCache('localhost');
|
||||||
|
$this->lock = new CacheLock($this->cache);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatsCachingNotAllowed()
|
||||||
|
{
|
||||||
|
$this->httpExceptionMock->shouldReceive('content')->andReturn('failed')->once();
|
||||||
|
|
||||||
|
$response = (new StatsCaching(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], $this->config, $this->cache, $this->lock, []))
|
||||||
|
->run($this->httpExceptionMock);
|
||||||
|
|
||||||
|
self::assertEquals('404', $response->getStatusCode());
|
||||||
|
self::assertEquals('Page not found', $response->getReasonPhrase());
|
||||||
|
self::assertEquals('failed', $response->getBody());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatsCachingWitMinimumCache()
|
||||||
|
{
|
||||||
|
$request = [
|
||||||
|
'key' => '12345',
|
||||||
|
];
|
||||||
|
$this->config->shouldReceive('get')->with('system', 'stats_key')->twice()->andReturn('12345');
|
||||||
|
PHPMockery::mock("Friendica\\Module", "function_exists")->with('opcache_get_status')->once()->andReturn(false);
|
||||||
|
|
||||||
|
$response = (new StatsCaching(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], $this->config, $this->cache, $this->lock, []))
|
||||||
|
->run($this->httpExceptionMock, $request);
|
||||||
|
|
||||||
|
self::assertJson($response->getBody());
|
||||||
|
self::assertEquals(['Content-type' => ['application/json; charset=utf-8'], ICanCreateResponses::X_HEADER => ['json']], $response->getHeaders());
|
||||||
|
|
||||||
|
$json = json_decode($response->getBody(), true);
|
||||||
|
|
||||||
|
self::assertEquals([
|
||||||
|
'type' => 'array',
|
||||||
|
'stats' => [],
|
||||||
|
], $json['cache']);
|
||||||
|
self::assertEquals([
|
||||||
|
'type' => 'array',
|
||||||
|
'stats' => [],
|
||||||
|
], $json['lock']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatsCachingWithDatabase()
|
||||||
|
{
|
||||||
|
$request = [
|
||||||
|
'key' => '12345',
|
||||||
|
];
|
||||||
|
$this->config->shouldReceive('get')->with('system', 'stats_key')->twice()->andReturn('12345');
|
||||||
|
|
||||||
|
$this->cache = new DatabaseCache('localhost', DI::dba());
|
||||||
|
$this->lock = new DatabaseLock(DI::dba());
|
||||||
|
PHPMockery::mock("Friendica\\Module", "function_exists")->with('opcache_get_status')->once()->andReturn(false);
|
||||||
|
|
||||||
|
$response = (new StatsCaching(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], $this->config, $this->cache, $this->lock, []))
|
||||||
|
->run($this->httpExceptionMock, $request);
|
||||||
|
|
||||||
|
self::assertJson($response->getBody());
|
||||||
|
self::assertEquals(['Content-type' => ['application/json; charset=utf-8'], ICanCreateResponses::X_HEADER => ['json']], $response->getHeaders());
|
||||||
|
|
||||||
|
$json = json_decode($response->getBody(), true);
|
||||||
|
|
||||||
|
self::assertEquals(['enabled' => false], $json['opcache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['cache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['lock']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatsCachingWithCache()
|
||||||
|
{
|
||||||
|
$request = [
|
||||||
|
'key' => '12345',
|
||||||
|
];
|
||||||
|
$this->config->shouldReceive('get')->with('system', 'stats_key')->twice()->andReturn('12345');
|
||||||
|
|
||||||
|
$this->cache = new DatabaseCache('localhost', DI::dba());
|
||||||
|
$this->lock = new DatabaseLock(DI::dba());
|
||||||
|
PHPMockery::mock("Friendica\\Module", "function_exists")->with('opcache_get_status')->once()->andReturn(false);
|
||||||
|
|
||||||
|
$response = (new StatsCaching(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], $this->config, $this->cache, $this->lock, []))
|
||||||
|
->run($this->httpExceptionMock, $request);
|
||||||
|
|
||||||
|
self::assertJson($response->getBody());
|
||||||
|
self::assertEquals(['Content-type' => ['application/json; charset=utf-8'], ICanCreateResponses::X_HEADER => ['json']], $response->getHeaders());
|
||||||
|
|
||||||
|
$json = json_decode($response->getBody(), true);
|
||||||
|
|
||||||
|
self::assertEquals(['enabled' => false], $json['opcache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['cache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['lock']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatsCachingWithOpcacheAndNull()
|
||||||
|
{
|
||||||
|
$request = [
|
||||||
|
'key' => '12345',
|
||||||
|
];
|
||||||
|
$this->config->shouldReceive('get')->with('system', 'stats_key')->twice()->andReturn('12345');
|
||||||
|
|
||||||
|
$this->cache = new DatabaseCache('localhost', DI::dba());
|
||||||
|
$this->lock = new DatabaseLock(DI::dba());
|
||||||
|
PHPMockery::mock("Friendica\\Module", "function_exists")->with('opcache_get_status')->once()->andReturn(true);
|
||||||
|
PHPMockery::mock("Friendica\\Module", "opcache_get_status")->with(false)->once()->andReturn(false);
|
||||||
|
|
||||||
|
$response = (new StatsCaching(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], $this->config, $this->cache, $this->lock, []))
|
||||||
|
->run($this->httpExceptionMock, $request);
|
||||||
|
|
||||||
|
self::assertJson($response->getBody());
|
||||||
|
self::assertEquals(['Content-type' => ['application/json; charset=utf-8'], ICanCreateResponses::X_HEADER => ['json']], $response->getHeaders());
|
||||||
|
|
||||||
|
$json = json_decode($response->getBody(), true);
|
||||||
|
|
||||||
|
print_r($json);
|
||||||
|
|
||||||
|
self::assertEquals([
|
||||||
|
'enabled' => false,
|
||||||
|
'hit_rate' => null,
|
||||||
|
'used_memory' => null,
|
||||||
|
'free_memory' => null,
|
||||||
|
'num_cached_scripts' => null,
|
||||||
|
], $json['opcache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['cache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['lock']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testStatsCachingWithOpcacheAndValues()
|
||||||
|
{
|
||||||
|
$request = [
|
||||||
|
'key' => '12345',
|
||||||
|
];
|
||||||
|
$this->config->shouldReceive('get')->with('system', 'stats_key')->twice()->andReturn('12345');
|
||||||
|
|
||||||
|
$this->cache = new DatabaseCache('localhost', DI::dba());
|
||||||
|
$this->lock = new DatabaseLock(DI::dba());
|
||||||
|
PHPMockery::mock("Friendica\\Module", "function_exists")->with('opcache_get_status')->once()->andReturn(true);
|
||||||
|
PHPMockery::mock("Friendica\\Module", "opcache_get_status")->with(false)->once()->andReturn([
|
||||||
|
'opcache_enabled' => true,
|
||||||
|
'opcache_statistics' => [
|
||||||
|
'opcache_hit_rate' => 1,
|
||||||
|
'num_cached_scripts' => 2,
|
||||||
|
],
|
||||||
|
'memory_usage' => [
|
||||||
|
'used_memory' => 3,
|
||||||
|
'free_memory' => 4,
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response = (new StatsCaching(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], $this->config, $this->cache, $this->lock, []))
|
||||||
|
->run($this->httpExceptionMock, $request);
|
||||||
|
|
||||||
|
self::assertJson($response->getBody());
|
||||||
|
self::assertEquals(['Content-type' => ['application/json; charset=utf-8'], ICanCreateResponses::X_HEADER => ['json']], $response->getHeaders());
|
||||||
|
|
||||||
|
$json = json_decode($response->getBody(), true);
|
||||||
|
|
||||||
|
self::assertEquals([
|
||||||
|
'enabled' => true,
|
||||||
|
'hit_rate' => 1,
|
||||||
|
'used_memory' => 3,
|
||||||
|
'free_memory' => 4,
|
||||||
|
'num_cached_scripts' => 2,
|
||||||
|
], $json['opcache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['cache']);
|
||||||
|
self::assertEquals(['type' => 'database'], $json['lock']);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue