rename FixtureTest to FixtureTestCase

diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php
deleted file mode 100644 (file)
index 411662e..0000000
--- a/tests/FixtureTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-// Copyright (C) 2010-2024, the Friendica project
-// SPDX-FileCopyrightText: 2010-2024 the Friendica project
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-namespace Friendica\Test;
-
-/**
- * Parent class for test cases requiring fixtures
- */
-abstract class FixtureTest extends MockedTestCase
-{
-       use FixtureTestTrait;
-
-       protected function setUp(): void
-       {
-               parent::setUp();
-
-               $this->setUpFixtures();
-       }
-
-       protected function tearDown(): void
-       {
-               $this->tearDownFixtures();
-
-               parent::tearDown();
-       }
-}

diff --git a/tests/FixtureTestCase.php b/tests/FixtureTestCase.php
new file mode 100644 (file)
index 0000000..5fa751c
--- /dev/null
+++ b/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();
+       }
+}

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index 55412045ae7349080af5a478e1794fb52e60c25b..866380fbdf0849923dfc3f0afa58c6e42cf0bd25 100644 (file)
--- 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 077875def226530c940982d2da8f09ac420eea94..441176fd731c9a44450b40b551d4fefb45cf3eee 100644 (file)
--- 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 0c55c97c7710f0f4de2994ec160361d63f5d705c..6d6c6107623d75c91c83f67fcea2250aaae03fb0 100644 (file)
--- 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 125f012e5096bab7333e578381b2c49547664fef..374f74111f2763d33bbdb24adc54fdcc8a1a075c 100644 (file)
--- 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 c6a774ba4ff033787bf676ddb6534ed257ec56b2..6882bec7f130ba06f73861b77141d6f8ec527397 100644 (file)
--- 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 5c5877ac75c52090057db06d3972a828d4e5266d..814e842c72f7eaf50f66da3bf52cd58c966136d2 100644 (file)
--- 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 11e2c9df7460d76de039274450aa633848fef4a0..49d791ac77263189816580b60a6ed4972c58111a 100644 (file)
--- 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 46942393dd4db5733b2cf07d439f69f9ae6c1788..65efe3e14e1f3dc708beb65721db0a24feeea17a 100644 (file)
--- 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 98659b3ce0f6c22dac24dc82fe4b87e45548d2ea..eb31556e74105230e5e17962e01969ffc8c0b0a9 100644 (file)
--- 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 ef83e46394611891f7cdfabbde6f57d0f6574d0c..c889d6d7d157166395159f15a9eeebc1485d9cb8 100644 (file)
--- 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 0221ba9de11490992a2ab54b590b1b58d6f5e551..24dba047e613ede9e25af0ff584dff274018b87d 100644 (file)
--- 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 c793bef7d18520ecb7ae36eb9758e5cb658f712a..314195bb5a3dd7766fb4d827663f1557907b7bbc 100644 (file)
--- 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 825afe840c6ebd16c04854ee95474bc217c83dfc..a00f1d7e94ab0c54631df6494261f2dec02f0b4b 100644 (file)
--- 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 9399bf6106e8270ef5e5c145eaa641e52436f5b5..8cb54657f32af4d90a0611cc02570ce5d0116bd2 100644 (file)
--- 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 c92b08f24364089a35cdedda9a8bc32a2c13f85e..847fbc2d2272915bff5475ef8a6e8c4b24f90a10 100644 (file)
--- 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 4203839834b46afeba5cecf5632d8f963a45432b..a4532afc36e7a6290e3634921db5e7ecca4512db 100644 (file)
--- 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 16763f1d521be16ca4682a162aeb831a77ff78f7..dd73e983d1771a42a5a7b48517395c942a6691b9 100644 (file)
--- 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 3f4c463c5b80a41cc0b20ee0b37494f7e0473cf8..bdb5b96d3cce52b5146b62b4e7d84065f6b4b4dd 100644 (file)
--- 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 c0f23a6f1535349ecdbc89a5fe090d5221139321..21af637508610e8b82740ff018af4575f5c7ab08 100644 (file)
--- 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 4a8ced54584018169b1c4dd3fd6dd78225a75ba8..eb6e40e08adab016fded92929549628bed5e8b2f 100644 (file)
--- 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 a1017fd5adcdb1cff6c9f2eb6ffe2c106bffcdd6..ff88e36b90062290558fbaf87c52c8959dc2a430 100644 (file)
--- 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 b9eb50063e268242addcc954a90e3e7835bf1d84..2f5ab7bce863f799a68fdf36b42407c7d8b6c940 100644 (file)
--- 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 40146fe92690055a992e11addc877f00822721b5..8b71aa130bde72f4895c5b259a93a3c76112113b 100644 (file)
--- 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 522f106a9fcdc7301d0215c5d774eb455e915367..d92789668df63b0c1f4ac5531b7beba73714d14b 100644 (file)
--- 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;