diff --git a/tests/FixtureTest.php b/tests/FixtureTestCase.php similarity index 89% rename from tests/FixtureTest.php rename to tests/FixtureTestCase.php index 411662e0cb..5fa751c871 100644 --- a/tests/FixtureTest.php +++ b/tests/FixtureTestCase.php @@ -10,7 +10,7 @@ namespace Friendica\Test; /** * Parent class for test cases requiring fixtures */ -abstract class FixtureTest extends MockedTestCase +abstract class FixtureTestCase extends MockedTestCase { use FixtureTestTrait; diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php index 55412045ae..866380fbdf 100644 --- a/tests/functional/DependencyCheckTest.php +++ b/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 { diff --git a/tests/src/Content/SmiliesTest.php b/tests/src/Content/SmiliesTest.php index 077875def2..441176fd73 100644 --- a/tests/src/Content/SmiliesTest.php +++ b/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 { diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php index 0c55c97c77..6d6c610762 100644 --- a/tests/src/Content/Text/BBCodeTest.php +++ b/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; diff --git a/tests/src/Content/Text/HTMLTest.php b/tests/src/Content/Text/HTMLTest.php index 125f012e50..374f74111f 100644 --- a/tests/src/Content/Text/HTMLTest.php +++ b/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() { diff --git a/tests/src/Content/Text/MarkdownTest.php b/tests/src/Content/Text/MarkdownTest.php index c6a774ba4f..6882bec7f1 100644 --- a/tests/src/Content/Text/MarkdownTest.php +++ b/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() { diff --git a/tests/src/Content/Text/PlaintextTest.php b/tests/src/Content/Text/PlaintextTest.php index 5c5877ac75..814e842c72 100644 --- a/tests/src/Content/Text/PlaintextTest.php +++ b/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 { diff --git a/tests/src/Core/ACLTest.php b/tests/src/Core/ACLTest.php index 11e2c9df74..49d791ac77 100644 --- a/tests/src/Core/ACLTest.php +++ b/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. diff --git a/tests/src/Core/Config/ConfigTransactionTest.php b/tests/src/Core/Config/ConfigTransactionTest.php index 46942393dd..65efe3e14e 100644 --- a/tests/src/Core/Config/ConfigTransactionTest.php +++ b/tests/src/Core/Config/ConfigTransactionTest.php @@ -15,13 +15,13 @@ use Friendica\Core\Config\Util\ConfigFileManager; use Friendica\Core\Config\ValueObject\Cache; use Friendica\Database\Database; use Friendica\Test\DatabaseTest; -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; diff --git a/tests/src/Core/Worker/Repository/ProcessTest.php b/tests/src/Core/Worker/Repository/ProcessTest.php index 98659b3ce0..eb31556e74 100644 --- a/tests/src/Core/Worker/Repository/ProcessTest.php +++ b/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() { diff --git a/tests/src/Database/DatabaseTest.php b/tests/src/Database/DatabaseTest.php index ef83e46394..c889d6d7d1 100644 --- a/tests/src/Database/DatabaseTest.php +++ b/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; diff --git a/tests/src/Factory/Api/Mastodon/EmojiTest.php b/tests/src/Factory/Api/Mastodon/EmojiTest.php index 0221ba9de1..24dba047e6 100644 --- a/tests/src/Factory/Api/Mastodon/EmojiTest.php +++ b/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 { diff --git a/tests/src/Factory/Api/Mastodon/StatusTest.php b/tests/src/Factory/Api/Mastodon/StatusTest.php index c793bef7d1..314195bb5a 100644 --- a/tests/src/Factory/Api/Mastodon/StatusTest.php +++ b/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; diff --git a/tests/src/Factory/Api/Twitter/ActivitiesTest.php b/tests/src/Factory/Api/Twitter/ActivitiesTest.php index 825afe840c..a00f1d7e94 100644 --- a/tests/src/Factory/Api/Twitter/ActivitiesTest.php +++ b/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. diff --git a/tests/src/Factory/Api/Twitter/DirectMessageTest.php b/tests/src/Factory/Api/Twitter/DirectMessageTest.php index 9399bf6106..8cb54657f3 100644 --- a/tests/src/Factory/Api/Twitter/DirectMessageTest.php +++ b/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\FixtureTestCase; use Friendica\Test\src\Module\Api\ApiTest; -class DirectMessageTest extends FixtureTest +class DirectMessageTest extends FixtureTestCase { /** * Test the api_format_messages() function. diff --git a/tests/src/Factory/Api/Twitter/StatusTest.php b/tests/src/Factory/Api/Twitter/StatusTest.php index c92b08f243..847fbc2d22 100644 --- a/tests/src/Factory/Api/Twitter/StatusTest.php +++ b/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\FixtureTestCase; use Friendica\Test\src\Module\Api\ApiTest; -class StatusTest extends FixtureTest +class StatusTest extends FixtureTestCase { protected $statusFactory; diff --git a/tests/src/Factory/Api/Twitter/UserTest.php b/tests/src/Factory/Api/Twitter/UserTest.php index 4203839834..a4532afc36 100644 --- a/tests/src/Factory/Api/Twitter/UserTest.php +++ b/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\FixtureTestCase; use Friendica\Test\src\Module\Api\ApiTest; -class UserTest extends FixtureTest +class UserTest extends FixtureTestCase { /** * Assert that an user array contains expected keys. diff --git a/tests/src/Module/Api/ApiTest.php b/tests/src/Module/Api/ApiTest.php index 16763f1d52..dd73e983d1 100644 --- a/tests/src/Module/Api/ApiTest.php +++ b/tests/src/Module/Api/ApiTest.php @@ -17,14 +17,14 @@ use Friendica\DI; use Friendica\Module\Special\HTTPException; use Friendica\Security\Authentication; use Friendica\Security\BasicAuth; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; 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 ApiTest extends FixtureTestCase { // User data that the test database is populated with const SELF_USER = [ diff --git a/tests/src/Module/Api/Twitter/ContactEndpointTest.php b/tests/src/Module/Api/Twitter/ContactEndpointTest.php index 3f4c463c5b..bdb5b96d3c 100644 --- a/tests/src/Module/Api/Twitter/ContactEndpointTest.php +++ b/tests/src/Module/Api/Twitter/ContactEndpointTest.php @@ -12,9 +12,9 @@ use Friendica\Module\Api\Twitter\ContactEndpoint; use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\NotFoundException; use Friendica\Object\Api\Twitter\User; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; -class ContactEndpointTest extends FixtureTest +class ContactEndpointTest extends FixtureTestCase { public function testIds() { diff --git a/tests/src/Module/NodeInfoTest.php b/tests/src/Module/NodeInfoTest.php index c0f23a6f15..21af637508 100644 --- a/tests/src/Module/NodeInfoTest.php +++ b/tests/src/Module/NodeInfoTest.php @@ -14,10 +14,10 @@ use Friendica\Module\NodeInfo110; use Friendica\Module\NodeInfo120; use Friendica\Module\NodeInfo210; use Friendica\Module\Special\HTTPException; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; use Mockery\MockInterface; -class NodeInfoTest extends FixtureTest +class NodeInfoTest extends FixtureTestCase { /** @var MockInterface|HTTPException */ protected $httpExceptionMock; diff --git a/tests/src/Module/Special/OptionsTest.php b/tests/src/Module/Special/OptionsTest.php index 4a8ced5458..eb6e40e08a 100644 --- a/tests/src/Module/Special/OptionsTest.php +++ b/tests/src/Module/Special/OptionsTest.php @@ -12,10 +12,10 @@ use Friendica\Capabilities\ICanCreateResponses; use Friendica\DI; use Friendica\Module\Special\HTTPException; use Friendica\Module\Special\Options; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; use Mockery\MockInterface; -class OptionsTest extends FixtureTest +class OptionsTest extends FixtureTestCase { /** @var MockInterface|HTTPException */ protected $httpExceptionMock; diff --git a/tests/src/Navigation/Notifications/Entity/NotifyTest.php b/tests/src/Navigation/Notifications/Entity/NotifyTest.php index a1017fd5ad..ff88e36b90 100644 --- a/tests/src/Navigation/Notifications/Entity/NotifyTest.php +++ b/tests/src/Navigation/Notifications/Entity/NotifyTest.php @@ -8,9 +8,9 @@ namespace Friendica\Test\src\Navigation\Notifications\Entity; use Friendica\Navigation\Notifications\Entity\Notify; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; -class NotifyTest extends FixtureTest +class NotifyTest extends FixtureTestCase { public function dataFormatNotify(): array { diff --git a/tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php b/tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php index b9eb50063e..2f5ab7bce8 100644 --- a/tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php +++ b/tests/src/Profile/ProfileField/Repository/ProfileFieldTest.php @@ -14,10 +14,10 @@ use Friendica\Profile\ProfileField\Factory\ProfileField as ProfileFieldFactory; use Friendica\Security\PermissionSet\Repository\PermissionSet; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; use Friendica\DI; -class ProfileFieldTest extends FixtureTest +class ProfileFieldTest extends FixtureTestCase { /** @var ProfileFieldRepository */ private $depository; diff --git a/tests/src/Protocol/ActivityPub/TransmitterTest.php b/tests/src/Protocol/ActivityPub/TransmitterTest.php index 40146fe926..8b71aa130b 100644 --- a/tests/src/Protocol/ActivityPub/TransmitterTest.php +++ b/tests/src/Protocol/ActivityPub/TransmitterTest.php @@ -11,9 +11,9 @@ use Friendica\Core\Hook; use Friendica\DI; use Friendica\Model\Post; use Friendica\Protocol\ActivityPub\Transmitter; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; -class TransmitterTest extends FixtureTest +class TransmitterTest extends FixtureTestCase { protected function setUp(): void { diff --git a/tests/src/Security/PermissionSet/Repository/PermissionSetTest.php b/tests/src/Security/PermissionSet/Repository/PermissionSetTest.php index 522f106a9f..d92789668d 100644 --- a/tests/src/Security/PermissionSet/Repository/PermissionSetTest.php +++ b/tests/src/Security/PermissionSet/Repository/PermissionSetTest.php @@ -13,10 +13,10 @@ use Friendica\Security\PermissionSet\Exception\PermissionSetNotFoundException; use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository; use Friendica\Security\PermissionSet\Entity\PermissionSet; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; -use Friendica\Test\FixtureTest; +use Friendica\Test\FixtureTestCase; use Friendica\DI; -class PermissionSetTest extends FixtureTest +class PermissionSetTest extends FixtureTestCase { /** @var PermissionSetRepository */ private $repository;