X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=eb9399ab808a76f5c0b6366f3c2c0b71057bb2b4;hb=2970a976d52abd83e85c6d238055bc8982d4e1e0;hp=12150932c9dba2a6da019514d2284da17f53f010;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 12150932c9..eb9399ab80 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,12 +5,11 @@
 
 namespace Friendica\Test;
 
-use dba;
-use Friendica\Database\DBStructure;
-use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+use Friendica\Database\DBA;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
 
 /**
  * Abstract class used by tests that need a database.
@@ -33,22 +32,11 @@ 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 (!DBA::connected()) {
+			$this->markTestSkipped('Could not connect to the database.');
 		}
 
-		return $this->createDefaultDBConnection(dba::get_db(), getenv('DB'));
+		return $this->createDefaultDBConnection(DBA::get_db(), getenv('MYSQL_DATABASE'));
 	}
 
 	/**