Fixes: (#5447)

[friendica.git] / tests / DatabaseTest.php

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 525c9372f514cefb42f18f5a4400447ee1d0aeef..eb9399ab808a76f5c0b6366f3c2c0b71057bb2b4 100644 (file)
--- 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.
@@ -22,27 +21,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'));
        }
 
        /**
@@ -52,8 +46,6 @@ abstract class DatabaseTest extends TestCase
         */
        protected function getDataSet()
        {
-               return new YamlDataSet(
-                       __DIR__.'/datasets/api.yml'
-               );
+               return new YamlDataSet(__DIR__ . '/datasets/api.yml');
        }
 }