From ee579280c7923bd2b06b4d1d68ec572e4823407a Mon Sep 17 00:00:00 2001 From: Art4 Date: Wed, 11 Dec 2024 22:45:17 +0000 Subject: [PATCH] Rename MockedTest to MockedTestCase --- tests/DatabaseTest.php | 2 +- tests/FixtureTest.php | 16 +--------------- tests/{MockedTest.php => MockedTestCase.php} | 2 +- tests/src/App/BaseURLTest.php | 4 ++-- tests/src/App/ModeTest.php | 4 ++-- tests/src/App/RequestTest.php | 4 ++-- tests/src/CollectionTest.php | 4 ++-- tests/src/Console/ConsoleTest.php | 4 ++-- .../FriendSuggest/Factory/FriendSuggestTest.php | 4 ++-- tests/src/Content/ItemTest.php | 4 ++-- tests/src/Content/Text/BBCode/VideoTest.php | 4 ++-- tests/src/Core/Addon/Model/AddonLoaderTest.php | 4 ++-- tests/src/Core/Cache/CacheTest.php | 6 ++---- tests/src/Core/Config/Cache/CacheTest.php | 4 ++-- .../Core/Config/Cache/ConfigFileManagerTest.php | 4 ++-- .../src/Core/Hooks/Model/InstanceManagerTest.php | 4 ++-- .../Hooks/Util/StrategiesFileManagerTest.php | 4 ++-- tests/src/Core/InstallerTest.php | 4 ++-- .../Core/KeyValueStorage/KeyValueStorageTest.php | 4 ++-- tests/src/Core/L10nTest.php | 4 ++-- tests/src/Core/Lock/LockTest.php | 4 ++-- tests/src/Core/Logger/AbstractLoggerTest.php | 4 ++-- tests/src/Core/Logger/ProfilerLoggerTest.php | 4 ++-- tests/src/Core/Logger/WorkerLoggerTest.php | 4 ++-- tests/src/Core/PConfig/Cache/CacheTest.php | 5 ++--- tests/src/Core/PConfig/PConfigTest.php | 4 ++-- tests/src/Core/Session/UserSessionTest.php | 4 ++-- tests/src/Core/Storage/StorageConfigTest.php | 4 ++-- tests/src/Core/Storage/StorageTest.php | 4 ++-- tests/src/Model/Post/MediaTest.php | 4 ++-- tests/src/Model/User/CookieTest.php | 4 ++-- tests/src/Model/UserTest.php | 4 ++-- tests/src/Moderation/Factory/ReportTest.php | 4 ++-- tests/src/Module/Api/ApiResponseTest.php | 4 ++-- .../Network/HTTPClient/Client/HTTPClientTest.php | 4 ++-- tests/src/Network/ProbeTest.php | 4 ++-- .../ProfileField/Entity/ProfileFieldTest.php | 4 ++-- tests/src/Protocol/ActivityTest.php | 4 ++-- .../PermissionSet/Entity/PermissionSetTest.php | 4 ++-- .../PermissionSet/Factory/PermissionSetTest.php | 4 ++-- .../TwoFactor/Factory/TrustedBrowserTest.php | 4 ++-- .../TwoFactor/Model/TrustedBrowserTest.php | 4 ++-- tests/src/Util/BasePathTest.php | 4 ++-- tests/src/Util/DateTimeFormatTest.php | 4 ++-- tests/src/Util/EMailerTest.php | 4 ++-- tests/src/Util/Emailer/MailBuilderTest.php | 4 ++-- tests/src/Util/Emailer/SystemMailBuilderTest.php | 4 ++-- tests/src/Util/HTTPInputDataTest.php | 5 ++--- tests/src/Util/ImagesTest.php | 4 ++-- tests/src/Util/ProfilerTest.php | 4 ++-- .../Util/Router/FriendicaGroupCountBasedTest.php | 4 ++-- 51 files changed, 99 insertions(+), 117 deletions(-) rename tests/{MockedTest.php => MockedTestCase.php} (88%) diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php index 4510a48034..af6e45226a 100644 --- a/tests/DatabaseTest.php +++ b/tests/DatabaseTest.php @@ -10,7 +10,7 @@ namespace Friendica\Test; /** * Abstract class used by tests that need a database. */ -abstract class DatabaseTest extends MockedTest +abstract class DatabaseTest extends MockedTestCase { use DatabaseTestTrait; diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php index 2b4bcc1329..411662e0cb 100644 --- a/tests/FixtureTest.php +++ b/tests/FixtureTest.php @@ -7,24 +7,10 @@ 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 +abstract class FixtureTest extends MockedTestCase { use FixtureTestTrait; diff --git a/tests/MockedTest.php b/tests/MockedTestCase.php similarity index 88% rename from tests/MockedTest.php rename to tests/MockedTestCase.php index 14328f830e..3fbb1b906a 100644 --- a/tests/MockedTest.php +++ b/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 { diff --git a/tests/src/App/BaseURLTest.php b/tests/src/App/BaseURLTest.php index 1e6c799f32..9c3333feff 100644 --- a/tests/src/App/BaseURLTest.php +++ b/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 { diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php index 6b83775883..b1ddca1d33 100644 --- a/tests/src/App/ModeTest.php +++ b/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; diff --git a/tests/src/App/RequestTest.php b/tests/src/App/RequestTest.php index 77d77c3ba9..648d2b6386 100644 --- a/tests/src/App/RequestTest.php +++ b/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 { diff --git a/tests/src/CollectionTest.php b/tests/src/CollectionTest.php index 257ec0e107..f82bb5dfea 100644 --- a/tests/src/CollectionTest.php +++ b/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 diff --git a/tests/src/Console/ConsoleTest.php b/tests/src/Console/ConsoleTest.php index 88c80d7bc6..5384076c73 100644 --- a/tests/src/Console/ConsoleTest.php +++ b/tests/src/Console/ConsoleTest.php @@ -8,10 +8,10 @@ namespace Friendica\Test\src\Console; use Asika\SimpleConsole\Console; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Test\Util\Intercept; -abstract class ConsoleTest extends MockedTest +abstract class ConsoleTest extends MockedTestCase { /** * @var array The default argv for a Console Instance diff --git a/tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php b/tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php index 67275abe35..dd4102d0ab 100644 --- a/tests/src/Contact/FriendSuggest/Factory/FriendSuggestTest.php +++ b/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() { diff --git a/tests/src/Content/ItemTest.php b/tests/src/Content/ItemTest.php index a2e14ce061..c2adbccb15 100644 --- a/tests/src/Content/ItemTest.php +++ b/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 diff --git a/tests/src/Content/Text/BBCode/VideoTest.php b/tests/src/Content/Text/BBCode/VideoTest.php index 21b4d5068d..a2b4188d38 100644 --- a/tests/src/Content/Text/BBCode/VideoTest.php +++ b/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() { diff --git a/tests/src/Core/Addon/Model/AddonLoaderTest.php b/tests/src/Core/Addon/Model/AddonLoaderTest.php index 6c052230a6..1c119fb680 100644 --- a/tests/src/Core/Addon/Model/AddonLoaderTest.php +++ b/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; diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php index 10cade17d9..47c5a7ccca 100644 --- a/tests/src/Core/Cache/CacheTest.php +++ b/tests/src/Core/Cache/CacheTest.php @@ -8,12 +8,10 @@ namespace Friendica\Test\src\Core\Cache; use Friendica\Core\Cache\Capability\ICanCache; -use Friendica\Core\Cache\Capability\ICanCacheInMemory; -use Friendica\Core\Cache\Type\AbstractCache; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\PidFile; -abstract class CacheTest extends MockedTest +abstract class CacheTest extends MockedTestCase { /** * @var int Start time of the mock (used for time operations) diff --git a/tests/src/Core/Config/Cache/CacheTest.php b/tests/src/Core/Config/Cache/CacheTest.php index f539dc045c..fddf621bd0 100644 --- a/tests/src/Core/Config/Cache/CacheTest.php +++ b/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() { diff --git a/tests/src/Core/Config/Cache/ConfigFileManagerTest.php b/tests/src/Core/Config/Cache/ConfigFileManagerTest.php index 3f49e8c8eb..e5b1fc623d 100644 --- a/tests/src/Core/Config/Cache/ConfigFileManagerTest.php +++ b/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; diff --git a/tests/src/Core/Hooks/Model/InstanceManagerTest.php b/tests/src/Core/Hooks/Model/InstanceManagerTest.php index 4d38265ebf..ef22218945 100644 --- a/tests/src/Core/Hooks/Model/InstanceManagerTest.php +++ b/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; diff --git a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php index 5fb0927d68..633b636701 100644 --- a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php +++ b/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; diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php index a97c7d36c9..2f5873dfe6 100644 --- a/tests/src/Core/InstallerTest.php +++ b/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; diff --git a/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php b/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php index 6d1f6ad328..123be61e12 100644 --- a/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php +++ b/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php @@ -8,9 +8,9 @@ namespace Friendica\Test\src\Core\KeyValueStorage; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; -abstract class KeyValueStorageTest extends MockedTest +abstract class KeyValueStorageTest extends MockedTestCase { abstract public function getInstance(): IManageKeyValuePairs; diff --git a/tests/src/Core/L10nTest.php b/tests/src/Core/L10nTest.php index cf61b2dd48..01dc301d78 100644 --- a/tests/src/Core/L10nTest.php +++ b/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() { diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php index 4c8583523a..c32f50e2f6 100644 --- a/tests/src/Core/Lock/LockTest.php +++ b/tests/src/Core/Lock/LockTest.php @@ -8,9 +8,9 @@ namespace Friendica\Test\src\Core\Lock; use Friendica\Core\Lock\Capability\ICanLock; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; -abstract class LockTest extends MockedTest +abstract class LockTest extends MockedTestCase { /** * @var int Start time of the mock (used for time operations) diff --git a/tests/src/Core/Logger/AbstractLoggerTest.php b/tests/src/Core/Logger/AbstractLoggerTest.php index a155239a8d..b1a793d41f 100644 --- a/tests/src/Core/Logger/AbstractLoggerTest.php +++ b/tests/src/Core/Logger/AbstractLoggerTest.php @@ -8,13 +8,13 @@ namespace Friendica\Test\src\Core\Logger; 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 AbstractLoggerTest extends MockedTestCase { use LoggerDataTrait; diff --git a/tests/src/Core/Logger/ProfilerLoggerTest.php b/tests/src/Core/Logger/ProfilerLoggerTest.php index b6dd4c4132..9ae1d5b3ef 100644 --- a/tests/src/Core/Logger/ProfilerLoggerTest.php +++ b/tests/src/Core/Logger/ProfilerLoggerTest.php @@ -7,14 +7,14 @@ namespace Friendica\Test\src\Core\Logger; -use Friendica\Test\MockedTest; use Friendica\Core\Logger\Type\ProfilerLogger; +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; diff --git a/tests/src/Core/Logger/WorkerLoggerTest.php b/tests/src/Core/Logger/WorkerLoggerTest.php index d40cf82f09..ab3e41d9d1 100644 --- a/tests/src/Core/Logger/WorkerLoggerTest.php +++ b/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) { diff --git a/tests/src/Core/PConfig/Cache/CacheTest.php b/tests/src/Core/PConfig/Cache/CacheTest.php index 50b2b3f205..a4d968730b 100644 --- a/tests/src/Core/PConfig/Cache/CacheTest.php +++ b/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\MockedTest; +use Friendica\Test\MockedTestCase; -class CacheTest extends MockedTest +class CacheTest extends MockedTestCase { public function dataTests() { diff --git a/tests/src/Core/PConfig/PConfigTest.php b/tests/src/Core/PConfig/PConfigTest.php index 6c2beb0068..944f7e5ade 100644 --- a/tests/src/Core/PConfig/PConfigTest.php +++ b/tests/src/Core/PConfig/PConfigTest.php @@ -11,11 +11,11 @@ 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 Friendica\Test\MockedTestCase; use Mockery; use Mockery\MockInterface; -abstract class PConfigTest extends MockedTest +abstract class PConfigTest extends MockedTestCase { use ArraySubsetAsserts; diff --git a/tests/src/Core/Session/UserSessionTest.php b/tests/src/Core/Session/UserSessionTest.php index d7db99fa81..64c7d8b950 100644 --- a/tests/src/Core/Session/UserSessionTest.php +++ b/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() { diff --git a/tests/src/Core/Storage/StorageConfigTest.php b/tests/src/Core/Storage/StorageConfigTest.php index 23cc54df90..78a5e396f6 100644 --- a/tests/src/Core/Storage/StorageConfigTest.php +++ b/tests/src/Core/Storage/StorageConfigTest.php @@ -8,9 +8,9 @@ namespace Friendica\Test\src\Core\Storage; use Friendica\Core\Storage\Capability\ICanConfigureStorage; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; -abstract class StorageConfigTest extends MockedTest +abstract class StorageConfigTest extends MockedTestCase { /** @return ICanConfigureStorage */ abstract protected function getInstance(); diff --git a/tests/src/Core/Storage/StorageTest.php b/tests/src/Core/Storage/StorageTest.php index 10114c2dd9..9816db914c 100644 --- a/tests/src/Core/Storage/StorageTest.php +++ b/tests/src/Core/Storage/StorageTest.php @@ -10,9 +10,9 @@ namespace Friendica\Test\src\Core\Storage; 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 StorageTest extends MockedTestCase { /** @return ICanWriteToStorage */ abstract protected function getInstance(); diff --git a/tests/src/Model/Post/MediaTest.php b/tests/src/Model/Post/MediaTest.php index e6b09e6a74..d063399b13 100644 --- a/tests/src/Model/Post/MediaTest.php +++ b/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. diff --git a/tests/src/Model/User/CookieTest.php b/tests/src/Model/User/CookieTest.php index 3d93e1fa37..3c56a89668 100644 --- a/tests/src/Model/User/CookieTest.php +++ b/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; diff --git a/tests/src/Model/UserTest.php b/tests/src/Model/UserTest.php index 3bdd6c403e..f58f34995f 100644 --- a/tests/src/Model/UserTest.php +++ b/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; diff --git a/tests/src/Moderation/Factory/ReportTest.php b/tests/src/Moderation/Factory/ReportTest.php index 46b9275d83..d488648e92 100644 --- a/tests/src/Moderation/Factory/ReportTest.php +++ b/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 { diff --git a/tests/src/Module/Api/ApiResponseTest.php b/tests/src/Module/Api/ApiResponseTest.php index 2133ab487c..23cc4bf702 100644 --- a/tests/src/Module/Api/ApiResponseTest.php +++ b/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() { diff --git a/tests/src/Network/HTTPClient/Client/HTTPClientTest.php b/tests/src/Network/HTTPClient/Client/HTTPClientTest.php index 9a488f0d1e..bd15a7120d 100644 --- a/tests/src/Network/HTTPClient/Client/HTTPClientTest.php +++ b/tests/src/Network/HTTPClient/Client/HTTPClientTest.php @@ -9,11 +9,11 @@ namespace Friendica\Test\src\Network\HTTPClient\Client; use Friendica\DI; use Friendica\Test\DiceHttpMockHandlerTrait; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use GuzzleHttp\Handler\MockHandler; use GuzzleHttp\Psr7\Response; -class HTTPClientTest extends MockedTest +class HTTPClientTest extends MockedTestCase { use DiceHttpMockHandlerTrait; diff --git a/tests/src/Network/ProbeTest.php b/tests/src/Network/ProbeTest.php index d5698e33bf..653cc0ca62 100644 --- a/tests/src/Network/ProbeTest.php +++ b/tests/src/Network/ProbeTest.php @@ -9,10 +9,10 @@ namespace Friendica\Test\src\Network; use Friendica\Network\Probe; use Friendica\Test\DiceHttpMockHandlerTrait; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use GuzzleHttp\Middleware; -class ProbeTest extends MockedTest +class ProbeTest extends MockedTestCase { use DiceHttpMockHandlerTrait; diff --git a/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php b/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php index b8e5309421..e718eebf07 100644 --- a/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php +++ b/tests/src/Profile/ProfileField/Entity/ProfileFieldTest.php @@ -13,13 +13,13 @@ use Friendica\Profile\ProfileField\Exception\UnexpectedPermissionSetException; use Friendica\Profile\ProfileField\Factory\ProfileField as ProfileFieldFactory; use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\ACLFormatter; use Friendica\Util\DateTimeFormat; use Mockery\MockInterface; use Psr\Log\NullLogger; -class ProfileFieldTest extends MockedTest +class ProfileFieldTest extends MockedTestCase { /** @var MockInterface|PermissionSetRepository */ protected $permissionSetRepository; diff --git a/tests/src/Protocol/ActivityTest.php b/tests/src/Protocol/ActivityTest.php index 59a650ea16..30359321cf 100644 --- a/tests/src/Protocol/ActivityTest.php +++ b/tests/src/Protocol/ActivityTest.php @@ -9,9 +9,9 @@ namespace Friendica\Test\src\Protocol; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityNamespace; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; -class ActivityTest extends MockedTest +class ActivityTest extends MockedTestCase { public function dataMatch() { diff --git a/tests/src/Security/PermissionSet/Entity/PermissionSetTest.php b/tests/src/Security/PermissionSet/Entity/PermissionSetTest.php index 4ed62f2fc4..bb456d0445 100644 --- a/tests/src/Security/PermissionSet/Entity/PermissionSetTest.php +++ b/tests/src/Security/PermissionSet/Entity/PermissionSetTest.php @@ -8,9 +8,9 @@ namespace Friendica\Test\src\Security\PermissionSet\Entity; use Friendica\Security\PermissionSet\Entity\PermissionSet; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; -class PermissionSetTest extends MockedTest +class PermissionSetTest extends MockedTestCase { public function dateAllowedContacts() { diff --git a/tests/src/Security/PermissionSet/Factory/PermissionSetTest.php b/tests/src/Security/PermissionSet/Factory/PermissionSetTest.php index 8b4410217e..25ff93cbbd 100644 --- a/tests/src/Security/PermissionSet/Factory/PermissionSetTest.php +++ b/tests/src/Security/PermissionSet/Factory/PermissionSetTest.php @@ -8,11 +8,11 @@ namespace Friendica\Test\src\Security\PermissionSet\Factory; use Friendica\Security\PermissionSet\Factory\PermissionSet; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\ACLFormatter; use Psr\Log\NullLogger; -class PermissionSetTest extends MockedTest +class PermissionSetTest extends MockedTestCase { /** @var PermissionSet */ protected $permissionSet; diff --git a/tests/src/Security/TwoFactor/Factory/TrustedBrowserTest.php b/tests/src/Security/TwoFactor/Factory/TrustedBrowserTest.php index b03d14ca81..fdf2722367 100644 --- a/tests/src/Security/TwoFactor/Factory/TrustedBrowserTest.php +++ b/tests/src/Security/TwoFactor/Factory/TrustedBrowserTest.php @@ -8,12 +8,12 @@ namespace Friendica\Test\src\Security\TwoFactor\Factory; use Friendica\Security\TwoFactor\Factory\TrustedBrowser; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; use Psr\Log\NullLogger; -class TrustedBrowserTest extends MockedTest +class TrustedBrowserTest extends MockedTestCase { public function testCreateFromTableRowSuccess() { diff --git a/tests/src/Security/TwoFactor/Model/TrustedBrowserTest.php b/tests/src/Security/TwoFactor/Model/TrustedBrowserTest.php index 486fca2c0f..08f12f562a 100644 --- a/tests/src/Security/TwoFactor/Model/TrustedBrowserTest.php +++ b/tests/src/Security/TwoFactor/Model/TrustedBrowserTest.php @@ -8,11 +8,11 @@ namespace Friendica\Test\src\Security\TwoFactor\Model; use Friendica\Security\TwoFactor\Model\TrustedBrowser; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; -class TrustedBrowserTest extends MockedTest +class TrustedBrowserTest extends MockedTestCase { public function test__construct() { diff --git a/tests/src/Util/BasePathTest.php b/tests/src/Util/BasePathTest.php index 6e6eb58906..bbcaeb359b 100644 --- a/tests/src/Util/BasePathTest.php +++ b/tests/src/Util/BasePathTest.php @@ -7,10 +7,10 @@ namespace Friendica\Test\src\Util; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\BasePath; -class BasePathTest extends MockedTest +class BasePathTest extends MockedTestCase { public function dataPaths() { diff --git a/tests/src/Util/DateTimeFormatTest.php b/tests/src/Util/DateTimeFormatTest.php index 5f5e1485fc..9137659ba8 100644 --- a/tests/src/Util/DateTimeFormatTest.php +++ b/tests/src/Util/DateTimeFormatTest.php @@ -7,10 +7,10 @@ namespace Friendica\Test\src\Util; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\DateTimeFormat; -class DateTimeFormatTest extends MockedTest +class DateTimeFormatTest extends MockedTestCase { public function dataYearMonth() { diff --git a/tests/src/Util/EMailerTest.php b/tests/src/Util/EMailerTest.php index 5a892597f4..21c7fbabc2 100644 --- a/tests/src/Util/EMailerTest.php +++ b/tests/src/Util/EMailerTest.php @@ -12,7 +12,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Object\EMail\IEmail; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Test\Util\EmailerSpy; use Friendica\Test\Util\HookMockTrait; use Friendica\Test\Util\SampleMailBuilder; @@ -26,7 +26,7 @@ use Psr\Log\NullLogger; * @runTestsInSeparateProcesses * @preserveGlobalState disabled */ -class EMailerTest extends MockedTest +class EMailerTest extends MockedTestCase { use VFSTrait; use HookMockTrait; diff --git a/tests/src/Util/Emailer/MailBuilderTest.php b/tests/src/Util/Emailer/MailBuilderTest.php index 0c432e8930..36095a5d60 100644 --- a/tests/src/Util/Emailer/MailBuilderTest.php +++ b/tests/src/Util/Emailer/MailBuilderTest.php @@ -12,7 +12,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Friendica\Network\HTTPException\UnprocessableEntityException; use Friendica\Object\EMail\IEmail; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Test\Util\SampleMailBuilder; use Friendica\Test\Util\VFSTrait; use Friendica\Util\EMailer\MailBuilder; @@ -23,7 +23,7 @@ use Psr\Log\NullLogger; * This class tests the "MailBuilder" (@see MailBuilder ) * Since it's an abstract class and every extended class of it has dependencies, we use a "SampleMailBuilder" (@see SampleMailBuilder ) to make this class work */ -class MailBuilderTest extends MockedTest +class MailBuilderTest extends MockedTestCase { use VFSTrait; diff --git a/tests/src/Util/Emailer/SystemMailBuilderTest.php b/tests/src/Util/Emailer/SystemMailBuilderTest.php index 380c8f523a..400f6b66c2 100644 --- a/tests/src/Util/Emailer/SystemMailBuilderTest.php +++ b/tests/src/Util/Emailer/SystemMailBuilderTest.php @@ -10,13 +10,13 @@ namespace Friendica\Test\src\Util\Emailer; use Friendica\App\BaseURL; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Test\Util\VFSTrait; use Friendica\Util\EMailer\MailBuilder; use Friendica\Util\EMailer\SystemMailBuilder; use Psr\Log\NullLogger; -class SystemMailBuilderTest extends MockedTest +class SystemMailBuilderTest extends MockedTestCase { use VFSTrait; diff --git a/tests/src/Util/HTTPInputDataTest.php b/tests/src/Util/HTTPInputDataTest.php index cff535e99d..680f24ae2e 100644 --- a/tests/src/Util/HTTPInputDataTest.php +++ b/tests/src/Util/HTTPInputDataTest.php @@ -7,16 +7,15 @@ namespace Friendica\Test\src\Util; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Test\Util\HTTPInputDataDouble; -use Friendica\Util\HTTPInputData; /** * Testing HTTPInputData * * @see HTTPInputData */ -class HTTPInputDataTest extends MockedTest +class HTTPInputDataTest extends MockedTestCase { /** * Returns the data stream for the unit test diff --git a/tests/src/Util/ImagesTest.php b/tests/src/Util/ImagesTest.php index de8d317da6..b8449d3495 100644 --- a/tests/src/Util/ImagesTest.php +++ b/tests/src/Util/ImagesTest.php @@ -9,12 +9,12 @@ namespace Friendica\Test\src\Util; use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use Friendica\Test\DiceHttpMockHandlerTrait; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\Images; use GuzzleHttp\Handler\MockHandler; use GuzzleHttp\Psr7\Response; -class ImagesTest extends MockedTest +class ImagesTest extends MockedTestCase { use DiceHttpMockHandlerTrait; use ArraySubsetAsserts; diff --git a/tests/src/Util/ProfilerTest.php b/tests/src/Util/ProfilerTest.php index 26870e1ea7..6e190175cb 100644 --- a/tests/src/Util/ProfilerTest.php +++ b/tests/src/Util/ProfilerTest.php @@ -8,12 +8,12 @@ namespace Friendica\Test\src\Util; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\Profiler; use Mockery\MockInterface; use Psr\Log\LoggerInterface; -class ProfilerTest extends MockedTest +class ProfilerTest extends MockedTestCase { /** * @var LoggerInterface|MockInterface diff --git a/tests/src/Util/Router/FriendicaGroupCountBasedTest.php b/tests/src/Util/Router/FriendicaGroupCountBasedTest.php index 27494d1191..d2440268d5 100644 --- a/tests/src/Util/Router/FriendicaGroupCountBasedTest.php +++ b/tests/src/Util/Router/FriendicaGroupCountBasedTest.php @@ -11,10 +11,10 @@ use FastRoute\DataGenerator\GroupCountBased; use FastRoute\RouteCollector; use FastRoute\RouteParser\Std; use Friendica\Module\Special\Options; -use Friendica\Test\MockedTest; +use Friendica\Test\MockedTestCase; use Friendica\Util\Router\FriendicaGroupCountBased; -class FriendicaGroupCountBasedTest extends MockedTest +class FriendicaGroupCountBasedTest extends MockedTestCase { public function testOptions() {