X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=79af5b5468a9495f86d390ceda58d1afdc4d64eb;hb=edffb7e24b11e3af7b50e2769aae9815d4f92063;hp=70caba71221996361129f479f7fe7328ef569894;hpb=5a02e39a65f8f685440228cc1d36738cbe15f32b;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 70caba7122..79af5b5468 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,34 +5,22 @@
 
 namespace Friendica\Test;
 
-use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\Factory;
+use Friendica\Util\BasePath;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
-use PHPUnit\Framework\TestCase;
 use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
 
+require_once __DIR__ . '/../boot.php';
+
 /**
  * Abstract class used by tests that need a database.
  */
-abstract class DatabaseTest extends TestCase
+abstract class DatabaseTest extends MockedTest
 {
-	/**
-	 * @var App The Friendica App
-	 */
-	protected $app;
-
-	protected function setUp()
-	{
-		// Reusable App object
-		$this->app = BaseObject::getApp();
-
-		Config::set('system', 'url', 'http://localhost');
-		Config::set('system', 'hostname', 'localhost');
-		Config::set('system', 'worker_dont_fork', true);
-	}
+	use TestCaseTrait;
 
 	/**
 	 * Get database connection.
@@ -51,6 +39,17 @@ abstract class DatabaseTest extends TestCase
 			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
 		}
 
+		$basedir = BasePath::create(dirname(__DIR__));
+		$configLoader = new Config\ConfigCacheLoader($basedir);
+		$config = Factory\ConfigFactory::createCache($configLoader);
+
+		DBA::connect(
+			$config,
+			getenv('MYSQL_HOST'),
+			getenv('MYSQL_USERNAME'),
+			getenv('MYSQL_PASSWORD'),
+			getenv('MYSQL_DATABASE'));
+
 		if (!DBA::connected()) {
 			$this->markTestSkipped('Could not connect to the database.');
 		}