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

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 5a9a563a5d..79af5b5468 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,19 +5,21 @@
 
 namespace Friendica\Test;
 
-use dba;
-use Friendica\Database\DBStructure;
-use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+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
 {
-
 	use TestCaseTrait;
 
 	/**
@@ -33,22 +35,26 @@ abstract class DatabaseTest extends TestCase
 	 */
 	protected function getConnection()
 	{
-		if (!dba::$connected) {
-			dba::connect('localhost', getenv('USER'), getenv('PASS'), getenv('DB'));
-
-			if (dba::$connected) {
-				$app = get_app();
-				// We need to do this in order to disable logging
-				$app->module = 'install';
-
-				// Create database structure
-				DBStructure::update(false, true, true);
-			} else {
-				$this->markTestSkipped('Could not connect to the database.');
-			}
+		if (!getenv('MYSQL_DATABASE')) {
+			$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.');
 		}
 
-		return $this->createDefaultDBConnection(dba::get_db(), 'friendica_test:');
+		return $this->createDefaultDBConnection(DBA::getConnection(), getenv('MYSQL_DATABASE'));
 	}
 
 	/**