X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=2cb76dcad9ab39a013987026d6c4248bbe2afa56;hb=651834f7d1f8ec39cb9bcd6cab111d2c313f8e6b;hp=e79e9237be9d3a9ce0f1031290cc96cdd23d89e5;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index e79e9237be..2cb76dcad9 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,69 +5,20 @@
 
 namespace Friendica\Test;
 
-use dba;
-use Friendica\Database\DBStructure;
-use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+use Friendica\Database\DBA;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
-use PHPUnit\Framework\TestCase;
+use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+
+require_once __DIR__ . '/../boot.php';
 
 /**
  * Abstract class used by tests that need a database.
  */
-abstract class DatabaseTest extends TestCase
+abstract class DatabaseTest extends MockedTest
 {
-
 	use TestCaseTrait;
 
-	/**
-	 * 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.
 	 *
@@ -81,24 +32,20 @@ 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;
+		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);
+		DBA::connect(getenv('MYSQL_HOST'),
+			getenv('MYSQL_USERNAME'),
+			getenv('MYSQL_PASSWORD'),
+			getenv('MYSQL_DATABASE'));
 
-				$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'));
+		return $this->createDefaultDBConnection(DBA::getConnection(), getenv('MYSQL_DATABASE'));
 	}
 
 	/**