Merge pull request #12679 from nupplaphil/feat/reduce_config_dependency

[friendica.git] / tests / src / Core / KeyValueStorage / DBKeyValueStorageTest.php

diff --git a/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php b/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php
index f9c88400a06f1b3424e2b17246193b88982cd077..8371effefbd2783cf9eb3dd72c8472e28bebe9c8 100644 (file)
--- a/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php
+++ b/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);
        }