X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2FDatabaseTest.php;h=fec31b05af6f69aa49deee5c16a9c957a445b5c7;hb=e0b1f4f2519c6a5e02f98423f34648f21aa5c879;hp=52ca3f68d37f098df050af42e878e6be6f563881;hpb=772d735f124957b000fe8c07d0238c04195695ea;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 52ca3f68d3..fec31b05af 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,28 +5,24 @@
 
 namespace Friendica\Test;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config;
+use Friendica\App;
 use Friendica\Database\DBA;
+use Friendica\Factory;
+use Friendica\Util\BasePath;
+use Friendica\Util\Config\ConfigFileLoader;
+use Friendica\Util\Profiler;
 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
 {
-	public 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.
@@ -45,6 +41,22 @@ abstract class DatabaseTest extends TestCase
 			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
 		}
 
+		$basePath = BasePath::create(dirname(__DIR__));
+		$mode = new App\Mode($basePath);
+		$configLoader = new ConfigFileLoader($basePath, $mode);
+		$config = Factory\ConfigFactory::createCache($configLoader);
+
+		$profiler = \Mockery::mock(Profiler::class);
+
+		DBA::connect(
+			$basePath,
+			$config,
+			$profiler,
+			getenv('MYSQL_HOST'),
+			getenv('MYSQL_USERNAME'),
+			getenv('MYSQL_PASSWORD'),
+			getenv('MYSQL_DATABASE'));
+
 		if (!DBA::connected()) {
 			$this->markTestSkipped('Could not connect to the database.');
 		}