rename DatabaseTest to DatabaseTestCase

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
deleted file mode 100644 (file)
index af6e452..0000000
--- a/tests/DatabaseTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-// Copyright (C) 2010-2024, the Friendica project
-// SPDX-FileCopyrightText: 2010-2024 the Friendica project
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-namespace Friendica\Test;
-
-/**
- * Abstract class used by tests that need a database.
- */
-abstract class DatabaseTest extends MockedTestCase
-{
-       use DatabaseTestTrait;
-
-       protected function setUp(): void
-       {
-               $this->setUpDb();
-
-               parent::setUp();
-       }
-
-       protected function tearDown(): void
-       {
-               $this->tearDownDb();
-
-               parent::tearDown();
-       }
-}

diff --git a/tests/DatabaseTestCase.php b/tests/DatabaseTestCase.php
new file mode 100644 (file)
index 0000000..b061a7f
--- /dev/null
+++ b/tests/DatabaseTestCase.php
@@ -0,0 +1,30 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+namespace Friendica\Test;
+
+/**
+ * Abstract class used by tests that need a database.
+ */
+abstract class DatabaseTestCase extends MockedTestCase
+{
+       use DatabaseTestTrait;
+
+       protected function setUp(): void
+       {
+               $this->setUpDb();
+
+               parent::setUp();
+       }
+
+       protected function tearDown(): void
+       {
+               $this->tearDownDb();
+
+               parent::tearDown();
+       }
+}

diff --git a/tests/Util/CreateDatabaseTrait.php b/tests/Util/CreateDatabaseTrait.php
index c188ee8f947685ef45643ba8d83bf7ed0ce67b94..52a7625734d38008c445a7be4f61965b246b1ecf 100644 (file)
--- a/tests/Util/CreateDatabaseTrait.php
+++ b/tests/Util/CreateDatabaseTrait.php
@@ -13,7 +13,7 @@ use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Database\Definition\DbaDefinition;
 use Friendica\Database\Definition\ViewDefinition;
-use Friendica\Test\DatabaseTestTrait;
+use Friendica\Test\DatabaseTestCaseTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Util\Profiler;
 use Psr\Log\NullLogger;

diff --git a/tests/src/Content/PageInfoTest.php b/tests/src/Content/PageInfoTest.php
index a88c1fe4a6591e564e0d2f4172f49ec3944c3486..324381a4dd16146b5e3595db4eadfd09d420bdae 100644 (file)
--- a/tests/src/Content/PageInfoTest.php
+++ b/tests/src/Content/PageInfoTest.php
@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Content;
 
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 
-class PageInfoTest extends DatabaseTest
+class PageInfoTest extends DatabaseTestCase
 {
        public function dataGetRelevantUrlFromBody()
        {

diff --git a/tests/src/Core/Cache/DatabaseCacheTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php
index 5b4c61bc8838b527bf591809a7f1d4c0f97e250d..66e44d4754df95cc69c9d3050bb5758630f1d400 100644 (file)
--- a/tests/src/Core/Cache/DatabaseCacheTest.php
+++ b/tests/src/Core/Cache/DatabaseCacheTest.php
@@ -9,7 +9,7 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\App\BaseURL;
 use Friendica\Core\Cache;
-use Friendica\Test\DatabaseTestTrait;
+use Friendica\Test\DatabaseTestCaseTrait;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\VFSTrait;
 

diff --git a/tests/src/Core/Config/ConfigTest.php b/tests/src/Core/Config/ConfigTest.php
index ed5e329aea398c4cc3c0ddfdf5ed6f9d64509477..83dbaa0af051d6320884d2ac3e6ad919f9d79cf7 100644 (file)
--- a/tests/src/Core/Config/ConfigTest.php
+++ b/tests/src/Core/Config/ConfigTest.php
@@ -13,12 +13,12 @@ use Friendica\Core\Config\Model\DatabaseConfig;
 use Friendica\Core\Config\Model\ReadOnlyFileConfig;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 
-class ConfigTest extends DatabaseTest
+class ConfigTest extends DatabaseTestCase
 {
        use ArraySubsetAsserts;
        use VFSTrait;

diff --git a/tests/src/Core/Config/ConfigTransactionTest.php b/tests/src/Core/Config/ConfigTransactionTest.php
index 65efe3e14e1f3dc708beb65721db0a24feeea17a..5c704b76004b4a79b7414176aa037f50ff3ceece 100644 (file)
--- a/tests/src/Core/Config/ConfigTransactionTest.php
+++ b/tests/src/Core/Config/ConfigTransactionTest.php
@@ -14,7 +14,7 @@ use Friendica\Core\Config\Model\ConfigTransaction;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\FixtureTestCase;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\Database\StaticDatabase;

diff --git a/tests/src/Core/Storage/Repository/StorageManagerTest.php b/tests/src/Core/Storage/Repository/StorageManagerTest.php
index 0123f512c7b01d88e4c141536b8192290f3ee370..ac74274c03405f5cba07bca18fc12f78af8f90fc 100644 (file)
--- a/tests/src/Core/Storage/Repository/StorageManagerTest.php
+++ b/tests/src/Core/Storage/Repository/StorageManagerTest.php
@@ -26,7 +26,7 @@ use Friendica\Database\Definition\ViewDefinition;
 use Friendica\DI;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Storage\Type;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
@@ -36,7 +36,7 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Friendica\Test\Util\SampleStorageBackend;
 
-class StorageManagerTest extends DatabaseTest
+class StorageManagerTest extends DatabaseTestCase
 {
        use CreateDatabaseTrait;
 

diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index 242af4547017ec22b1dd190a5b3dd52e79ab312b..49d3a6a5e6006b7aeaadc3f70736d62198bcc4eb 100644 (file)
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -11,10 +11,10 @@ use Dice\Dice;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\Database\StaticDatabase;
 
-class DBATest extends DatabaseTest
+class DBATest extends DatabaseTestCase
 {
        protected function setUp(): void
        {

diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 377c753a4793c77cd6c2ffc7065c6982ab4d8d67..9ce3475ee778c7591d4d0545ae7e360f2e071de1 100644 (file)
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -11,10 +11,10 @@ use Dice\Dice;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\Database\StaticDatabase;
 
-class DBStructureTest extends DatabaseTest
+class DBStructureTest extends DatabaseTestCase
 {
        protected function setUp(): void
        {