Merge pull request #14597 from Art4/rearange-testcases

Rearrange testcases

tests/ApiTestCase.php

@@ -5,26 +5,23 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Module\Api;
+namespace Friendica\Test;
 
 use Friendica\App;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
-use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Module\Special\HTTPException;
 use Friendica\Security\Authentication;
 use Friendica\Security\BasicAuth;
-use Friendica\Test\FixtureTest;
 use Friendica\Test\Util\AppDouble;
 use Friendica\Test\Util\AuthenticationDouble;
 use Friendica\Test\Util\AuthTestConfig;
-use Mockery\MockInterface;
 use Psr\Http\Message\ResponseInterface;
 
-abstract class ApiTest extends FixtureTest
+abstract class ApiTestCase extends FixtureTestCase
 {
 	// User data that the test database is populated with
 	const SELF_USER = [
@@ -190,7 +187,7 @@ abstract class ApiTest extends FixtureTest
 	public function installAuthTest()
 	{
 		$addon           = 'authtest';
-		$addon_file_path = __DIR__ . '/../../../Util/authtest/authtest.php';
+		$addon_file_path = __DIR__ . '/Util/authtest/authtest.php';
 		$t               = @filemtime($addon_file_path);
 
 		@include_once($addon_file_path);

tests/CacheTestCase.php

@@ -5,15 +5,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Cache;
+namespace Friendica\Test;
 
 use Friendica\Core\Cache\Capability\ICanCache;
-use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Test\MockedTestCase;
-use Friendica\Core\Cache\Type\AbstractCache;
-use Friendica\Test\MockedTest;
 use Friendica\Util\PidFile;
 
-abstract class CacheTest extends MockedTest
+abstract class CacheTestCase extends MockedTestCase
 {
 	/**
 	 * @var int Start time of the mock (used for time operations)

tests/ConsoleTestCase.php

@@ -5,13 +5,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Console;
+namespace Friendica\Test;
 
 use Asika\SimpleConsole\Console;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\Intercept;
 
-abstract class ConsoleTest extends MockedTest
+abstract class ConsoleTestCase extends MockedTestCase
 {
 	/**
 	 * @var array The default argv for a Console Instance

tests/DatabaseTestCase.php

@@ -10,7 +10,7 @@ namespace Friendica\Test;
 /**
  * Abstract class used by tests that need a database.
  */
-abstract class DatabaseTest extends MockedTest
+abstract class DatabaseTestCase extends MockedTestCase
 {
 	use DatabaseTestTrait;
 

tests/FixtureTest.php

@@ -1,44 +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;
-
-use Dice\Dice;
-use Friendica\App\Arguments;
-use Friendica\App\Router;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Config\Factory\Config;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Core\Session\Capability\IHandleSessions;
-use Friendica\Core\Session\Type\Memory;
-use Friendica\Database\Database;
-use Friendica\Database\DBStructure;
-use Friendica\DI;
-use Friendica\Test\Util\Database\StaticDatabase;
-use Friendica\Test\Util\VFSTrait;
-
-/**
- * Parent class for test cases requiring fixtures
- */
-abstract class FixtureTest extends MockedTest
-{
-	use FixtureTestTrait;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->setUpFixtures();
-	}
-
-	protected function tearDown(): void
-	{
-		$this->tearDownFixtures();
-
-		parent::tearDown();
-	}
-}

tests/FixtureTestCase.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;
+
+/**
+ * Parent class for test cases requiring fixtures
+ */
+abstract class FixtureTestCase extends MockedTestCase
+{
+	use FixtureTestTrait;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->setUpFixtures();
+	}
+
+	protected function tearDown(): void
+	{
+		$this->tearDownFixtures();
+
+		parent::tearDown();
+	}
+}

tests/LockTestCase.php

@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Lock;
+namespace Friendica\Test;
 
 use Friendica\Core\Lock\Capability\ICanLock;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-abstract class LockTest extends MockedTest
+abstract class LockTestCase extends MockedTestCase
 {
 	/**
 	 * @var int Start time of the mock (used for time operations)

tests/LoggerDataTrait.php

@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Logger;
+namespace Friendica\Test;
 
 trait LoggerDataTrait
 {

tests/LoggerTestCase.php

@@ -5,16 +5,16 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Logger;
+namespace Friendica\Test;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Test\MockedTest;
 use Friendica\Core\Logger\Util\Introspection;
+use Friendica\Test\MockedTestCase;
 use Mockery\MockInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
-abstract class AbstractLoggerTest extends MockedTest
+abstract class LoggerTestCase extends MockedTestCase
 {
 	use LoggerDataTrait;
 

tests/MemoryCacheTestCase.php

@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Cache;
+namespace Friendica\Test;
 
 use Exception;
 use Friendica\Core\Cache\Capability\ICanCacheInMemory;
 
-abstract class MemoryCacheTest extends CacheTest
+abstract class MemoryCacheTestCase extends CacheTestCase
 {
 	/**
 	 * @var \Friendica\Core\Cache\Capability\ICanCacheInMemory

tests/MockedTestCase.php

@@ -12,7 +12,7 @@ use PHPUnit\Framework\TestCase;
 /**
  * This class verifies each mock after each call
  */
-abstract class MockedTest extends TestCase
+abstract class MockedTestCase extends TestCase
 {
 	protected function tearDown() : void
 	{

tests/PConfigTestCase.php

@@ -5,17 +5,16 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\PConfig;
+namespace Friendica\Test;
 
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use Friendica\Core\PConfig\Type\AbstractPConfigValues;
 use Friendica\Core\PConfig\Repository\PConfig as PConfigModel;
 use Friendica\Core\PConfig\ValueObject\Cache;
-use Friendica\Test\MockedTest;
 use Mockery;
 use Mockery\MockInterface;
 
-abstract class PConfigTest extends MockedTest
+abstract class PConfigTestCase extends MockedTestCase
 {
 	use ArraySubsetAsserts;
 

tests/StorageConfigTestCase.php

@@ -5,12 +5,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Storage;
+namespace Friendica\Test;
 
 use Friendica\Core\Storage\Capability\ICanConfigureStorage;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-abstract class StorageConfigTest extends MockedTest
+abstract class StorageConfigTestCase extends MockedTestCase
 {
 	/** @return ICanConfigureStorage */
 	abstract protected function getInstance();

tests/StorageTestCase.php

@@ -5,14 +5,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Storage;
+namespace Friendica\Test;
 
 use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Core\Storage\Exception\ReferenceStorageException;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-abstract class StorageTest extends MockedTest
+abstract class StorageTestCase extends MockedTestCase
 {
 	/** @return ICanWriteToStorage */
 	abstract protected function getInstance();

tests/functional/DependencyCheckTest.php

@@ -14,12 +14,12 @@ use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Lock\Capability\ICanLock;
 use Friendica\Database\Database;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 use Friendica\Util\BasePath;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Psr\Log\LoggerInterface;
 
-class DependencyCheckTest extends FixtureTest
+class DependencyCheckTest extends FixtureTestCase
 {
 	protected function setUp() : void
 	{

tests/phpunit.xml

@@ -9,12 +9,12 @@
 		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
 	<testsuites>
 		<testsuite name="friendica">
-			<directory suffix=".php">functional/</directory>
+			<directory suffix="Test.php">functional/</directory>
-			<directory suffix=".php">src/</directory>
+			<directory suffix="Test.php">src/</directory>
-			<directory suffix=".php">Unit/</directory>
+			<directory suffix="Test.php">Unit/</directory>
 		</testsuite>
 		<testsuite name="unit">
-			<directory suffix=".php">Unit/</directory>
+			<directory suffix="Test.php">Unit/</directory>
 		</testsuite>
 	</testsuites>
 	<!-- Filters for Code Coverage -->

tests/src/App/BaseURLTest.php

@@ -11,10 +11,10 @@ use Friendica\App\BaseURL;
 use Friendica\Core\Config\Model\ReadOnlyFileConfig;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Psr\Log\NullLogger;
 
-class BaseURLTest extends MockedTest
+class BaseURLTest extends MockedTestCase
 {
 	public function dataSystemUrl(): array
 	{

tests/src/App/ModeTest.php

@@ -12,13 +12,13 @@ use Friendica\App\Arguments;
 use Friendica\App\Mode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Database\Database;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\BasePath;
 use Mockery;
 use Mockery\MockInterface;
 
-class ModeTest extends MockedTest
+class ModeTest extends MockedTestCase
 {
 	use VFSTrait;
 

tests/src/App/RequestTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\App;
 
 use Friendica\App\Request;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-class RequestTest extends MockedTest
+class RequestTest extends MockedTestCase
 {
 	public function dataServerArray(): array
 	{

tests/src/CollectionTest.php

@@ -7,11 +7,11 @@
 
 namespace Friendica\Test\src;
 
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\CollectionDouble;
 use Friendica\Test\Util\EntityDouble;
 
-class CollectionTest extends MockedTest
+class CollectionTest extends MockedTestCase
 {
 	/**
 	 * Test if the BaseCollection::column() works as expected

tests/src/Console/AutomaticInstallationConsoleTest.php

@@ -16,6 +16,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\Database;
 use Friendica\DI;
+use Friendica\Test\ConsoleTestCase;
 use Friendica\Test\Util\RendererMockTrait;
 use Friendica\Test\Util\VFSTrait;
 use Mockery;
@@ -24,7 +25,7 @@ use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamFile;
 use Psr\Log\NullLogger;
 
-class AutomaticInstallationConsoleTest extends ConsoleTest
+class AutomaticInstallationConsoleTest extends ConsoleTestCase
 {
 	use VFSTrait;
 	use RendererMockTrait;

tests/src/Console/ConfigConsoleTest.php

@@ -11,11 +11,12 @@ use Friendica\App;
 use Friendica\App\Mode;
 use Friendica\Console\Config;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\ConsoleTestCase;
 use Mockery;
 use Mockery\LegacyMockInterface;
 use Mockery\MockInterface;
 
-class ConfigConsoleTest extends ConsoleTest
+class ConfigConsoleTest extends ConsoleTestCase
 {
 	/**
 	 * @var App\Mode|MockInterface $appMode

tests/src/Console/LockConsoleTest.php

@@ -11,10 +11,11 @@ use Friendica\App;
 use Friendica\App\Mode;
 use Friendica\Console\Lock;
 use Friendica\Core\Lock\Capability\ICanLock;
+use Friendica\Test\ConsoleTestCase;
 use Mockery;
 use Mockery\MockInterface;
 
-class LockConsoleTest extends ConsoleTest
+class LockConsoleTest extends ConsoleTestCase
 {
 	/**
 	 * @var App\Mode|MockInterface $appMode

tests/src/Console/ServerBlockConsoleTest.php

@@ -9,10 +9,11 @@ namespace Friendica\Test\src\Console;
 
 use Friendica\Console\ServerBlock;
 use Friendica\Moderation\DomainPatternBlocklist;
+use Friendica\Test\ConsoleTestCase;
 use Friendica\Test\FixtureTestTrait;
 use Mockery;
 
-class ServerBlockConsoleTest extends ConsoleTest
+class ServerBlockConsoleTest extends ConsoleTestCase
 {
 	use FixtureTestTrait;
 

tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php

@@ -9,10 +9,10 @@ namespace Friendica\Test\src\Contact\FriendSuggest\Factory;
 
 use Friendica\Contact\FriendSuggest\Factory\FriendSuggest;
 use Friendica\Contact\FriendSuggest\Entity;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Psr\Log\NullLogger;
 
-class FriendSuggestTest extends MockedTest
+class FriendSuggestTest extends MockedTestCase
 {
 	public function dataCreate()
 	{

tests/src/Content/ItemTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Content;
 
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-class ItemTest extends MockedTest
+class ItemTest extends MockedTestCase
 {
 	/**
 	 * @doesNotPerformAssertions

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()
 	{

tests/src/Content/SmiliesTest.php

@@ -11,9 +11,9 @@ use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class SmiliesTest extends FixtureTest
+class SmiliesTest extends FixtureTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Content/Text/BBCode/VideoTest.php

@@ -8,9 +8,9 @@
 namespace Friendica\Test\src\Content\Text\BBCode;
 
 use Friendica\Content\Text\BBCode\Video;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-class VideoTest extends MockedTest
+class VideoTest extends MockedTestCase
 {
 	public function dataVideo()
 	{

tests/src/Content/Text/BBCodeTest.php

@@ -10,10 +10,10 @@ namespace Friendica\Test\src\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\DI;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 use Friendica\Util\Strings;
 
-class BBCodeTest extends FixtureTest
+class BBCodeTest extends FixtureTestCase
 {
 	/** @var \HTMLPurifier */
 	public $HTMLPurifier;

tests/src/Content/Text/HTMLTest.php

@@ -10,11 +10,11 @@ namespace Friendica\Test\src\Content\Text;
 use Exception;
 use Friendica\Content\Text\HTML;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\UriInterface;
 
-class HTMLTest extends FixtureTest
+class HTMLTest extends FixtureTestCase
 {
 	public function dataHTML()
 	{

tests/src/Content/Text/MarkdownTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\Content\Text;
 
 use Exception;
 use Friendica\Content\Text\Markdown;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class MarkdownTest extends FixtureTest
+class MarkdownTest extends FixtureTestCase
 {
 	public function dataMarkdown()
 	{

tests/src/Content/Text/PlaintextTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class PlaintextTest extends FixtureTest
+class PlaintextTest extends FixtureTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Core/ACLTest.php

@@ -8,9 +8,9 @@
 namespace Friendica\Test\src\Core;
 
 use Friendica\Core\ACL;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class ACLTest extends FixtureTest
+class ACLTest extends FixtureTestCase
 {
 	/**
 	 * Test the ACL::isValidContact() function.

tests/src/Core/Addon/Model/AddonLoaderTest.php

@@ -10,11 +10,11 @@ namespace Friendica\Test\src\Core\Addon\Model;
 use Friendica\Core\Addon\Exception\AddonInvalidConfigFileException;
 use Friendica\Core\Addon\Model\AddonLoader;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 
-class AddonLoaderTest extends MockedTest
+class AddonLoaderTest extends MockedTestCase
 {
 	use VFSTrait;
 

tests/src/Core/Cache/APCuCacheTest.php

@@ -8,11 +8,12 @@
 namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\Type\APCuCache;
+use Friendica\Test\MemoryCacheTestCase;
 
 /**
  * @group APCU
  */
-class APCuCacheTest extends MemoryCacheTest
+class APCuCacheTest extends MemoryCacheTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Core/Cache/ArrayCacheTest.php

@@ -8,8 +8,9 @@
 namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\Type\ArrayCache;
+use Friendica\Test\MemoryCacheTestCase;
 
-class ArrayCacheTest extends MemoryCacheTest
+class ArrayCacheTest extends MemoryCacheTestCase
 {
 	protected function getInstance()
 	{

tests/src/Core/Cache/DatabaseCacheTest.php

@@ -7,13 +7,13 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
-use Friendica\App\BaseURL;
+use Friendica\Core\Cache\Type\DatabaseCache;
-use Friendica\Core\Cache;
+use Friendica\Test\CacheTestCase;
 use Friendica\Test\DatabaseTestTrait;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\VFSTrait;
 
-class DatabaseCacheTest extends CacheTest
+class DatabaseCacheTest extends CacheTestCase
 {
 	use DatabaseTestTrait;
 	use CreateDatabaseTrait;
@@ -30,7 +30,7 @@ class DatabaseCacheTest extends CacheTest
 
 	protected function getInstance()
 	{
-		$this->cache = new Cache\Type\DatabaseCache('database', $this->getDbInstance());
+		$this->cache = new DatabaseCache('database', $this->getDbInstance());
 		return $this->cache;
 	}
 

tests/src/Core/Cache/MemcacheCacheTest.php

@@ -10,13 +10,14 @@ namespace Friendica\Test\src\Core\Cache;
 use Exception;
 use Friendica\Core\Cache\Type\MemcacheCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\MemoryCacheTestCase;
 use Mockery;
 
 /**
  * @requires extension memcache
  * @group MEMCACHE
  */
-class MemcacheCacheTest extends MemoryCacheTest
+class MemcacheCacheTest extends MemoryCacheTestCase
 {
 	protected function getInstance()
 	{

tests/src/Core/Cache/MemcachedCacheTest.php

@@ -10,6 +10,7 @@ namespace Friendica\Test\src\Core\Cache;
 use Exception;
 use Friendica\Core\Cache\Type\MemcachedCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\MemoryCacheTestCase;
 use Mockery;
 use Psr\Log\NullLogger;
 
@@ -17,7 +18,7 @@ use Psr\Log\NullLogger;
  * @requires extension memcached
  * @group MEMCACHED
  */
-class MemcachedCacheTest extends MemoryCacheTest
+class MemcachedCacheTest extends MemoryCacheTestCase
 {
 	protected function getInstance()
 	{

tests/src/Core/Cache/RedisCacheTest.php

@@ -10,13 +10,14 @@ namespace Friendica\Test\src\Core\Cache;
 use Exception;
 use Friendica\Core\Cache\Type\RedisCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\MemoryCacheTestCase;
 use Mockery;
 
 /**
  * @requires extension redis
  * @group REDIS
  */
-class RedisCacheTest extends MemoryCacheTest
+class RedisCacheTest extends MemoryCacheTestCase
 {
 	protected function getInstance()
 	{
@@ -44,7 +45,7 @@ class RedisCacheTest extends MemoryCacheTest
 			->andReturn(null);
 
 		try {
-			$this->cache = new \Friendica\Core\Cache\Type\RedisCache($host, $configMock);
+			$this->cache = new RedisCache($host, $configMock);
 		} catch (Exception $e) {
 			static::markTestSkipped('Redis is not available. Failure: ' . $e->getMessage());
 		}

tests/src/Core/Config/Cache/CacheTest.php

@@ -8,11 +8,11 @@
 namespace Friendica\Test\src\Core\Config\Cache;
 
 use Friendica\Core\Config\ValueObject\Cache;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use ParagonIE\HiddenString\HiddenString;
 use stdClass;
 
-class CacheTest extends MockedTest
+class CacheTest extends MockedTestCase
 {
 	public function dataTests()
 	{

tests/src/Core/Config/Cache/ConfigFileManagerTest.php

@@ -9,12 +9,12 @@ namespace Friendica\Test\src\Core\Config\Cache;
 
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Config\ValueObject\Cache;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use org\bovigo\vfs\vfsStream;
 
-class ConfigFileManagerTest extends MockedTest
+class ConfigFileManagerTest extends MockedTestCase
 {
 	use VFSTrait;
 

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;

tests/src/Core/Config/ConfigTransactionTest.php

@@ -14,14 +14,14 @@ 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\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
 use Mockery\Exception\InvalidCountException;
 
-class ConfigTransactionTest extends FixtureTest
+class ConfigTransactionTest extends FixtureTestCase
 {
 	/** @var ConfigFileManager */
 	protected $configFileManager;

tests/src/Core/Hooks/Model/InstanceManagerTest.php

@@ -12,13 +12,13 @@ use Friendica\Core\Hooks\Exceptions\HookInstanceException;
 use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException;
 use Friendica\Core\Hooks\Model\DiceInstanceManager;
 use Friendica\Core\Hooks\Util\StrategiesFileManager;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstance;
 use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstanceDecorator;
 use Friendica\Test\Util\Hooks\InstanceMocks\IAmADecoratedInterface;
 use Mockery\MockInterface;
 
-class InstanceManagerTest extends MockedTest
+class InstanceManagerTest extends MockedTestCase
 {
 	/** @var StrategiesFileManager|MockInterface */
 	protected $hookFileManager;

tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php

@@ -11,13 +11,13 @@ use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Hooks\Capability\ICanRegisterStrategies;
 use Friendica\Core\Hooks\Exceptions\HookConfigException;
 use Friendica\Core\Hooks\Util\StrategiesFileManager;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
-class StrategiesFileManagerTest extends MockedTest
+class StrategiesFileManagerTest extends MockedTestCase
 {
 	use VFSTrait;
 

tests/src/Core/InstallerTest.php

@@ -15,13 +15,13 @@ use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\VFSTrait;
 use Mockery;
 use Mockery\MockInterface;
 use phpmock\phpunit\PHPMock;
 
-class InstallerTest extends MockedTest
+class InstallerTest extends MockedTestCase
 {
 	use VFSTrait;
 	use ArraySubsetAsserts;

tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php

@@ -10,9 +10,10 @@ namespace Friendica\Test\src\Core\KeyValueStorage;
 use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
 use Friendica\Core\KeyValueStorage\Type\DBKeyValueStorage;
 use Friendica\Database\Database;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 
-class DBKeyValueStorageTest extends KeyValueStorageTest
+class DBKeyValueStorageTest extends MockedTestCase
 {
 	use CreateDatabaseTrait;
 
@@ -68,4 +69,79 @@ class DBKeyValueStorageTest extends KeyValueStorageTest
 
 		self::assertGreaterThanOrEqual($updateAt, $updateAtAfter);
 	}
+
+	public function testInstance()
+	{
+		$instance = $this->getInstance();
+
+		self::assertInstanceOf(IManageKeyValuePairs::class, $instance);
+	}
+
+	public function dataTests(): array
+	{
+		return [
+			'string'       => ['k' => 'data', 'v' => 'it'],
+			'boolTrue'     => ['k' => 'data', 'v' => true],
+			'boolFalse'    => ['k' => 'data', 'v' => false],
+			'integer'      => ['k' => 'data', 'v' => 235],
+			'decimal'      => ['k' => 'data', 'v' => 2.456],
+			'array'        => ['k' => 'data', 'v' => ['1', 2, '3', true, false]],
+			'boolIntTrue'  => ['k' => 'data', 'v' => 1],
+			'boolIntFalse' => ['k' => 'data', 'v' => 0],
+		];
+	}
+
+	/**
+	 * @dataProvider dataTests
+	 */
+	public function testGetSetDelete($k, $v)
+	{
+		$instance = $this->getInstance();
+
+		$instance->set($k, $v);
+
+		self::assertEquals($v, $instance->get($k));
+		self::assertEquals($v, $instance[$k]);
+
+		$instance->delete($k);
+
+		self::assertNull($instance->get($k));
+		self::assertNull($instance[$k]);
+	}
+
+	/**
+	 * @dataProvider dataTests
+	 */
+	public function testSetOverride($k, $v)
+	{
+		$instance = $this->getInstance();
+
+		$instance->set($k, $v);
+
+		self::assertEquals($v, $instance->get($k));
+		self::assertEquals($v, $instance[$k]);
+
+		$instance->set($k, 'another_value');
+
+		self::assertEquals('another_value', $instance->get($k));
+		self::assertEquals('another_value', $instance[$k]);
+	}
+
+	/**
+	 * @dataProvider dataTests
+	 */
+	public function testOffsetSetDelete($k, $v)
+	{
+		$instance = $this->getInstance();
+
+		$instance[$k] = $v;
+
+		self::assertEquals($v, $instance->get($k));
+		self::assertEquals($v, $instance[$k]);
+
+		unset($instance[$k]);
+
+		self::assertNull($instance->get($k));
+		self::assertNull($instance[$k]);
+	}
 }

tests/src/Core/KeyValueStorage/KeyValueStorageTest.php

@@ -1,91 +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\src\Core\KeyValueStorage;
-
-use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs;
-use Friendica\Test\MockedTest;
-
-abstract class KeyValueStorageTest extends MockedTest
-{
-	abstract public function getInstance(): IManageKeyValuePairs;
-
-	public function testInstance()
-	{
-		$instance = $this->getInstance();
-
-		self::assertInstanceOf(IManageKeyValuePairs::class, $instance);
-	}
-
-	public function dataTests(): array
-	{
-		return [
-			'string'       => ['k' => 'data', 'v' => 'it'],
-			'boolTrue'     => ['k' => 'data', 'v' => true],
-			'boolFalse'    => ['k' => 'data', 'v' => false],
-			'integer'      => ['k' => 'data', 'v' => 235],
-			'decimal'      => ['k' => 'data', 'v' => 2.456],
-			'array'        => ['k' => 'data', 'v' => ['1', 2, '3', true, false]],
-			'boolIntTrue'  => ['k' => 'data', 'v' => 1],
-			'boolIntFalse' => ['k' => 'data', 'v' => 0],
-		];
-	}
-
-	/**
-	 * @dataProvider dataTests
-	 */
-	public function testGetSetDelete($k, $v)
-	{
-		$instance = $this->getInstance();
-
-		$instance->set($k, $v);
-
-		self::assertEquals($v, $instance->get($k));
-		self::assertEquals($v, $instance[$k]);
-
-		$instance->delete($k);
-
-		self::assertNull($instance->get($k));
-		self::assertNull($instance[$k]);
-	}
-
-	/**
-	 * @dataProvider dataTests
-	 */
-	public function testSetOverride($k, $v)
-	{
-		$instance = $this->getInstance();
-
-		$instance->set($k, $v);
-
-		self::assertEquals($v, $instance->get($k));
-		self::assertEquals($v, $instance[$k]);
-
-		$instance->set($k, 'another_value');
-
-		self::assertEquals('another_value', $instance->get($k));
-		self::assertEquals('another_value', $instance[$k]);
-	}
-
-	/**
-	 * @dataProvider dataTests
-	 */
-	public function testOffsetSetDelete($k, $v)
-	{
-		$instance = $this->getInstance();
-
-		$instance[$k] = $v;
-
-		self::assertEquals($v, $instance->get($k));
-		self::assertEquals($v, $instance[$k]);
-
-		unset($instance[$k]);
-
-		self::assertNull($instance->get($k));
-		self::assertNull($instance[$k]);
-	}
-}

tests/src/Core/L10nTest.php

@@ -8,9 +8,9 @@
 namespace Friendica\Test\src\Core;
 
 use Friendica\Core\L10n;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-class L10nTest extends MockedTest
+class L10nTest extends MockedTestCase
 {
 	public function dataDetectLanguage()
 	{

tests/src/Core/Lock/APCuCacheLockTest.php

@@ -9,11 +9,12 @@ namespace Friendica\Test\src\Core\Lock;
 
 use Friendica\Core\Cache\Type\APCuCache;
 use Friendica\Core\Lock\Type\CacheLock;
+use Friendica\Test\LockTestCase;
 
 /**
  * @group APCU
  */
-class APCuCacheLockTest extends LockTest
+class APCuCacheLockTest extends LockTestCase
 {
 	protected function setUp(): void
 	{
@@ -26,6 +27,6 @@ class APCuCacheLockTest extends LockTest
 
 	protected function getInstance()
 	{
-		return new \Friendica\Core\Lock\Type\CacheLock(new APCuCache('localhost'));
+		return new CacheLock(new APCuCache('localhost'));
 	}
 }

tests/src/Core/Lock/ArrayCacheLockTest.php

@@ -9,12 +9,13 @@ namespace Friendica\Test\src\Core\Lock;
 
 use Friendica\Core\Cache\Type\ArrayCache;
 use Friendica\Core\Lock\Type\CacheLock;
+use Friendica\Test\LockTestCase;
 
-class ArrayCacheLockTest extends LockTest
+class ArrayCacheLockTest extends LockTestCase
 {
 	protected function getInstance()
 	{
-		return new \Friendica\Core\Lock\Type\CacheLock(new ArrayCache('localhost'));
+		return new CacheLock(new ArrayCache('localhost'));
 	}
 
 	/**

tests/src/Core/Lock/DatabaseLockDriverTest.php

@@ -8,9 +8,10 @@
 namespace Friendica\Test\src\Core\Lock;
 
 use Friendica\Core\Lock\Type\DatabaseLock;
+use Friendica\Test\LockTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 
-class DatabaseLockDriverTest extends LockTest
+class DatabaseLockDriverTest extends LockTestCase
 {
 	use CreateDatabaseTrait;
 

tests/src/Core/Lock/MemcacheCacheLockTest.php

@@ -11,13 +11,14 @@ use Exception;
 use Friendica\Core\Cache\Type\MemcacheCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Lock\Type\CacheLock;
+use Friendica\Test\LockTestCase;
 use Mockery;
 
 /**
  * @requires extension Memcache
  * @group MEMCACHE
  */
-class MemcacheCacheLockTest extends LockTest
+class MemcacheCacheLockTest extends LockTestCase
 {
 	protected function getInstance()
 	{
@@ -39,7 +40,7 @@ class MemcacheCacheLockTest extends LockTest
 
 		try {
 			$cache = new MemcacheCache($host, $configMock);
-			$lock = new \Friendica\Core\Lock\Type\CacheLock($cache);
+			$lock = new CacheLock($cache);
 		} catch (Exception $e) {
 			static::markTestSkipped('Memcache is not available');
 		}

tests/src/Core/Lock/MemcachedCacheLockTest.php

@@ -11,6 +11,7 @@ use Exception;
 use Friendica\Core\Cache\Type\MemcachedCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Lock\Type\CacheLock;
+use Friendica\Test\LockTestCase;
 use Mockery;
 use Psr\Log\NullLogger;
 
@@ -18,7 +19,7 @@ use Psr\Log\NullLogger;
  * @requires extension memcached
  * @group MEMCACHED
  */
-class MemcachedCacheLockTest extends LockTest
+class MemcachedCacheLockTest extends LockTestCase
 {
 	protected function getInstance()
 	{

tests/src/Core/Lock/RedisCacheLockTest.php

@@ -11,13 +11,14 @@ use Exception;
 use Friendica\Core\Cache\Type\RedisCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Lock\Type\CacheLock;
+use Friendica\Test\LockTestCase;
 use Mockery;
 
 /**
  * @requires extension redis
  * @group REDIS
  */
-class RedisCacheLockTest extends LockTest
+class RedisCacheLockTest extends LockTestCase
 {
 	protected function getInstance()
 	{
@@ -48,7 +49,7 @@ class RedisCacheLockTest extends LockTest
 
 		try {
 			$cache = new RedisCache($host, $configMock);
-			$lock = new \Friendica\Core\Lock\Type\CacheLock($cache);
+			$lock = new CacheLock($cache);
 		} catch (Exception $e) {
 			static::markTestSkipped('Redis is not available. Error: ' . $e->getMessage());
 		}

tests/src/Core/Lock/SemaphoreLockTest.php

@@ -12,12 +12,14 @@ use Friendica\App;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Config\Model\ReadOnlyFileConfig;
 use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Lock\Type\SemaphoreLock;
 use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Test\LockTestCase;
 use Mockery;
 use Mockery\MockInterface;
 
-class SemaphoreLockTest extends LockTest
+class SemaphoreLockTest extends LockTestCase
 {
 	protected function setUp(): void
 	{
@@ -40,7 +42,7 @@ class SemaphoreLockTest extends LockTest
 
 	protected function getInstance()
 	{
-		return new \Friendica\Core\Lock\Type\SemaphoreLock();
+		return new SemaphoreLock();
 	}
 
 	/**

tests/src/Core/Logger/ProfilerLoggerTest.php

@@ -7,14 +7,15 @@
 
 namespace Friendica\Test\src\Core\Logger;
 
-use Friendica\Test\MockedTest;
 use Friendica\Core\Logger\Type\ProfilerLogger;
+use Friendica\Test\LoggerDataTrait;
+use Friendica\Test\MockedTestCase;
 use Friendica\Util\Profiler;
 use Mockery\MockInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
-class ProfilerLoggerTest extends MockedTest
+class ProfilerLoggerTest extends MockedTestCase
 {
 	use LoggerDataTrait;
 

tests/src/Core/Logger/StreamLoggerTest.php

@@ -9,13 +9,14 @@ namespace Friendica\Test\src\Core\Logger;
 
 use Friendica\Core\Logger\Exception\LoggerArgumentException;
 use Friendica\Core\Logger\Exception\LogLevelException;
+use Friendica\Test\LoggerTestCase;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Core\Logger\Type\StreamLogger;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamFile;
 use Psr\Log\LogLevel;
 
-class StreamLoggerTest extends AbstractLoggerTest
+class StreamLoggerTest extends LoggerTestCase
 {
 	use VFSTrait;
 

tests/src/Core/Logger/SyslogLoggerTest.php

@@ -9,9 +9,10 @@ namespace Friendica\Test\src\Core\Logger;
 
 use Friendica\Core\Logger\Exception\LogLevelException;
 use Friendica\Core\Logger\Type\SyslogLogger;
+use Friendica\Test\LoggerTestCase;
 use Psr\Log\LogLevel;
 
-class SyslogLoggerTest extends AbstractLoggerTest
+class SyslogLoggerTest extends LoggerTestCase
 {
 	/**
 	 * @var SyslogLoggerWrapper

tests/src/Core/Logger/WorkerLoggerTest.php

@@ -8,10 +8,10 @@
 namespace Friendica\Test\src\Core\Logger;
 
 use Friendica\Core\Logger\Type\WorkerLogger;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Psr\Log\LoggerInterface;
 
-class WorkerLoggerTest extends MockedTest
+class WorkerLoggerTest extends MockedTestCase
 {
 	private function assertUid($uid)
 	{

tests/src/Core/PConfig/Cache/CacheTest.php

@@ -7,10 +7,9 @@
 
 namespace Friendica\Test\src\Core\PConfig\Cache;
 
-use Friendica\Core\PConfig\Cache;
+use Friendica\Test\MockedTestCase;
-use Friendica\Test\MockedTest;
 
-class CacheTest extends MockedTest
+class CacheTest extends MockedTestCase
 {
 	public function dataTests()
 	{

tests/src/Core/PConfig/JitPConfigTest.php

@@ -8,8 +8,9 @@
 namespace Friendica\Test\src\Core\PConfig;
 
 use Friendica\Core\PConfig\Type\JitPConfig;
+use Friendica\Test\PConfigTestCase;
 
-class JitPConfigTest extends PConfigTest
+class JitPConfigTest extends PConfigTestCase
 {
 	public function getInstance()
 	{

tests/src/Core/PConfig/PreloadPConfigTest.php

@@ -8,12 +8,13 @@
 namespace Friendica\Test\src\Core\PConfig;
 
 use Friendica\Core\PConfig\Type\PreloadPConfig;
+use Friendica\Test\PConfigTestCase;
 
-class PreloadPConfigTest extends PConfigTest
+class PreloadPConfigTest extends PConfigTestCase
 {
 	public function getInstance()
 	{
-		return new \Friendica\Core\PConfig\Type\PreloadPConfig($this->configCache, $this->configModel);
+		return new PreloadPConfig($this->configCache, $this->configModel);
 	}
 
 	/**

tests/src/Core/Session/UserSessionTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\Core\Session;
 
 use Friendica\Core\Session\Model\UserSession;
 use Friendica\Core\Session\Type\ArraySession;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-class UserSessionTest extends MockedTest
+class UserSessionTest extends MockedTestCase
 {
 	public function dataLocalUserId()
 	{

tests/src/Core/Storage/DatabaseStorageTest.php

@@ -8,9 +8,10 @@
 namespace Friendica\Test\src\Core\Storage;
 
 use Friendica\Core\Storage\Type\Database;
+use Friendica\Test\StorageTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 
-class DatabaseStorageTest extends StorageTest
+class DatabaseStorageTest extends StorageTestCase
 {
 	use CreateDatabaseTrait;
 

tests/src/Core/Storage/FilesystemStorageConfigTest.php

@@ -11,11 +11,12 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Storage\Capability\ICanConfigureStorage;
 use Friendica\Core\Storage\Type\FilesystemConfig;
+use Friendica\Test\StorageConfigTestCase;
 use Friendica\Test\Util\VFSTrait;
 use Mockery\MockInterface;
 use org\bovigo\vfs\vfsStream;
 
-class FilesystemStorageConfigTest extends StorageConfigTest
+class FilesystemStorageConfigTest extends StorageConfigTestCase
 {
 	use VFSTrait;
 

tests/src/Core/Storage/FilesystemStorageTest.php

@@ -10,10 +10,11 @@ namespace Friendica\Test\src\Core\Storage;
 use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Core\Storage\Type\Filesystem;
 use Friendica\Core\Storage\Type\FilesystemConfig;
+use Friendica\Test\StorageTestCase;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 
-class FilesystemStorageTest extends StorageTest
+class FilesystemStorageTest extends StorageTestCase
 {
 	use VFSTrait;
 

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;
 

tests/src/Core/Worker/Repository/ProcessTest.php

@@ -10,10 +10,10 @@ namespace Friendica\Test\src\Core\Worker\Repository;
 use Friendica\Core\Worker\Factory;
 use Friendica\Core\Worker\Repository;
 use Friendica\DI;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 use Psr\Log\NullLogger;
 
-class ProcessTest extends FixtureTest
+class ProcessTest extends FixtureTestCase
 {
 	public function testStandardProcess()
 	{

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
 	{

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
 	{

tests/src/Database/DatabaseTest.php

@@ -9,10 +9,10 @@ namespace Friendica\Test\src\Database;
 
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 
-class DatabaseTest extends FixtureTest
+class DatabaseTest extends FixtureTestCase
 {
 	use CreateDatabaseTrait;
 

tests/src/Factory/Api/Mastodon/EmojiTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\Factory\Api\Mastodon;
 
 use Friendica\Content\Smilies;
 use Friendica\DI;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class EmojiTest extends FixtureTest
+class EmojiTest extends FixtureTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Factory/Api/Mastodon/StatusTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Factory\Api\Mastodon;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Model\Post;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class StatusTest extends FixtureTest
+class StatusTest extends FixtureTestCase
 {
 	protected $status;
 

tests/src/Factory/Api/Twitter/ActivitiesTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\Factory\Api\Twitter;
 
 use Friendica\DI;
 use Friendica\Factory\Api\Friendica\Activities;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\FixtureTestCase;
 
-class ActivitiesTest extends FixtureTest
+class ActivitiesTest extends FixtureTestCase
 {
 	/**
 	 * Test the api_format_items_activities() function.

tests/src/Factory/Api/Twitter/DirectMessageTest.php

@@ -9,10 +9,10 @@ namespace Friendica\Test\src\Factory\Api\Twitter;
 
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\ApiTestCase;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\FixtureTestCase;
 
-class DirectMessageTest extends FixtureTest
+class DirectMessageTest extends FixtureTestCase
 {
 	/**
 	 * Test the api_format_messages() function.
@@ -26,7 +26,7 @@ class DirectMessageTest extends FixtureTest
 		$id  = $ids[0]['id'];
 
 		$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
-			->createFromMailId($id, ApiTest::SELF_USER['id'])
+			->createFromMailId($id, ApiTestCase::SELF_USER['id'])
 			->toArray();
 
 		self::assertEquals('item_title' . "\n" . 'item_body', $directMessage['text']);
@@ -49,7 +49,7 @@ class DirectMessageTest extends FixtureTest
 		$id  = $ids[0]['id'];
 
 		$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
-			->createFromMailId($id, ApiTest::SELF_USER['id'], 'html')
+			->createFromMailId($id, ApiTestCase::SELF_USER['id'], 'html')
 			->toArray();
 
 		self::assertEquals('item_title', $directMessage['title']);
@@ -68,7 +68,7 @@ class DirectMessageTest extends FixtureTest
 		$id  = $ids[0]['id'];
 
 		$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
-			->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain')
+			->createFromMailId($id, ApiTestCase::SELF_USER['id'], 'plain')
 			->toArray();
 
 		self::assertEquals('item_title', $directMessage['title']);
@@ -90,7 +90,7 @@ class DirectMessageTest extends FixtureTest
 		$id  = $ids[0]['id'];
 
 		$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
-			->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain', $$GETUSEROBJECTS$$)
+			->createFromMailId($id, ApiTestCase::SELF_USER['id'], 'plain', $$GETUSEROBJECTS$$)
 			->toArray();
 
 		self::assertTrue(!isset($directMessage['sender']));

tests/src/Factory/Api/Twitter/StatusTest.php

@@ -16,10 +16,10 @@ use Friendica\Factory\Api\Twitter\Media;
 use Friendica\Factory\Api\Twitter\Mention;
 use Friendica\Factory\Api\Twitter\Status;
 use Friendica\Factory\Api\Twitter\Url;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\ApiTestCase;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\FixtureTestCase;
 
-class StatusTest extends FixtureTest
+class StatusTest extends FixtureTestCase
 {
 	protected $statusFactory;
 
@@ -47,7 +47,7 @@ class StatusTest extends FixtureTest
 	public function testApiConvertItem()
 	{
 		$status = $this->statusFactory
-			->createFromItemId(13, ApiTest::SELF_USER['id'])
+			->createFromItemId(13, ApiTestCase::SELF_USER['id'])
 			->toArray();
 
 		self::assertStringStartsWith('item_title', $status['text']);
@@ -108,7 +108,7 @@ class StatusTest extends FixtureTest
 	public function testApiGetEntitiesWithIncludeEntities()
 	{
 		$status = $this->statusFactory
-			->createFromItemId(13, ApiTest::SELF_USER['id'], true)
+			->createFromItemId(13, ApiTestCase::SELF_USER['id'], true)
 			->toArray();
 
 		self::assertIsArray($status['entities']);
@@ -130,7 +130,7 @@ class StatusTest extends FixtureTest
 		$posts = DI::dba()->selectToArray('post-view', ['uri-id']);
 		foreach ($posts as $item) {
 			$status = $this->statusFactory
-				->createFromUriId($item['uri-id'], ApiTest::SELF_USER['id'])
+				->createFromUriId($item['uri-id'], ApiTestCase::SELF_USER['id'])
 				->toArray();
 
 			self::assertIsInt($status['id']);

tests/src/Factory/Api/Twitter/UserTest.php

@@ -10,10 +10,10 @@ namespace Friendica\Test\src\Factory\Api\Twitter;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\User;
 use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Test\FixtureTest;
+use Friendica\Test\ApiTestCase;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\FixtureTestCase;
 
-class UserTest extends FixtureTest
+class UserTest extends FixtureTestCase
 {
 	/**
 	 * Assert that an user array contains expected keys.
@@ -22,11 +22,11 @@ class UserTest extends FixtureTest
 	 */
 	protected function assertSelfUser(array $user)
 	{
-		self::assertEquals(ApiTest::SELF_USER['id'], $user['uid']);
+		self::assertEquals(ApiTestCase::SELF_USER['id'], $user['uid']);
-		self::assertEquals(ApiTest::SELF_USER['id'], $user['cid']);
+		self::assertEquals(ApiTestCase::SELF_USER['id'], $user['cid']);
 		self::assertEquals('DFRN', $user['location']);
-		self::assertEquals(ApiTest::SELF_USER['name'], $user['name']);
+		self::assertEquals(ApiTestCase::SELF_USER['name'], $user['name']);
-		self::assertEquals(ApiTest::SELF_USER['nick'], $user['screen_name']);
+		self::assertEquals(ApiTestCase::SELF_USER['nick'], $user['screen_name']);
 		self::assertTrue($user['verified']);
 	}
 
@@ -38,7 +38,7 @@ class UserTest extends FixtureTest
 	public function testApiGetUser()
 	{
 		$user = (new User(DI::logger(), DI::twitterStatus()))
-			->createFromUserId(ApiTest::SELF_USER['id'])
+			->createFromUserId(ApiTestCase::SELF_USER['id'])
 			->toArray();
 
 		$this->assertSelfUser($user);
@@ -54,7 +54,7 @@ class UserTest extends FixtureTest
 		$this->markTestIncomplete('Needs missing fields for profile colors at API User object first.');
 
 		/*
-		DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'schema', 'red');
+		DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'schema', 'red');
 
 		$userFactory = new User(DI::logger(), DI::twitterStatus());
 		$user        = $userFactory->createFromUserId(42);
@@ -76,7 +76,7 @@ class UserTest extends FixtureTest
 		$this->markTestIncomplete('Needs missing fields for profile colors at API User object first.');
 
 		/*
-		DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'schema', '---');
+		DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'schema', '---');
 
 		$userFactory = new User(DI::logger(), DI::twitterStatus());
 		$user        = $userFactory->createFromUserId(42);
@@ -98,10 +98,10 @@ class UserTest extends FixtureTest
 		$this->markTestIncomplete('Needs missing fields for profile colors at API User object first.');
 
 		/*
-		DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'schema', '---');
+		DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'schema', '---');
-		DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'nav_bg', '#123456');
+		DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'nav_bg', '#123456');
-		DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'link_color', '#123456');
+		DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'link_color', '#123456');
-		DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'background_color', '#123456');
+		DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'background_color', '#123456');
 
 		$userFactory = new User(DI::logger(), DI::twitterStatus());
 		$user        = $userFactory->createFromUserId(42);

tests/src/Model/Post/MediaTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Model\Post;
 
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 
-class MediaTest extends MockedTest
+class MediaTest extends MockedTestCase
 {
 	/**
 	 * Test the api_get_attachments() function.

tests/src/Model/User/CookieTest.php

@@ -11,11 +11,11 @@ use Friendica\App\BaseURL;
 use Friendica\App\Request;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Model\User\Cookie;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Test\Util\StaticCookie;
 use Mockery\MockInterface;
 
-class CookieTest extends MockedTest
+class CookieTest extends MockedTestCase
 {
 	/** @var MockInterface|IManageConfigValues */
 	private $config;

tests/src/Model/UserTest.php

@@ -11,10 +11,10 @@ use Dice\Dice;
 use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Mockery\MockInterface;
 
-class UserTest extends MockedTest
+class UserTest extends MockedTestCase
 {
 	private $parent;
 	private $child;

tests/src/Moderation/Factory/ReportTest.php

@@ -10,13 +10,13 @@ namespace Friendica\Test\src\Moderation\Factory;
 use Friendica\Moderation\Collection;
 use Friendica\Moderation\Factory;
 use Friendica\Moderation\Entity;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Friendica\Util\Clock\FrozenClock;
 use Friendica\Util\DateTimeFormat;
 use Psr\Clock\ClockInterface;
 use Psr\Log\NullLogger;
 
-class ReportTest extends MockedTest
+class ReportTest extends MockedTestCase
 {
 	public function dataCreateFromTableRow(): array
 	{

tests/src/Module/Api/ApiResponseTest.php

@@ -12,10 +12,10 @@ use Friendica\App\BaseURL;
 use Friendica\Core\L10n;
 use Friendica\Factory\Api\Twitter\User;
 use Friendica\Module\Api\ApiResponse;
-use Friendica\Test\MockedTest;
+use Friendica\Test\MockedTestCase;
 use Psr\Log\NullLogger;
 
-class ApiResponseTest extends MockedTest
+class ApiResponseTest extends MockedTestCase
 {
 	public function testErrorWithJson()
 	{

tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php

@@ -7,14 +7,13 @@
 
 namespace Friendica\Test\src\Module\Api\Friendica\DirectMessages;
 
-use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Factory\Api\Twitter\DirectMessage;
 use Friendica\Module\Api\Friendica\DirectMessages\Search;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 use Psr\Log\NullLogger;
 
-class SearchTest extends ApiTest
+class SearchTest extends ApiTestCase
 {
 	public function testEmpty()
 	{

tests/src/Module/Api/Friendica/NotificationTest.php

@@ -10,11 +10,11 @@ namespace Friendica\Test\src\Module\Api\Friendica;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Notification;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
-class NotificationTest extends ApiTest
+class NotificationTest extends ApiTestCase
 {
 	public function testEmpty()
 	{

tests/src/Module/Api/Friendica/Photo/DeleteTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Photo\Delete;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DeleteTest extends ApiTest
+class DeleteTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Photoalbum\Delete;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class DeleteTest extends ApiTest
+class DeleteTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php

@@ -11,9 +11,9 @@ use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Friendica\Photoalbum\Update;
 use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class UpdateTest extends ApiTest
+class UpdateTest extends ApiTestCase
 {
 	protected function setUp(): void
 	{

tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php

@@ -9,9 +9,9 @@ namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
 
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\GNUSocial\Config;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ConfigTest extends ApiTest
+class ConfigTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statusnet_config() function.

tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\GNUSocial\Version;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class VersionTest extends ApiTest
+class VersionTest extends ApiTestCase
 {
 	public function test()
 	{

tests/src/Module/Api/GnuSocial/Help/TestTest.php

@@ -10,9 +10,9 @@ namespace Friendica\Test\src\Module\Api\GnuSocial\Help;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\Help\Test;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class TestTest extends ApiTest
+class TestTest extends ApiTestCase
 {
 	public function testJson()
 	{

tests/src/Module/Api/Mastodon/Accounts/StatusesTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Accounts;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class StatusesTest extends ApiTest
+class StatusesTest extends ApiTestCase
 {
 	/**
 	 * Test the api_status_show() function.

tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php

@@ -7,12 +7,11 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Accounts;
 
-use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\Mastodon\Accounts\VerifyCredentials;
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class VerifyCredentialsTest extends ApiTest
+class VerifyCredentialsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_account_verify_credentials() function.

tests/src/Module/Api/Mastodon/ConversationsTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class ConversationsTest extends ApiTest
+class ConversationsTest extends ApiTestCase
 {
 	/**
 	 * Test the api_conversation_show() function.

tests/src/Module/Api/Mastodon/PushSubscriptionTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class PushSubscriptionTest extends ApiTest
+class PushSubscriptionTest extends ApiTestCase
 {
 	/**
 	 * Test the api_account_verify_credentials() function.

tests/src/Module/Api/Mastodon/SearchTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class SearchTest extends ApiTest
+class SearchTest extends ApiTestCase
 {
 	/**
 	 * Test the api_search() function.

tests/src/Module/Api/Mastodon/Timelines/HomeTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Timelines;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class HomeTest extends ApiTest
+class HomeTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_home_timeline() function.

tests/src/Module/Api/Mastodon/Timelines/PublicTimelineTest.php

@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Module\Api\Mastodon\Timelines;
 
-use Friendica\Test\src\Module\Api\ApiTest;
+use Friendica\Test\ApiTestCase;
 
-class PublicTimelineTest extends ApiTest
+class PublicTimelineTest extends ApiTestCase
 {
 	/**
 	 * Test the api_statuses_public_timeline() function.