[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/+/80457 Tested-by: core-ci <[email protected]> Tested-by: Christian Kuhn <[email protected]> Reviewed-by: Christian Kuhn <[email protected]>
TYPO3 · Aug 8, 2023 · 0a06b14 · 0a06b14
1 parent 94bc630
commit 0a06b14
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/...tbase/Tests/Fixture/IntegerBackedEnum.php → ...l/Property/Fixtures/IntegerBackedEnum.php b/...tbase/Tests/Fixture/IntegerBackedEnum.php → ...l/Property/Fixtures/IntegerBackedEnum.php
@@ -15,7 +15,7 @@
  * 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/...xtbase/Tests/Fixture/StringBackedEnum.php → ...al/Property/Fixtures/StringBackedEnum.php b/...xtbase/Tests/Fixture/StringBackedEnum.php → ...al/Property/Fixtures/StringBackedEnum.php
@@ -15,7 +15,7 @@
  * 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/...xt/extbase/Tests/Fixture/UnbackedEnum.php → ...tional/Property/Fixtures/UnbackedEnum.php b/...xt/extbase/Tests/Fixture/UnbackedEnum.php → ...tional/Property/Fixtures/UnbackedEnum.php
@@ -15,7 +15,7 @@
  * 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
@@ -18,9 +18,9 @@
 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/...3/sysext/extbase/Tests/Fixture/Entity.php → ...Functional/Validation/Fixtures/Entity.php b/...3/sysext/extbase/Tests/Fixture/Entity.php → ...Functional/Validation/Fixtures/Entity.php
@@ -15,7 +15,7 @@
  * 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
@@ -23,7 +23,7 @@
 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
@@ -18,8 +18,8 @@
 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 @@ public function varDumpShowsDumpOfClosureWithDummyClassParameterType(): void
         $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/...sext/extbase/Tests/Fixture/DummyClass.php → ...ests/Unit/Utility/Fixtures/DummyClass.php b/...sext/extbase/Tests/Fixture/DummyClass.php → ...ests/Unit/Utility/Fixtures/DummyClass.php
@@ -15,7 +15,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Extbase\Tests\Fixture;
+namespace TYPO3\CMS\Extbase\Tests\Unit\Utility\Fixtures;
 
 /**
  * Dummy Class