bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Splitting ConfigCache & PConfigCache

Browse source 
- Remove IConfigCache & IPConfigCache
- Add new PConfigCache
- Add missing Logger::init() (bugfixing tests)
This commit is contained in:
Philipp Holzer 2019-07-12 22:38:50 +02:00
commit c82127ffb7
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
27 changed files with 527 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

75
tests/src/Core/Config/Cache/ConfigCacheTest.php
View file

@ -29,15 +29,11 @@ class ConfigCacheTest extends MockedTest
];
}
private function assertConfigValues($data, ConfigCache $configCache, $uid = null)
private function assertConfigValues($data, ConfigCache $configCache)
{
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
if (isset($uid)) {
$this->assertEquals($data[$cat][$key], $configCache->getP($uid, $cat, $key));
} else {
$this->assertEquals($data[$cat][$key], $configCache->get($cat, $key));
}
$this->assertEquals($data[$cat][$key], $configCache->get($cat, $key));
}
}
}
@ -180,73 +176,6 @@ class ConfigCacheTest extends MockedTest
$this->assertEmpty($configCache->getAll());
}
/**
* Test the setP() and getP() methods
* @dataProvider dataTests
*/
public function testSetGetP($data)
{
$configCache = new ConfigCache();
$uid = 345;
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$configCache->setP($uid, $cat, $key, $value);
}
}
$this->assertConfigValues($data, $configCache, $uid);
}
/**
* Test the getP() method with a category
*/
public function testGetPCat()
{
$configCache = new ConfigCache();
$uid = 345;
$configCache->loadP($uid, [
'system' => [
'key1' => 'value1',
'key2' => 'value2',
],
'config' => [
'key3' => 'value3',
],
]);
$this->assertEquals([
'key1' => 'value1',
'key2' => 'value2',
], $configCache->get($uid, 'system'));
}
/**
* Test the deleteP() method
* @dataProvider dataTests
*/
public function testDeleteP($data)
{
$configCache = new ConfigCache();
$uid = 345;
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$configCache->setP($uid, $cat, $key, $value);
}
}
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$configCache->deleteP($uid, $cat, $key);
}
}
$this->assertEmpty($configCache->getAll());
}
/**
* Test the keyDiff() method with result
* @dataProvider dataTests

252
tests/src/Core/Config/Cache/PConfigCacheTest.php Normal file
View file

@ -0,0 +1,252 @@
<?php
namespace Friendica\Test\src\Core\Config\Cache;
use Friendica\Core\Config\Cache\PConfigCache;
use Friendica\Test\MockedTest;
class PConfigCacheTest extends MockedTest
{
public function dataTests()
{
return [
'normal' => [
'data' => [
'system' => [
'test' => 'it',
'boolTrue' => true,
'boolFalse' => false,
'int' => 235,
'dec' => 2.456,
'array' => ['1', 2, '3', true, false],
],
'config' => [
'a' => 'value',
],
]
]
];
}
private function assertConfigValues($data, PConfigCache $configCache, $uid)
{
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$this->assertEquals($data[$cat][$key], $configCache->get($uid, $cat, $key));
}
}
}
/**
* Test the setP() and getP() methods
*
* @dataProvider dataTests
*/
public function testSetGet($data)
{
$configCache = new PConfigCache();
$uid = 345;
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$configCache->set($uid, $cat, $key, $value);
}
}
$this->assertConfigValues($data, $configCache, $uid);
}
/**
* Test the getP() method with a category
*/
public function testGetCat()
{
$configCache = new PConfigCache();
$uid = 345;
$configCache->load($uid, [
'system' => [
'key1' => 'value1',
'key2' => 'value2',
],
'config' => [
'key3' => 'value3',
],
]);
$this->assertEquals([
'key1' => 'value1',
'key2' => 'value2',
], $configCache->get($uid, 'system'));
}
/**
* Test the deleteP() method
*
* @dataProvider dataTests
*/
public function testDelete($data)
{
$configCache = new PConfigCache();
$uid = 345;
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$configCache->set($uid, $cat, $key, $value);
}
}
foreach ($data as $cat => $values) {
foreach ($values as $key => $value) {
$configCache->delete($uid, $cat, $key);
}
}
$this->assertEmpty($configCache->getAll());
}
/**
* Test the keyDiff() method with result
*
* @dataProvider dataTests
*/
public function testKeyDiffWithResult($data)
{
$configCache = new PConfigCache($data);
$diffConfig = [
'fakeCat' => [
'fakeKey' => 'value',
]
];
$this->assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
}
/**
* Test the keyDiff() method without result
*
* @dataProvider dataTests
*/
public function testKeyDiffWithoutResult($data)
{
$configCache = new PConfigCache();
$configCache->load(1, $data);
$diffConfig = $configCache->getAll();
$this->assertEmpty($configCache->keyDiff($diffConfig));
}
/**
* Test the default hiding of passwords inside the cache
*/
public function testPasswordHide()
{
$configCache = new PConfigCache();
$configCache->load(1, [
'database' => [
'password' => 'supersecure',
'username' => 'notsecured',
]
]);
$this->assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
$this->assertNotEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
$this->assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
}
/**
* Test disabling the hiding of passwords inside the cache
*/
public function testPasswordShow()
{
$configCache = new PConfigCache(false);
$configCache->load(1, [
'database' => [
'password' => 'supersecure',
'username' => 'notsecured',
]
]);
$this->assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
$this->assertEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
$this->assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
}
/**
* Test a empty password
*/
public function testEmptyPassword()
{
$configCache = new PConfigCache();
$configCache->load(1, [
'database' => [
'password' => '',
'username' => '',
]
]);
$this->assertEmpty($configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username'));
}
public function testWrongTypePassword()
{
$configCache = new PConfigCache();
$configCache->load(1, [
'database' => [
'password' => new \stdClass(),
'username' => '',
]
]);
$this->assertNotEmpty($configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username'));
$configCache = new PConfigCache();
$configCache->load(1, [
'database' => [
'password' => 23,
'username' => '',
],
]);
$this->assertEquals(23, $configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username'));
}
/**
* Test two different UID configs and make sure that there is no overlapping possible
*/
public function testTwoUid()
{
$configCache = new PConfigCache();
$configCache->load(1, [
'cat1' => [
'key1' => 'value1',
],
]);
$configCache->load(2, [
'cat2' => [
'key2' => 'value2',
],
]);
$this->assertEquals('value1', $configCache->get(1, 'cat1', 'key1'));
$this->assertEquals('value2', $configCache->get(2, 'cat2', 'key2'));
$this->assertNull($configCache->get(1, 'cat2', 'key2'));
$this->assertNull($configCache->get(2, 'cat1', 'key1'));
}
}

3
tests/src/Core/Config/ConfigurationTest.php
View file

@ -4,7 +4,6 @@ namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\Adapter\IConfigAdapter;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache\IConfigCache;
use Friendica\Core\Config\Configuration;
use Friendica\Test\MockedTest;
@ -35,7 +34,7 @@ class ConfigurationTest extends MockedTest
$configuration = new Configuration($configCache, $configAdapter);
$this->assertInstanceOf(IConfigCache::class, $configuration->getCache());
$this->assertInstanceOf(ConfigCache::class, $configuration->getCache());
}
/**

20
tests/src/Core/Config/PConfigurationTest.php
View file

@ -3,7 +3,7 @@
namespace Friendica\Test\src\Core\Config;
use Friendica\Core\Config\Adapter\IPConfigAdapter;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Config\Cache\PConfigCache;
use Friendica\Core\Config\PConfiguration;
use Friendica\Test\MockedTest;
@ -29,7 +29,7 @@ class PConfigurationTest extends MockedTest
public function testCacheLoad()
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
// expected loading
@ -51,7 +51,7 @@ class PConfigurationTest extends MockedTest
public function testCacheLoadDouble()
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
// expected loading
@ -77,7 +77,7 @@ class PConfigurationTest extends MockedTest
public function testSetGetWithoutDB($data)
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(2);
@ -95,7 +95,7 @@ class PConfigurationTest extends MockedTest
public function testSetGetWithDB($data)
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(2);
$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
@ -114,7 +114,7 @@ class PConfigurationTest extends MockedTest
public function testGetWrongWithoutDB()
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
@ -137,7 +137,7 @@ class PConfigurationTest extends MockedTest
public function testGetWithRefresh($data)
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
$configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
@ -168,7 +168,7 @@ class PConfigurationTest extends MockedTest
public function testGetWithoutLoaded($data)
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
@ -199,7 +199,7 @@ class PConfigurationTest extends MockedTest
public function testDeleteWithoutDB($data)
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
@ -218,7 +218,7 @@ class PConfigurationTest extends MockedTest
public function testDeleteWithDB()
{
$uid = 234;
$configCache = new ConfigCache();
$configCache = new PConfigCache();
$configAdapter = \Mockery::mock(IPConfigAdapter::class);
$configAdapter->shouldReceive('isConnected')->andReturn(true)->times(6);
$configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(false)->once();