Merge pull request #6412 from annando/issue-6149

[friendica.git] / tests / DatabaseTest.php

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 70caba71221996361129f479f7fe7328ef569894..2cb76dcad9ab39a013987026d6c4248bbe2afa56 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,34 +5,19 @@
 
 namespace Friendica\Test;
 
-use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
 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
 {
-       /**
-        * @var App The Friendica App
-        */
-       protected $app;
-
-       protected 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.
@@ -51,6 +36,11 @@ abstract class DatabaseTest extends TestCase
                        $this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
                }
 
+               DBA::connect(getenv('MYSQL_HOST'),
+                       getenv('MYSQL_USERNAME'),
+                       getenv('MYSQL_PASSWORD'),
+                       getenv('MYSQL_DATABASE'));
+
                if (!DBA::connected()) {
                        $this->markTestSkipped('Could not connect to the database.');
                }