X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=79af5b5468a9495f86d390ceda58d1afdc4d64eb;hb=edffb7e24b11e3af7b50e2769aae9815d4f92063;hp=6edd45e575f257f3e584d8b907aca607bf20e3eb;hpb=4752ea13749373de36b32e0d4a7fe11e742f363c;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 6edd45e575..79af5b5468 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,45 +5,23 @@
 
 namespace Friendica\Test;
 
-use dba;
-use Friendica\Database\DBStructure;
-use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+use Friendica\Core\Config;
+use Friendica\Database\DBA;
+use Friendica\Factory;
+use Friendica\Util\BasePath;
 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;
 
-	/**
-	 * 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;
-
-		$config_string = file_get_contents($base_config_file_path);
-
-		$config_string = str_replace('die(', '// die(', $config_string);
-		$config_string = str_replace('your.mysqlhost.com', 'localhost', $config_string);
-		$config_string = str_replace('mysqlusername'     , getenv('USER'), $config_string);
-		$config_string = str_replace('mysqlpassword'     , getenv('PASS'), $config_string);
-		$config_string = str_replace('mysqldatabasename' , getenv('DB'), $config_string);
-
-		file_put_contents($config_file_path, $config_string);
-	}
-
 	/**
 	 * Get database connection.
 	 *
@@ -57,22 +35,26 @@ abstract class DatabaseTest extends TestCase
 	 */
 	protected function getConnection()
 	{
-		if (!dba::$connected) {
-			dba::connect('localhost', getenv('USER'), getenv('PASS'), getenv('DB'));
+		if (!getenv('MYSQL_DATABASE')) {
+			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
+		}
+
+		$basedir = BasePath::create(dirname(__DIR__));
+		$configLoader = new Config\ConfigCacheLoader($basedir);
+		$config = Factory\ConfigFactory::createCache($configLoader);
 
-			if (dba::$connected) {
-				$app = get_app();
-				// We need to do this in order to disable logging
-				$app->module = 'install';
+		DBA::connect(
+			$config,
+			getenv('MYSQL_HOST'),
+			getenv('MYSQL_USERNAME'),
+			getenv('MYSQL_PASSWORD'),
+			getenv('MYSQL_DATABASE'));
 
-				// 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'));
 	}
 
 	/**