X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=4f0275493c8f659d28734c99052cd3145080ff2a;hb=fe51c53798e5b2ec0032c478ade8bb7b1255a023;hp=3c3f835eb6a26c95b6351d94b2631175a683027a;hpb=9d45118356b0a72172661ae373845e403b4ed9dc;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 3c3f835eb6..4f0275493c 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,42 +5,56 @@
 
 namespace Friendica\Test;
 
+use Friendica\Database\Database;
 use Friendica\Test\Util\Database\StaticDatabase;
-use PHPUnit\DbUnit\DataSet\YamlDataSet;
-use PHPUnit\DbUnit\TestCaseTrait;
-use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
 
 /**
  * Abstract class used by tests that need a database.
  */
 abstract class DatabaseTest extends MockedTest
 {
-	use TestCaseTrait;
+	protected function setUp()
+	{
+		parent::setUp();
 
-	/**
-	 * Get database connection.
-	 *
-	 * This function is executed before each test in order to get a database connection that can be used by tests.
-	 * If no prior connection is available, it tries to create one using the USER, PASS and DB environment variables.
-	 *
-	 * If it could not connect to the database, the test is skipped.
-	 *
-	 * @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
-	 * @see https://phpunit.de/manual/5.7/en/database.html
-	 */
-	protected function getConnection()
+		StaticDatabase::statConnect($_SERVER);
+		// Rollbacks every DB usage (in case the test couldn't call tearDown)
+		StaticDatabase::statRollback();
+		// Start the first, outer transaction
+		StaticDatabase::getGlobConnection()->beginTransaction();
+	}
+
+	protected function tearDown()
 	{
-		return $this->createDefaultDBConnection(StaticDatabase::getGlobConnection(), getenv('MYSQL_DATABASE'));
+		// Rollbacks every DB usage so we don't commit anything into the DB
+		StaticDatabase::statRollback();
+
+		parent::tearDown();
 	}
 
 	/**
-	 * Get dataset to populate the database with.
+	 * Loads a given DB fixture for this DB test
+	 *
+	 * @param string   $fixture The path to the fixture
+	 * @param Database $dba     The DB connection
 	 *
-	 * @return YamlDataSet
-	 * @see https://phtablepunit.de/manual/5.7/en/database.html
+	 * @throws \Exception
 	 */
-	protected function getDataSet()
+	protected function loadFixture(string $fixture, Database $dba)
 	{
-		return new YamlDataSet(__DIR__ . '/datasets/api.yml');
+		$this->assertFileExists($fixture);
+
+		$data = include $fixture;
+
+		foreach ($data as $tableName => $rows) {
+			if (!is_array($rows)) {
+				$dba->p('TRUNCATE TABLE `' . $tableName . '``');
+				continue;
+			}
+
+			foreach ($rows as $row) {
+				$dba->insert($tableName, $row);
+			}
+		}
 	}
 }