Merge pull request #12820 from MrPetovan/bug/fatal-errors

[friendica.git] / tests / FixtureTest.php

diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php
index efb92803100bfcefd32310980334dfc83cb69823..e2e8ad725a393ff6cd94331673dba163839dfede 100644 (file)
--- a/tests/FixtureTest.php
+++ b/tests/FixtureTest.php
@@ -25,9 +25,9 @@ namespace Friendica\Test;
 use Dice\Dice;
 use Friendica\App\Arguments;
 use Friendica\App\Router;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\Session\Type\Memory;
 use Friendica\Database\Database;
@@ -39,68 +39,21 @@ use Friendica\Test\Util\VFSTrait;
 /**
  * Parent class for test cases requiring fixtures
  */
-abstract class FixtureTest extends DatabaseTest
+abstract class FixtureTest extends MockedTest
 {
-       use VFSTrait;
+       use FixtureTestTrait;
 
-       /** @var Dice */
-       protected $dice;
-
-       /**
-        * Create variables used by tests.
-        */
        protected function setUp(): void
        {
-               $this->setUpVfsDir();
-
                parent::setUp();
 
-               $server                   = $_SERVER;
-               $server['REQUEST_METHOD'] = Router::GET;
-
-               $this->dice = (new Dice())
-                       ->addRules(include __DIR__ . '/../static/dependencies.config.php')
-                       ->addRule(ConfigFileManager::class, [
-                               'instanceOf' => Config::class,
-                               'call'       => [['createConfigFileLoader', [$this->root->url(), $server,],
-                                                                 Dice::CHAIN_CALL]]])
-                       ->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true])
-                       ->addRule(IHandleSessions::class, ['instanceOf' => Memory::class, 'shared' => true, 'call' => null])
-                       ->addRule(Arguments::class, [
-                               'instanceOf' => Arguments::class,
-                               'call'       => [
-                                       ['determine', [$server, $_GET], Dice::CHAIN_CALL],
-                               ],
-                       ]);
-               DI::init($this->dice);
-
-               $configCache = $this->dice->create(Cache::class);
-               $configCache->set('database', 'disable_pdo', true);
-
-               /** @var Database $dba */
-               $dba = $this->dice->create(Database::class);
-
-               $dba->setTestmode(true);
-
-               DBStructure::checkInitialValues();
-
-               // Load the API dataset for the whole API
-               $this->loadFixture(__DIR__ . '/datasets/api.fixture.php', $dba);
+               $this->setUpFixtures();
        }
 
-       protected function useHttpMethod(string $method = Router::GET)
+       protected function tearDown(): void
        {
-               $server                   = $_SERVER;
-               $server['REQUEST_METHOD'] = $method;
-
-               $this->dice = $this->dice
-                       ->addRule(Arguments::class, [
-                               'instanceOf' => Arguments::class,
-                               'call'       => [
-                                       ['determine', [$server, $_GET], Dice::CHAIN_CALL],
-                               ],
-                       ]);
+               $this->tearDownFixtures();
 
-               DI::init($this->dice);
+               parent::tearDown();
        }
 }