Skip to content
Snippets Groups Projects
Commit 7a10ceaf authored by Jürgen Venne's avatar Jürgen Venne Committed by Christian Kuhn
Browse files

[BUGFIX] Move fixtures to associated test classes

The "global" extbase/Tests/Fixtures folder is
unfortunate: Fixtures should be located in more
dedicated folders and should not be shareable
between unit and functional tests.

The patch moves a couple of fixtures to more
dedicated locations to avoid confusion.

Resolves: #101530
Releases: main, 12.4
Change-Id: I3faad97ca05e7790da8443d615309da03ff91201
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80456


Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarOliver Klee <typo3-coding@oliverklee.de>
Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarOliver Klee <typo3-coding@oliverklee.de>
parent f502fa65
Branches
Tags
No related merge requests found
......@@ -15,7 +15,7 @@ declare(strict_types=1);
* The TYPO3 project - inspiring people to share!
*/
namespace TYPO3\CMS\Extbase\Tests\Fixture;
namespace TYPO3\CMS\Extbase\Tests\Functional\Property\Fixtures;
enum IntegerBackedEnum: int
{
......
......@@ -15,7 +15,7 @@ declare(strict_types=1);
* The TYPO3 project - inspiring people to share!
*/
namespace TYPO3\CMS\Extbase\Tests\Fixture;
namespace TYPO3\CMS\Extbase\Tests\Functional\Property\Fixtures;
enum StringBackedEnum: string
{
......
......@@ -15,7 +15,7 @@ declare(strict_types=1);
* The TYPO3 project - inspiring people to share!
*/
namespace TYPO3\CMS\Extbase\Tests\Fixture;
namespace TYPO3\CMS\Extbase\Tests\Functional\Property\Fixtures;
enum UnbackedEnum
{
......
......@@ -18,9 +18,9 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Functional\Property\TypeConverter;
use TYPO3\CMS\Extbase\Property\PropertyMapper;
use TYPO3\CMS\Extbase\Tests\Fixture\IntegerBackedEnum;
use TYPO3\CMS\Extbase\Tests\Fixture\StringBackedEnum;
use TYPO3\CMS\Extbase\Tests\Fixture\UnbackedEnum;
use TYPO3\CMS\Extbase\Tests\Functional\Property\Fixtures\IntegerBackedEnum;
use TYPO3\CMS\Extbase\Tests\Functional\Property\Fixtures\StringBackedEnum;
use TYPO3\CMS\Extbase\Tests\Functional\Property\Fixtures\UnbackedEnum;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
final class EnumConverterTest extends FunctionalTestCase
......
......@@ -15,7 +15,7 @@ declare(strict_types=1);
* The TYPO3 project - inspiring people to share!
*/
namespace TYPO3\CMS\Extbase\Tests\Fixture;
namespace TYPO3\CMS\Extbase\Tests\Functional\Validation\Fixtures;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
......
......@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Reflection\ReflectionService;
use TYPO3\CMS\Extbase\Tests\Fixture\Entity;
use TYPO3\CMS\Extbase\Tests\Functional\Validation\Fixtures\Entity;
use TYPO3\CMS\Extbase\Validation\Validator\AbstractGenericObjectValidator;
use TYPO3\CMS\Extbase\Validation\Validator\CollectionValidator;
use TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator;
......
......@@ -18,8 +18,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Utility;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Tests\Fixture\DummyClass;
use TYPO3\CMS\Extbase\Tests\Unit\Utility\Fixtures\DebuggerUtilityAccessibleProxy;
use TYPO3\CMS\Extbase\Tests\Unit\Utility\Fixtures\DummyClass;
use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
......@@ -154,7 +154,7 @@ final class DebuggerUtilityTest extends UnitTestCase
$closure = (static function (DummyClass $class) {});
$result = DebuggerUtility::var_dump($closure, null, 8, true, false, true, [\stdClass::class]);
self::assertStringContainsString('function (TYPO3\CMS\Extbase\Tests\Fixture\DummyClass $class)', $result);
self::assertStringContainsString('function (TYPO3\CMS\Extbase\Tests\Unit\Utility\Fixtures\DummyClass $class)', $result);
}
/**
......
......@@ -15,7 +15,7 @@ declare(strict_types=1);
* The TYPO3 project - inspiring people to share!
*/
namespace TYPO3\CMS\Extbase\Tests\Fixture;
namespace TYPO3\CMS\Extbase\Tests\Unit\Utility\Fixtures;
/**
* Dummy Class
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment