Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / tests / DatabaseTest.php

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 9f0990a72d5e0e420a3f97c93d67ba4df9977a71..acd0b7ac184d1adbe8a563f1754869103961754c 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,7 +5,10 @@
 
 namespace Friendica\Test;
 
-use Friendica\Database\dba;
+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;
@@ -16,9 +19,23 @@ use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
  */
 abstract class DatabaseTest extends TestCase
 {
-
        use TestCaseTrait;
 
+       /**
+        * @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);
+       }
+
        /**
         * Get database connection.
         *
@@ -32,11 +49,15 @@ abstract class DatabaseTest extends TestCase
         */
        protected function getConnection()
        {
-               if (!dba::connected()) {
+               if (!getenv('MYSQL_DATABASE')) {
+                       $this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
+               }
+
+               if (!DBA::connected()) {
                        $this->markTestSkipped('Could not connect to the database.');
                }
 
-               return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE'));
+               return $this->createDefaultDBConnection(DBA::getConnection(), getenv('MYSQL_DATABASE'));
        }
 
        /**