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 408e4b0cd3cba2503303c1125f69559d179905b2..acd0b7ac184d1adbe8a563f1754869103961754c 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,43 +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;
 
        /**
-        * Creates .htconfig.php for bin/worker.php execution
+        * @var App The Friendica App
         */
+       protected $app;
+
        protected function setUp()
        {
-               parent::setUp();
-
-               $base_config_file_name = 'htconfig.php';
-               $config_file_name = '.htconfig.php';
+               // Reusable App object
+               $this->app = BaseObject::getApp();
 
-               $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_string = file_get_contents($base_config_file_path);
-
-               $config_string = str_replace('die(', '// die(');
-               $config_string = str_replace('your.mysqlhost.com', 'localhost');
-               $config_string = str_replace('mysqlusername'     , getenv('USER'));
-               $config_string = str_replace('mysqlpassword'     , getenv('PASS'));
-               $config_string = str_replace('mysqldatabasename' , getenv('DB'));
-
-               file_put_contents($config_file_path, $config_string);
+               Config::set('system', 'url', 'http://localhost');
+               Config::set('system', 'hostname', 'localhost');
+               Config::set('system', 'worker_dont_fork', true);
        }
 
        /**
@@ -57,22 +49,15 @@ 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';
+               if (!getenv('MYSQL_DATABASE')) {
+                       $this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
+               }
 
-                               // 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::getConnection(), getenv('MYSQL_DATABASE'));
        }
 
        /**