X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=579e45084d5617277b5f71fa367bf36b025534b7;hb=2d0446bd38b8954247def42e70da735667cc2ed2;hp=04509724ac103b3aaf568a750992845cba68a986;hpb=c829e4372561660a1b7f365e3210cc7d49124642;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 04509724ac..579e45084d 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -6,8 +6,6 @@
 namespace Friendica\Test;
 
 use dba;
-use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Database\DBStructure;
 use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
@@ -19,83 +17,9 @@ use PHPUnit\Framework\TestCase;
  */
 abstract class DatabaseTest extends TestCase
 {
-	/**
-	 * @var \Friendica\App
-	 */
-	protected $app;
 
 	use TestCaseTrait;
 
-	/**
-	 * Creates basic instances for testing with databases
-	 *
-	 * @throws \Exception
-	 */
-	protected function setUp()
-	{
-		global $a;
-		parent::setUp();
-
-		// Reusable App object
-		$this->app = new App(__DIR__.'/../');
-		$a = $this->app;
-
-		// Default config
-		Config::set('config', 'hostname', 'localhost');
-		Config::set('system', 'throttle_limit_day', 100);
-		Config::set('system', 'throttle_limit_week', 100);
-		Config::set('system', 'throttle_limit_month', 100);
-		Config::set('system', 'theme', 'system_theme');
-	}
-
-	/**
-	 * Renames an eventually existing .htconfig.php to .htconfig.php.tmp
-	 * Creates a new .htconfig.php for bin/worker.php execution
-	 */
-	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);
-
-		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()
-	{
-		$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)) {
-			unlink($config_file_path);
-		}
-
-		if (file_exists($config_file_path_tmp)) {
-			rename($config_file_path_tmp, $config_file_path);
-		}
-	}
-
 	/**
 	 * Get database connection.
 	 *
@@ -109,21 +33,8 @@ 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->mode = \Friendica\App::MODE_INSTALL;
-
-				// Create database structure
-				DBStructure::update(false, true, true);
-
-				$app->mode = \Friendica\App::MODE_NORMAL;
-			} else {
-				$this->markTestSkipped('Could not connect to the database. Please check the MYSQL_* environment variables.');
-			}
+		if (!dba::connected()) {
+			$this->markTestSkipped('Could not connect to the database.');
 		}
 
 		return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE'));