From 104086215c6c85cb84345f1379fee58ffbba99bd Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Tue, 5 Feb 2019 22:03:07 +0100
Subject: [PATCH] Fixing tests

---
 tests/include/ApiTest.php              | 15 ++++++++++-----
 tests/src/Database/DBATest.php         | 14 ++++++++++----
 tests/src/Database/DBStructureTest.php | 14 ++++++++++----
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 9cf3e2ea5d..be70d923bd 100644
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -5,13 +5,14 @@
 
 namespace Friendica\Test;
 
-use Friendica\BaseObject;
+use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Factory\LoggerFactory;
+use Friendica\Factory;
 use Friendica\Network\HTTPException;
+use Friendica\Util\BasePath;
 use Monolog\Handler\TestHandler;
 
 require_once __DIR__ . '/../../include/api.php';
@@ -34,10 +35,14 @@ class ApiTest extends DatabaseTest
 	 */
 	public function setUp()
 	{
-		parent::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());
 
-		$this->app = BaseObject::getApp();
-		$this->logOutput = LoggerFactory::enableTest($this->app->getLogger());
+		parent::setUp();
 
 		// User data that the test database is populated with
 		$this->selfUser = [
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index 17ac55fd7a..f2a5cc5558 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -1,19 +1,25 @@
 <?php
 namespace Friendica\Test\Database;
 
-use Friendica\BaseObject;
+use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\Factory;
 use Friendica\Test\DatabaseTest;
+use Friendica\Util\BasePath;
 
 class DBATest extends DatabaseTest
 {
 	public function setUp()
 	{
-		parent::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());
 
-		// Reusable App object
-		$this->app = BaseObject::getApp();
+		parent::setUp();
 
 		// Default config
 		Config::set('config', 'hostname', 'localhost');
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 268bf8eedd..53c4e8895b 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -2,19 +2,25 @@
 
 namespace Friendica\Test\Database;
 
-use Friendica\BaseObject;
+use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBStructure;
+use Friendica\Factory;
 use Friendica\Test\DatabaseTest;
+use Friendica\Util\BasePath;
 
 class DBStructureTest extends DatabaseTest
 {
 	public function setUp()
 	{
-		parent::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());
 
-		// Reusable App object
-		$this->app = BaseObject::getApp();
+		parent::setUp();
 
 		// Default config
 		Config::set('config', 'hostname', 'localhost');
-- 
2.39.5