X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2FDatabaseTest.php;h=cc13c4bc897d697a587daa96b2a46f7595a4763f;hb=f00792d370cfbf1d52b37e3eed7e80e682df9d8a;hp=1783bc605377c3d2a3b998d09178b9f468e3a42d;hpb=b08ac3c0a704c22a293c2e74b17df24fb46ab3e7;p=friendica.git

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 1783bc6053..cc13c4bc89 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -1,32 +1,43 @@
 <?php
 /**
- * DatabaseTest class.
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Test;
 
-use Friendica\Test\Util\Database\StaticDatabase;
-
 /**
  * Abstract class used by tests that need a database.
  */
 abstract class DatabaseTest extends MockedTest
 {
-	protected function setUp()
+	use DatabaseTestTrait;
+
+	protected function setUp(): void
 	{
-		parent::setUp();
+		$this->setUpDb();
 
-		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();
+		parent::setUp();
 	}
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
-		// Rollbacks every DB usage so we don't commit anything into the DB
-		StaticDatabase::statRollback();
+		$this->tearDownDb();
 
 		parent::tearDown();
 	}