Add App\Router dependency injection to App

[friendica.git] / tests / src / Database / DBStructureTest.php

diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 53c4e8895b2dac1afe52cea59b6d5ffa29af7f49..ec1531783e72595c6eb1b3532ee85adc86cc9c71 100644 (file)
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -1,33 +1,31 @@
 <?php
 
-namespace Friendica\Test\Database;
+namespace Friendica\Test\src\Database;
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Database\DBStructure;
 use Friendica\Factory;
 use Friendica\Test\DatabaseTest;
 use Friendica\Util\BasePath;
+use Friendica\Util\Config\ConfigFileLoader;
 
 class DBStructureTest extends DatabaseTest
 {
        public function setUp()
        {
-               $basedir = BasePath::create(dirname(__DIR__) . '/../../');
-               $configLoader = new Config\ConfigCacheLoader($basedir);
-               $config = Factory\ConfigFactory::createCache($configLoader);
-               $logger = Factory\LoggerFactory::create('test', $config);
-               $this->app = new App($config, $logger, false);
-               $this->logOutput = FActory\LoggerFactory::enableTest($this->app->getLogger());
+               $basePath = BasePath::create(dirname(__DIR__) . '/../../');
+               $mode = new App\Mode($basePath);
+               $router = new App\Router();
+               $configLoader = new ConfigFileLoader($basePath, $mode);
+               $configCache = Factory\ConfigFactory::createCache($configLoader);
+               $profiler = Factory\ProfilerFactory::create($configCache);
+               Factory\DBFactory::init($basePath, $configCache, $profiler, $_SERVER);
+               $config = Factory\ConfigFactory::createConfig($configCache);
+               Factory\ConfigFactory::createPConfig($configCache);
+               $logger = Factory\LoggerFactory::create('test', $config, $profiler);
+               $this->app = new App($config, $mode, $router, $logger, $profiler, false);
 
                parent::setUp();
-
-               // Default config
-               Config::set('config', 'hostname', 'localhost');
-               Config::set('system', 'throttle_limit_day', 100);
-               Config::set('system', 'throttle_limit_week', 100);
-               Config::set('system', 'throttle_limit_month', 100);
-               Config::set('system', 'theme', 'system_theme');
        }
 
        /**