Replace Config-Cache dependency with Config-Model (no more DB-waiting necessary)

tests/src/App/ModeTest.php

@@ -24,7 +24,7 @@ namespace Friendica\Test\src\App;
 use Detection\MobileDetect;
 use Friendica\App\Arguments;
 use Friendica\App\Mode;
-use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Database\Database;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\VFSTrait;
@@ -47,9 +47,9 @@ class ModeTest extends MockedTest
 	private $databaseMock;
 
 	/**
-	 * @var Cache|MockInterface
+	 * @var IManageConfigValues|MockInterface
 	 */
-	private $configCacheMock;
+	private $configMock;
 
 	protected function setUp(): void
 	{
@@ -57,8 +57,8 @@ class ModeTest extends MockedTest
 
 		$this->setUpVfsDir();
 
-		$this->databaseMock    = Mockery::mock(Database::class);
-		$this->configCacheMock = Mockery::mock(Cache::class);
+		$this->databaseMock = Mockery::mock(Database::class);
+		$this->configMock   = Mockery::mock(IManageConfigValues::class);
 	}
 
 	public function testItEmpty()
@@ -76,7 +76,7 @@ class ModeTest extends MockedTest
 
 		self::assertFalse($this->root->hasChild('config/local.config.php'));
 
-		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configCacheMock);
+		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configMock);
 
 		self::assertTrue($mode->isInstall());
 		self::assertFalse($mode->isNormal());
@@ -88,7 +88,7 @@ class ModeTest extends MockedTest
 	{
 		$this->databaseMock->shouldReceive('connected')->andReturn(false)->once();
 
-		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configCacheMock);
+		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configMock);
 
 		self::assertFalse($mode->isNormal());
 		self::assertTrue($mode->isInstall());
@@ -100,10 +100,10 @@ class ModeTest extends MockedTest
 	public function testWithMaintenanceMode()
 	{
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
-		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
+		$this->configMock->shouldReceive('get')->with('system', 'maintenance')
 							  ->andReturn(true)->once();
 
-		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configCacheMock);
+		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configMock);
 
 		self::assertFalse($mode->isNormal());
 		self::assertFalse($mode->isInstall());
@@ -114,10 +114,10 @@ class ModeTest extends MockedTest
 	public function testNormalMode()
 	{
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
-		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
+		$this->configMock->shouldReceive('get')->with('system', 'maintenance')
 							  ->andReturn(false)->once();
 
-		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configCacheMock);
+		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configMock);
 
 		self::assertTrue($mode->isNormal());
 		self::assertFalse($mode->isInstall());
@@ -131,10 +131,10 @@ class ModeTest extends MockedTest
 	public function testDisabledMaintenance()
 	{
 		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
-		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
+		$this->configMock->shouldReceive('get')->with('system', 'maintenance')
 							  ->andReturn(false)->once();
 
-		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configCacheMock);
+		$mode = (new Mode())->determine($this->root->url(), $this->databaseMock, $this->configMock);
 
 		self::assertTrue($mode->isNormal());
 		self::assertFalse($mode->isInstall());
@@ -149,7 +149,7 @@ class ModeTest extends MockedTest
 	{
 		$mode = new Mode();
 
-		$modeNew = $mode->determine('', $this->databaseMock, $this->configCacheMock);
+		$modeNew = $mode->determine('', $this->databaseMock, $this->configMock);
 
 		self::assertNotSame($modeNew, $mode);
 	}

tests/src/Core/Cache/DatabaseCacheTest.php

@@ -57,11 +57,12 @@ class DatabaseCacheTest extends CacheTest
 		$configFactory     = new Config();
 		$configFileManager = (new Config())->createConfigFileManager($this->root->url(), []);
 		$configCache       = $configFactory->createCache($configFileManager);
+		$config            = new \Friendica\Core\Config\Model\Config($configFileManager, $configCache);
 
 		$dbaDefinition  = (new DbaDefinition($configCache->get('system', 'basepath')))->load();
 		$viewDefinition = (new ViewDefinition($configCache->get('system', 'basepath')))->load();
 
-		$dba = new StaticDatabase($configCache, $profiler, $dbaDefinition, $viewDefinition);
+		$dba = new StaticDatabase($config, $profiler, $dbaDefinition, $viewDefinition);
 
 		$this->cache = new Cache\Type\DatabaseCache('database', $dba);
 		return $this->cache;

tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php

@@ -21,20 +21,14 @@
 
 namespace Friendica\Test\src\Core\KeyValueStorage;
 
-use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
 use Friendica\Core\KeyValueStorage\Type\DBKeyValueStorage;
 use Friendica\Database\Database;
-use Friendica\Database\Definition\DbaDefinition;
-use Friendica\Database\Definition\ViewDefinition;
-use Friendica\Test\DatabaseTestTrait;
-use Friendica\Test\Util\Database\StaticDatabase;
-use Friendica\Util\BasePath;
-use Friendica\Util\Profiler;
+use Friendica\Test\Util\CreateDatabaseTrait;
 
 class DBKeyValueStorageTest extends KeyValueStorageTest
 {
-	use DatabaseTestTrait;
+	use CreateDatabaseTrait;
 
 	/** @var Database */
 	protected $database;
@@ -43,6 +37,7 @@ class DBKeyValueStorageTest extends KeyValueStorageTest
 	{
 		parent::setUp();
 
+		$this->setUpVfsDir();
 		$this->setUpDb();
 	}
 
@@ -55,13 +50,7 @@ class DBKeyValueStorageTest extends KeyValueStorageTest
 
 	public function getInstance(): IManageKeyValuePairs
 	{
-		$cache = new Cache();
-		$cache->set('database', 'disable_pdo', true);
-
-		$basePath = new BasePath(dirname(__FILE__, 5), $_SERVER);
-
-		$this->database = new StaticDatabase($cache, new Profiler($cache), (new DbaDefinition($basePath->getPath()))->load(), (new ViewDefinition($basePath->getPath()))->load());
-		$this->database->setTestmode(true);
+		$this->database = $this->getDbInstance();
 
 		return new DBKeyValueStorage($this->database);
 	}

tests/src/Core/Lock/DatabaseLockDriverTest.php

@@ -21,27 +21,15 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Lock\Type\DatabaseLock;
-use Friendica\Database\Database;
-use Friendica\Database\Definition\DbaDefinition;
-use Friendica\Database\Definition\ViewDefinition;
-use Friendica\Test\DatabaseTestTrait;
-use Friendica\Test\Util\Database\StaticDatabase;
-use Friendica\Test\Util\VFSTrait;
-use Friendica\Util\BasePath;
-use Friendica\Util\Profiler;
+use Friendica\Test\Util\CreateDatabaseTrait;
 
 class DatabaseLockDriverTest extends LockTest
 {
-	use VFSTrait;
-	use DatabaseTestTrait;
+	use CreateDatabaseTrait;
 
 	protected $pid = 123;
 
-	/** @var Database */
-	protected $database;
-
 	protected function setUp(): void
 	{
 		$this->setUpVfsDir();
@@ -53,21 +41,13 @@ class DatabaseLockDriverTest extends LockTest
 
 	protected function getInstance()
 	{
-		$cache = new Cache();
-		$cache->set('database', 'disable_pdo', true);
-
-		$basePath = new BasePath(dirname(__FILE__, 5), $_SERVER);
-
-		$this->database = new StaticDatabase($cache, new Profiler($cache), (new DbaDefinition($basePath->getPath()))->load(), (new ViewDefinition($basePath->getPath()))->load());
-		$this->database->setTestmode(true);
-
-		return new DatabaseLock($this->database, $this->pid);
+		return new DatabaseLock($this->getDbInstance(), $this->pid);
 	}
 
 	protected function tearDown(): void
 	{
-		$this->tearDownDb();
-
 		parent::tearDown();
+
+		$this->tearDownDb();
 	}
 }

tests/src/Core/Storage/DatabaseStorageTest.php

@@ -21,20 +21,12 @@
 
 namespace Friendica\Test\src\Core\Storage;
 
-use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Storage\Type\Database;
-use Friendica\Database\Definition\DbaDefinition;
-use Friendica\Database\Definition\ViewDefinition;
-use Friendica\Test\DatabaseTestTrait;
-use Friendica\Test\Util\Database\StaticDatabase;
-use Friendica\Test\Util\VFSTrait;
-use Friendica\Util\Profiler;
-use Psr\Log\NullLogger;
+use Friendica\Test\Util\CreateDatabaseTrait;
 
 class DatabaseStorageTest extends StorageTest
 {
-	use DatabaseTestTrait;
-	use VFSTrait;
+	use CreateDatabaseTrait;
 
 	protected function setUp(): void
 	{
@@ -47,28 +39,13 @@ class DatabaseStorageTest extends StorageTest
 
 	protected function getInstance()
 	{
-		$profiler = \Mockery::mock(Profiler::class);
-		$profiler->shouldReceive('startRecording');
-		$profiler->shouldReceive('stopRecording');
-		$profiler->shouldReceive('saveTimestamp')->withAnyArgs()->andReturn(true);
-
-		// load real config to avoid mocking every config-entry which is related to the Database class
-		$configFactory     = new Config();
-		$configFileManager = (new Config())->createConfigFileManager($this->root->url());
-		$configCache       = $configFactory->createCache($configFileManager);
-
-		$dbaDefinition  = (new DbaDefinition($configCache->get('system', 'basepath')))->load();
-		$viewDefinition = (new ViewDefinition($configCache->get('system', 'basepath')))->load();
-
-		$dba = new StaticDatabase($configCache, $profiler, $dbaDefinition, $viewDefinition);
-
-		return new Database($dba);
+		return new Database($this->getDbInstance());
 	}
 
 	protected function tearDown(): void
 	{
-		$this->tearDownDb();
-
 		parent::tearDown();
+
+		$this->tearDownDb();
 	}
 }

tests/src/Core/Storage/Repository/StorageManagerTest.php

@@ -41,6 +41,7 @@ use Friendica\DI;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Storage\Type;
 use Friendica\Test\DatabaseTest;
+use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\Profiler;
@@ -51,10 +52,8 @@ use Friendica\Test\Util\SampleStorageBackend;
 
 class StorageManagerTest extends DatabaseTest
 {
-	use VFSTrait;
+	use CreateDatabaseTrait;
 
-	/** @var Database */
-	private $dba;
 	/** @var IManageConfigValues */
 	private $config;
 	/** @var LoggerInterface */
@@ -62,37 +61,33 @@ class StorageManagerTest extends DatabaseTest
 	/** @var L10n */
 	private $l10n;
 
+	/** @var Database */
+	protected $database;
+
 	protected function setUp(): void
 	{
 		parent::setUp();
 
 		$this->setUpVfsDir();
 
+		$this->setUpDb();
+
 		vfsStream::newDirectory(Type\FilesystemConfig::DEFAULT_BASE_FOLDER, 0777)->at($this->root);
 
 		$this->logger = new NullLogger();
 
-		$profiler = \Mockery::mock(Profiler::class);
-		$profiler->shouldReceive('startRecording');
-		$profiler->shouldReceive('stopRecording');
-		$profiler->shouldReceive('saveTimestamp')->withAnyArgs()->andReturn(true);
-
-		// load real config to avoid mocking every config-entry which is related to the Database class
 		$configFactory     = new Config();
 		$configFileManager = $configFactory->createConfigFileManager($this->root->url());
 		$configCache       = $configFactory->createCache($configFileManager);
 
-		$dbaDefinition  = (new DbaDefinition($configCache->get('system', 'basepath')))->load();
-		$viewDefinition = (new ViewDefinition($configCache->get('system', 'basepath')))->load();
-
-		$this->dba = new StaticDatabase($configCache, $profiler, $dbaDefinition, $viewDefinition);
-
 		$this->config = new \Friendica\Core\Config\Model\Config($configFileManager, $configCache);
 		$this->config->set('storage', 'name', 'Database');
 		$this->config->set('storage', 'filesystem_path', $this->root->getChild(Type\FilesystemConfig::DEFAULT_BASE_FOLDER)
 																	->url());
 
 		$this->l10n = \Mockery::mock(L10n::class);
+
+		$this->database = $this->getDbInstance();
 	}
 
 	protected function tearDown(): void
@@ -107,7 +102,7 @@ class StorageManagerTest extends DatabaseTest
 	 */
 	public function testInstance()
 	{
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		self::assertInstanceOf(StorageManager::class, $storageManager);
 	}
@@ -169,7 +164,7 @@ class StorageManagerTest extends DatabaseTest
 			$this->config->set('storage', 'name', $name);
 		}
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		if ($interface === ICanWriteToStorage::class) {
 			$storage = $storageManager->getWritableStorageByName($name);
@@ -189,7 +184,7 @@ class StorageManagerTest extends DatabaseTest
 	 */
 	public function testIsValidBackend($name, $valid, $interface, $assert, $assertName)
 	{
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		// true in every of the backends
 		self::assertEquals(!empty($assertName), $storageManager->isValidBackend($name));
@@ -203,7 +198,7 @@ class StorageManagerTest extends DatabaseTest
 	 */
 	public function testListBackends()
 	{
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
 	}
@@ -219,7 +214,7 @@ class StorageManagerTest extends DatabaseTest
 			static::markTestSkipped('only works for ICanWriteToStorage');
 		}
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		$selBackend = $storageManager->getWritableStorageByName($name);
 		$storageManager->setBackend($selBackend);
@@ -239,7 +234,7 @@ class StorageManagerTest extends DatabaseTest
 			$this->expectException(InvalidClassStorageException::class);
 		}
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		self::assertInstanceOf($assert, $storageManager->getBackend());
 	}
@@ -260,7 +255,7 @@ class StorageManagerTest extends DatabaseTest
 			->addRule(IHandleSessions::class, ['instanceOf' => Memory::class, 'shared' => true, 'call' => null]);
 		DI::init($dice);
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		self::assertTrue($storageManager->register(SampleStorageBackend::class));
 
@@ -288,7 +283,7 @@ class StorageManagerTest extends DatabaseTest
 			->addRule(IHandleSessions::class, ['instanceOf' => Memory::class, 'shared' => true, 'call' => null]);
 		DI::init($dice);
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 
 		self::assertTrue($storageManager->register(SampleStorageBackend::class));
 
@@ -325,15 +320,15 @@ class StorageManagerTest extends DatabaseTest
 			self::markTestSkipped("No user backend");
 		}
 
-		$this->loadFixture(__DIR__ . '/../../../../datasets/storage/database.fixture.php', $this->dba);
+		$this->loadFixture(__DIR__ . '/../../../../datasets/storage/database.fixture.php', $this->database);
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 		$storage        = $storageManager->getWritableStorageByName($name);
 		$storageManager->move($storage);
 
-		$photos = $this->dba->select('photo', ['backend-ref', 'backend-class', 'id', 'data']);
+		$photos = $this->database->select('photo', ['backend-ref', 'backend-class', 'id', 'data']);
 
-		while ($photo = $this->dba->fetch($photos)) {
+		while ($photo = $this->database->fetch($photos)) {
 			self::assertEmpty($photo['data']);
 
 			$storage = $storageManager->getByName($photo['backend-class']);
@@ -351,7 +346,7 @@ class StorageManagerTest extends DatabaseTest
 		$this->expectException(InvalidClassStorageException::class);
 		$this->expectExceptionMessage('Backend SystemResource is not valid');
 
-		$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n, false);
+		$storageManager = new StorageManager($this->database, $this->config, $this->logger, $this->l10n, false);
 		$storage        = $storageManager->getWritableStorageByName(SystemResource::getName());
 		$storageManager->move($storage);
 	}

tests/src/Util/BaseURLTest.php

@@ -23,9 +23,7 @@ namespace Friendica\Test\src\Util;
 
 use Friendica\App\BaseURL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Config\Capability\ISetConfigValuesTransactionally;
 use Friendica\Core\Config\Model\Config;
-use Friendica\Core\Config\Model\ConfigTransaction;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Test\MockedTest;

tests/src/Util/ProfilerTest.php

@@ -21,7 +21,6 @@
 
 namespace Friendica\Test\src\Util;
 
-use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Test\MockedTest;
 use Friendica\Util\Profiler;
@@ -47,12 +46,12 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testSetUp()
 	{
-		$configCache = \Mockery::mock(Cache::class);
-		$configCache->shouldReceive('get')
+		$config = \Mockery::mock(IManageConfigValues::class);
+		$config->shouldReceive('get')
 		            ->withAnyArgs()
 		            ->andReturn(true)
 		            ->twice();
-		$profiler = new Profiler($configCache);
+		$profiler = new Profiler($config);
 
 		self::assertInstanceOf(Profiler::class, $profiler);
 	}
@@ -124,13 +123,13 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testSaveTimestamp($timestamp, $name, array $functions)
 	{
-		$configCache = \Mockery::mock(Cache::class);
-		$configCache->shouldReceive('get')
+		$config = \Mockery::mock(IManageConfigValues::class);
+		$config->shouldReceive('get')
 		            ->withAnyArgs()
 		            ->andReturn(true)
 		            ->twice();
 
-		$profiler = new Profiler($configCache);
+		$profiler = new Profiler($config);
 
 		foreach ($functions as $function) {
 			$profiler->saveTimestamp($timestamp, $name, $function);
@@ -145,13 +144,13 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testReset($timestamp, $name)
 	{
-		$configCache = \Mockery::mock(Cache::class);
-		$configCache->shouldReceive('get')
+		$config = \Mockery::mock(IManageConfigValues::class);
+		$config->shouldReceive('get')
 		            ->withAnyArgs()
 		            ->andReturn(true)
 		            ->twice();
 
-		$profiler = new Profiler($configCache);
+		$profiler = new Profiler($config);
 
 		$profiler->saveTimestamp($timestamp, $name);
 		$profiler->reset();
@@ -208,13 +207,13 @@ class ProfilerTest extends MockedTest
 			->shouldReceive('info')
 			->once();
 
-		$configCache = \Mockery::mock(Cache::class);
-		$configCache->shouldReceive('get')
+		$config = \Mockery::mock(IManageConfigValues::class);
+		$config->shouldReceive('get')
 		            ->withAnyArgs()
 		            ->andReturn(true)
 		            ->twice();
 
-		$profiler = new Profiler($configCache);
+		$profiler = new Profiler($config);
 
 		foreach ($data as $perf => $items) {
 			foreach ($items['functions'] as $function) {
@@ -233,60 +232,4 @@ class ProfilerTest extends MockedTest
 			}
 		}
 	}
-
-	/**
-	 * Test different enable and disable states of the profiler
-	 */
-	public function testEnableDisable()
-	{
-		$configCache = \Mockery::mock(Cache::class);
-		$configCache->shouldReceive('get')
-		            ->with('system', 'profiler')
-		            ->andReturn(true)
-		            ->once();
-		$configCache->shouldReceive('get')
-		            ->with('rendertime', 'callstack')
-		            ->andReturn(false)
-		            ->once();
-
-		$profiler = new Profiler($configCache);
-
-		self::assertFalse($profiler->isRendertime());
-		self::assertEmpty($profiler->getRendertimeString());
-
-		$profiler->saveTimestamp(time(), 'network', 'test1');
-
-		$config = \Mockery::mock(IManageConfigValues::class);
-		$config->shouldReceive('get')
-		            ->with('system', 'profiler')
-		            ->andReturn(false)
-		            ->once();
-		$config->shouldReceive('get')
-		            ->with('rendertime', 'callstack')
-		            ->andReturn(false)
-		            ->once();
-
-		$profiler->update($config);
-
-		self::assertFalse($profiler->isRendertime());
-		self::assertEmpty($profiler->getRendertimeString());
-
-		$config->shouldReceive('get')
-		       ->with('system', 'profiler')
-		       ->andReturn(true)
-		       ->once();
-		$config->shouldReceive('get')
-		       ->with('rendertime', 'callstack')
-		       ->andReturn(true)
-		       ->once();
-
-		$profiler->update($config);
-
-		$profiler->saveTimestamp(time(), 'database', 'test2');
-
-		self::assertTrue($profiler->isRendertime());
-		$output = $profiler->getRendertimeString();
-		self::assertMatchesRegularExpression('/test1: \d+/', $output);
-		self::assertMatchesRegularExpression('/test2: \d+/', $output);
-	}
 }