From 7a10ceaf1031447d520140bf9ef6e8ca3d7a819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Venne?= <venne@schaffrath-digital.de>
Date: Tue, 8 Aug 2023 11:35:44 +0200
Subject: [PATCH] [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: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
---
.../Property/Fixtures}/IntegerBackedEnum.php | 2 +-
.../Property/Fixtures}/StringBackedEnum.php | 2 +-
.../Property/Fixtures}/UnbackedEnum.php | 2 +-
.../Functional/Property/TypeConverter/EnumConverterTest.php | 6 +++---
.../{Fixture => Functional/Validation/Fixtures}/Entity.php | 2 +-
.../Validation/Validator/CollectionValidatorTest.php | 2 +-
.../extbase/Tests/Unit/Utility/DebuggerUtilityTest.php | 4 ++--
.../Tests/{Fixture => Unit/Utility/Fixtures}/DummyClass.php | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
rename typo3/sysext/extbase/Tests/{Fixture => Functional/Property/Fixtures}/IntegerBackedEnum.php (89%)
rename typo3/sysext/extbase/Tests/{Fixture => Functional/Property/Fixtures}/StringBackedEnum.php (90%)
rename typo3/sysext/extbase/Tests/{Fixture => Functional/Property/Fixtures}/UnbackedEnum.php (89%)
rename typo3/sysext/extbase/Tests/{Fixture => Functional/Validation/Fixtures}/Entity.php (94%)
rename typo3/sysext/extbase/Tests/{Fixture => Unit/Utility/Fixtures}/DummyClass.php (90%)
diff --git a/typo3/sysext/extbase/Tests/Fixture/IntegerBackedEnum.php b/typo3/sysext/extbase/Tests/Functional/Property/Fixtures/IntegerBackedEnum.php
similarity index 89%
rename from typo3/sysext/extbase/Tests/Fixture/IntegerBackedEnum.php
rename to typo3/sysext/extbase/Tests/Functional/Property/Fixtures/IntegerBackedEnum.php
index a7e0a385719c..bd0bc7e121a6 100644
--- a/typo3/sysext/extbase/Tests/Fixture/IntegerBackedEnum.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/Fixtures/IntegerBackedEnum.php
@@ -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
{
diff --git a/typo3/sysext/extbase/Tests/Fixture/StringBackedEnum.php b/typo3/sysext/extbase/Tests/Functional/Property/Fixtures/StringBackedEnum.php
similarity index 90%
rename from typo3/sysext/extbase/Tests/Fixture/StringBackedEnum.php
rename to typo3/sysext/extbase/Tests/Functional/Property/Fixtures/StringBackedEnum.php
index 49c417852e36..bfbba5883d0f 100644
--- a/typo3/sysext/extbase/Tests/Fixture/StringBackedEnum.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/Fixtures/StringBackedEnum.php
@@ -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
{
diff --git a/typo3/sysext/extbase/Tests/Fixture/UnbackedEnum.php b/typo3/sysext/extbase/Tests/Functional/Property/Fixtures/UnbackedEnum.php
similarity index 89%
rename from typo3/sysext/extbase/Tests/Fixture/UnbackedEnum.php
rename to typo3/sysext/extbase/Tests/Functional/Property/Fixtures/UnbackedEnum.php
index 59eacfe56eb8..140e6a4bdff0 100644
--- a/typo3/sysext/extbase/Tests/Fixture/UnbackedEnum.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/Fixtures/UnbackedEnum.php
@@ -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
{
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/EnumConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/EnumConverterTest.php
index 0ae25595ab21..032fa2613a79 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/EnumConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/EnumConverterTest.php
@@ -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
diff --git a/typo3/sysext/extbase/Tests/Fixture/Entity.php b/typo3/sysext/extbase/Tests/Functional/Validation/Fixtures/Entity.php
similarity index 94%
rename from typo3/sysext/extbase/Tests/Fixture/Entity.php
rename to typo3/sysext/extbase/Tests/Functional/Validation/Fixtures/Entity.php
index 4a4c8fbb1d8e..7fc862a39b3f 100644
--- a/typo3/sysext/extbase/Tests/Fixture/Entity.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Fixtures/Entity.php
@@ -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;
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
index dc895320b220..7c4ea30bf5b2 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
@@ -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;
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
index ed33303ae30b..d4bb1ab12774 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
@@ -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);
}
/**
diff --git a/typo3/sysext/extbase/Tests/Fixture/DummyClass.php b/typo3/sysext/extbase/Tests/Unit/Utility/Fixtures/DummyClass.php
similarity index 90%
rename from typo3/sysext/extbase/Tests/Fixture/DummyClass.php
rename to typo3/sysext/extbase/Tests/Unit/Utility/Fixtures/DummyClass.php
index c36f7aba3268..bd9e1ad68fdd 100644
--- a/typo3/sysext/extbase/Tests/Fixture/DummyClass.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/Fixtures/DummyClass.php
@@ -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
--
GitLab