Rename MockedTest to MockedTestCase

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 4510a48034286d002537d4fcd4975d10b7e7b344..af6e45226accc547d4596f51ec08d64d27180602 100644 (file)
--- 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 2b4bcc13291819f1947c58d9c7c4526e0300cff6..411662e0cb0d6df8af60704251c28f21148a8768 100644 (file)
--- 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/MockedTest.php
deleted file mode 100644 (file)
index 14328f8..0000000
--- a/tests/MockedTest.php
+++ /dev/null
@@ -1,23 +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 PHPUnit\Framework\TestCase;
-
-/**
- * This class verifies each mock after each call
- */
-abstract class MockedTest extends TestCase
-{
-       protected function tearDown() : void
-       {
-               \Mockery::close();
-
-               parent::tearDown();
-       }
-}

diff --git a/tests/MockedTestCase.php b/tests/MockedTestCase.php
new file mode 100644 (file)
index 0000000..3fbb1b9
--- /dev/null
+++ b/tests/MockedTestCase.php
@@ -0,0 +1,23 @@
+<?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 PHPUnit\Framework\TestCase;
+
+/**
+ * This class verifies each mock after each call
+ */
+abstract class MockedTestCase extends TestCase
+{
+       protected function tearDown() : void
+       {
+               \Mockery::close();
+
+               parent::tearDown();
+       }
+}

diff --git a/tests/src/App/BaseURLTest.php b/tests/src/App/BaseURLTest.php
index 1e6c799f321496e6dae92c0468948b575d158fc5..9c3333feff2b812016a3a47b2c078d45e278b53e 100644 (file)
--- 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 6b8377588352bb5844de2950934366c43671f619..b1ddca1d33e8e4cb8c1cbb025d2fc6057138dcc7 100644 (file)
--- 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 77d77c3ba93235289c7bbda60bad39f41c9a4765..648d2b63861b5a03d0d41d44622ab3c3690d3fad 100644 (file)
--- 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 257ec0e10760808ed526dbec4fc586fa07cd7a71..f82bb5dfeaeb682549d54e3400abb79a2a875c19 100644 (file)
--- 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 88c80d7bc6fde8e20508569eeebe7e2a1b135aa1..5384076c7332f97986e474d2f9284c4e38aa62b4 100644 (file)
--- 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 67275abe3537e681caaf3631295cd7ca0f9da67a..dd4102d0aba2a5f5dda5fa030150954e6f57d46f 100644 (file)
--- 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 a2e14ce061d8c5776c968869e7234dfbfb883f96..c2adbccb15a136df618868c2a1505a33ed44e0d0 100644 (file)
--- 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 21b4d5068d991e9870239b63e8d93fbbe66714a7..a2b4188d38804432b8bb9fb49c8438fdef544dd2 100644 (file)
--- 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 6c052230a637483cb224f934cf5e9078a1637aeb..1c119fb680ae9ea9e12af651b6da81e736504daf 100644 (file)
--- 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 10cade17d98914fc4eef96534731c725ead4a9a9..47c5a7ccca735f41ee77579cfb5dd655528e029c 100644 (file)
--- 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 f539dc045ca22e95d7485a993db6296169b59392..fddf621bd0da333ec6641320b0e8cf431f4e316e 100644 (file)
--- 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 3f49e8c8eb2bfc59cd2d0e069f25e861bc5ec307..e5b1fc623dd6fce05d46f98f44673cd11b49ef8a 100644 (file)
--- 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 4d38265ebf6b09b4db2076599bf938f9d3eae5b5..ef22218945c833bda967d64eaccca7454bf9d56a 100644 (file)
--- 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 5fb0927d6888a05a281a4ce24dbd4f18c1f6f2b2..633b636701ad8ce3998012ef583d9133ecd555b6 100644 (file)
--- 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 a97c7d36c949feebf4de2991ceb0fbf85c309bf2..2f5873dfe61a7246bdfdff631db619167da4f153 100644 (file)
--- 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 6d1f6ad3281d24c5fb0e14a284cd05f75d158adf..123be61e1226e8e01d545f33505140adc398daa9 100644 (file)
--- 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 cf61b2dd48e65a28c17541dd0814ee6b47366940..01dc301d787bf3485f33ef45f3c465a417834f3c 100644 (file)
--- 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 4c8583523a8e9861ba7ebf51defb130f1e89284e..c32f50e2f61893b086874968c20a3146b851eb60 100644 (file)
--- 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 a155239a8d250423bd02815e000cfd87436ad48f..b1a793d41ff674e3f10fa081b24a6311bdfc009d 100644 (file)
--- 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 b6dd4c4132fbc76665396b3d8ed13bb54aa0ff69..9ae1d5b3efab71cfa8224d1644a7f981b7eb109f 100644 (file)
--- 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 d40cf82f099bf9f16b7610a03ee75bb642d91dc2..ab3e41d9d1dc276e57c50b2d8bdcb1d34c5a339e 100644 (file)
--- 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 50b2b3f205e2739ba2e561e3da9f94e251c719d4..a4d968730b22127d91c86af1e3f69283375a41f1 100644 (file)
--- 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 6c2beb006806dbbe385e6666d1fc7cbc96b16306..944f7e5ade778b34a68e1a38c5dc30fa705f4743 100644 (file)
--- 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 d7db99fa81ee4525a36d8b08c057867411b3d826..64c7d8b95038c61f149c9aebf23b8d4605376535 100644 (file)
--- 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 23cc54df9057ead76d7f9b8b8782e20dd8e7e466..78a5e396f6fa408244fb3d0ad132278a791b972e 100644 (file)
--- 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 10114c2dd9d9ee7e9310a0d8035146c76c837fe6..9816db914c13520f6581dc964824110e77a40d6b 100644 (file)
--- 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 e6b09e6a7459eb81dbe48ad73d3c1f35593bd661..d063399b13332465e67f0ab82b1b59fa33d1f0cd 100644 (file)
--- 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 3d93e1fa3711b446dc8c500b18b35f40bea0e90b..3c56a89668a0a5bcc0a96b27e3a21d3da4a256c6 100644 (file)
--- 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 3bdd6c403e7c0382392c9f95d8092265e50c5d73..f58f34995ffa71c94656add65a57bc4285c9d285 100644 (file)
--- 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 46b9275d83de05bd469d1958035883eb27579069..d488648e925715facf8627ea056236ac5ef17a1c 100644 (file)
--- 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 2133ab487c1251d280b34daf855fda1292b79211..23cc4bf702d153ccc32497a5e4199fe8046a9f2d 100644 (file)
--- 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 9a488f0d1e45b861c4c20dd2699e087c4fddaa77..bd15a7120dcfc4cacd548eb5e43c586c3734054f 100644 (file)
--- 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 d5698e33bfdbc95c8d49ca7b0f2a005021dbe41f..653cc0ca620982728a6c1e3e1c82929985692077 100644 (file)
--- 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 b8e53094218bdb2a9a28b9ce5c80c98afb724364..e718eebf0785d74245c006e28f878fc80473d4ea 100644 (file)
--- 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 59a650ea1613d5fb23845a6e3c68deb53b6d805f..30359321cf524b4d6f1a0f69f0282cac5af75c8f 100644 (file)
--- 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 4ed62f2fc42f0aa81630a160a87d6136469ef886..bb456d0445d8f7408ccdf0db98a4a7649f1c9444 100644 (file)
--- 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 8b4410217ed3c8170d79b51b9ad41e07c98b5ad1..25ff93cbbd09054ebf9ca3851ec31f34e7941ac0 100644 (file)
--- 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 b03d14ca81845421516f88f26bfaffab0c6cb8bf..fdf27223671d7766f6a0a954001df7509ccf3db0 100644 (file)
--- 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 486fca2c0fc0d37a0581e60ba108c20f49db3c3d..08f12f562ace0f7fa26141446243d4d7a960b42f 100644 (file)
--- 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 6e6eb58906d8f9eba643aa213aa316f4b9c9e111..bbcaeb359b4d29150c56bb3428e4b1d9c296a6da 100644 (file)
--- 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 5f5e1485fc06546340b0b0c8a196c5c4b59ef42c..9137659ba83ceb28a092cc8b3aca4761b3fdccd9 100644 (file)
--- 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 5a892597f4b6111335bf29e4787b728e0a4ae6af..21c7fbabc259d97dd1d811ef64aa25bf13ad195b 100644 (file)
--- 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 0c432e8930124f06a214293f4a3e6d9bf7909916..36095a5d601016512b4184a6c630d6eaa533f69f 100644 (file)
--- 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 380c8f523a0424e8b6e400ca22f7623a38b8d2f8..400f6b66c2f089710f4e8a3e50f0627a2adc0f7e 100644 (file)
--- 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 cff535e99d185f504b7c68a6852985d48d3c986c..680f24ae2e04b4fe62d048a47e6290581f044ee6 100644 (file)
--- 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 de8d317da6350a95141e699373412e6f3eed62ab..b8449d34951a7bc96fed395ef2455049ad160d59 100644 (file)
--- 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 26870e1ea70a7285c4f031980424ce815e385c9f..6e190175cb01a726dd3f6cb3d6c0a07912db6138 100644 (file)
--- 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 27494d119180136d68075cf6b9c8037fc08e0135..d2440268d59cd71aff83070fd71c12922d6cce75 100644 (file)
--- 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()
        {