Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / tests / DatabaseTest.php

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 1a1b53b1207f2ea2cc9e33583498e7e616faa5cb..acd0b7ac184d1adbe8a563f1754869103961754c 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,67 +5,35 @@
 
 namespace Friendica\Test;
 
-use dba;
-use Friendica\Database\DBStructure;
-use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+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;
 
 /**
  * Abstract class used by tests that need a database.
  */
 abstract class DatabaseTest extends TestCase
 {
-
        use TestCaseTrait;
 
        /**
-        * Renames an eventually existing .htconfig.php to .htconfig.php.tmp
-        * Creates a new .htconfig.php for bin/worker.php execution
+        * @var App The Friendica App
         */
-       public static function setUpBeforeClass()
-       {
-               parent::setUpBeforeClass();
-
-               $base_config_file_name = 'htconfig.php';
-               $config_file_name = '.htconfig.php';
-
-               $base_config_file_path = stream_resolve_include_path($base_config_file_name);
-               $config_file_path = dirname($base_config_file_path) . DIRECTORY_SEPARATOR . $config_file_name;
-               $config_file_path_tmp = $config_file_path . '.tmp';
-
-               if (file_exists($config_file_path)) {
-                       rename($config_file_path, $config_file_path_tmp);
-               }
-
-               $config_string = file_get_contents($base_config_file_path);
-
-               $config_string = str_replace('die(', '// die(', $config_string);
+       protected $app;
 
-               file_put_contents($config_file_path, $config_string);
-       }
-
-       /**
-        * Delete the created .htconfig.php
-        * Renames an eventually existing .htconfig.php.tmp to .htconfig.php
-        */
-       public static function tearDownAfterClass()
+       protected function setUp()
        {
-               $base_config_file_name = 'htconfig.php';
-               $config_file_name = '.htconfig.php';
-
-               $base_config_file_path = stream_resolve_include_path($base_config_file_name);
-               $config_file_path = dirname($base_config_file_path) . DIRECTORY_SEPARATOR . $config_file_name;
-               $config_file_path_tmp = $config_file_path . '.tmp';
+               // Reusable App object
+               $this->app = BaseObject::getApp();
 
-               if (file_exists($config_file_path)) {
-                       unlink($config_file_path);
-               }
-
-               if (file_exists($config_file_path_tmp)) {
-                       rename($config_file_path_tmp, $config_file_path);
-               }
+               Config::set('system', 'url', 'http://localhost');
+               Config::set('system', 'hostname', 'localhost');
+               Config::set('system', 'worker_dont_fork', true);
        }
 
        /**
@@ -81,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'));
        }
 
        /**