X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=579e45084d5617277b5f71fa367bf36b025534b7;hb=e627054f687e027e5de5418882ccf5d1fb75fda9;hp=b53d59161a5340e44c5096f57478db27ca25d540;hpb=eaa3e4d15737413848244410878f7eca3f6a9741;p=friendica.git diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php index b53d59161a..579e45084d 100644 --- a/tests/DatabaseTest.php +++ b/tests/DatabaseTest.php @@ -20,28 +20,6 @@ abstract class DatabaseTest extends TestCase use TestCaseTrait; - /** - * Creates .htconfig.php for bin/worker.php execution - */ - protected function setUp() - { - parent::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; - - if (!file_exists($config_file_path)) { - $config_string = file_get_contents($base_config_file_path); - - $config_string = str_replace('die(', '// die(', $config_string); - - file_put_contents($config_file_path, $config_string); - } - } - /** * Get database connection. * @@ -55,22 +33,11 @@ abstract class DatabaseTest extends TestCase */ protected function getConnection() { - if (!dba::$connected) { - dba::connect(getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'), getenv('MYSQL_USERNAME'), getenv('MYSQL_PASSWORD'), getenv('MYSQL_DATABASE')); - - 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(), getenv('DB')); + return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE')); } /**