X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=579e45084d5617277b5f71fa367bf36b025534b7;hb=2d0446bd38b8954247def42e70da735667cc2ed2;hp=c0a5c7b8dfc81370c46931055f3959f76a8cd24e;hpb=3195d6e125fddbb219a8bde13b588fcafc5fd821;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index c0a5c7b8df..579e45084d 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -11,7 +11,6 @@ use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
-use PDO;
 
 /**
  * Abstract class used by tests that need a database.
@@ -23,27 +22,22 @@ abstract class DatabaseTest extends TestCase
 
 	/**
 	 * Get database connection.
+	 *
+	 * This function is executed before each test in order to get a database connection that can be used by tests.
+	 * If no prior connection is available, it tries to create one using the USER, PASS and DB environment variables.
+	 *
+	 * If it could not connect to the database, the test is skipped.
+	 *
 	 * @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
 	 * @see https://phpunit.de/manual/5.7/en/database.html
 	 */
 	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 (!dba::connected()) {
+			$this->markTestSkipped('Could not connect to the database.');
 		}
 
-		return $this->createDefaultDBConnection(dba::get_db(), 'friendica_test:');
+		return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE'));
 	}
 
 	/**
@@ -53,8 +47,6 @@ abstract class DatabaseTest extends TestCase
 	 */
 	protected function getDataSet()
 	{
-		return new YamlDataSet(
-			__DIR__.'/datasets/api.yml'
-		);
+		return new YamlDataSet(__DIR__ . '/datasets/api.yml');
 	}
 }