X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTestTrait.php;h=eae5ce2ac9dd5c3a0eb24a69e120dd713266677b;hb=8b6ace6629ab4fe229c4c35ff388efe320602a16;hp=36636feabd57701d626d392a75d051733521a786;hpb=8868b7f8d938463169e6bdf98cf7d60f38805b79;p=friendica.git

diff --git a/tests/DatabaseTestTrait.php b/tests/DatabaseTestTrait.php
index 36636feabd..eae5ce2ac9 100644
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,23 +29,25 @@ use Friendica\Test\Util\Database\StaticDatabase;
  */
 trait DatabaseTestTrait
 {
-	protected function setUp()
+	protected function setUpDb()
 	{
 		StaticDatabase::statConnect($_SERVER);
 		// Rollbacks every DB usage (in case the test couldn't call tearDown)
 		StaticDatabase::statRollback();
+		// Rollback the first, outer transaction just 2 be sure
+		StaticDatabase::getGlobConnection()->rollBack();
 		// Start the first, outer transaction
 		StaticDatabase::getGlobConnection()->beginTransaction();
-
-		parent::setUp();
 	}
 
-	protected function tearDown()
+	protected function tearDownDb()
 	{
-		// Rollbacks every DB usage so we don't commit anything into the DB
-		StaticDatabase::statRollback();
-
-		parent::tearDown();
+		try {
+			// Rollbacks every DB usage so we don't commit anything into the DB
+			StaticDatabase::statRollback();
+		} catch (\PDOException $exception) {
+			print_r("Found already rolled back transaction");
+		}
 	}
 
 	/**
@@ -61,13 +63,17 @@ trait DatabaseTestTrait
 		$data = include $fixture;
 
 		foreach ($data as $tableName => $rows) {
-			if (!is_array($rows) && !is_numeric($tableName)) {
+			if (is_numeric($tableName)) {
+				continue;
+			}
+
+			if (!is_array($rows)) {
 				$dba->p('TRUNCATE TABLE `' . $tableName . '``');
 				continue;
 			}
 
 			foreach ($rows as $row) {
-				$dba->insert($tableName, $row);
+				$dba->insert($tableName, $row, true);
 			}
 		}
 	}