From ce1f7c587a274c4e8006c7643d2a26bb53e0a1d3 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Thu, 3 Oct 2024 10:56:58 +0200 Subject: [PATCH] [TASK] Move the XClass tests to functional tests (#711) --- .../Model/Fixtures/XclassFrontendUser.php | 2 +- .../Fixtures/XclassFrontendUserGroup.php | 2 +- .../Domain/Model/FrontendUserGroupTest.php | 35 +++++++++++++++++++ .../Domain/Model/FrontendUserTest.php | 35 +++++++++++++++++++ .../Domain/Model/FrontendUserGroupTest.php | 26 -------------- Tests/Unit/Domain/Model/FrontendUserTest.php | 26 -------------- 6 files changed, 72 insertions(+), 54 deletions(-) rename Tests/{Unit => Functional}/Domain/Model/Fixtures/XclassFrontendUser.php (65%) rename Tests/{Unit => Functional}/Domain/Model/Fixtures/XclassFrontendUserGroup.php (67%) create mode 100644 Tests/Functional/Domain/Model/FrontendUserGroupTest.php create mode 100644 Tests/Functional/Domain/Model/FrontendUserTest.php diff --git a/Tests/Unit/Domain/Model/Fixtures/XclassFrontendUser.php b/Tests/Functional/Domain/Model/Fixtures/XclassFrontendUser.php similarity index 65% rename from Tests/Unit/Domain/Model/Fixtures/XclassFrontendUser.php rename to Tests/Functional/Domain/Model/Fixtures/XclassFrontendUser.php index 0933342..34b6f98 100644 --- a/Tests/Unit/Domain/Model/Fixtures/XclassFrontendUser.php +++ b/Tests/Functional/Domain/Model/Fixtures/XclassFrontendUser.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace OliverKlee\FeUserExtraFields\Tests\Unit\Domain\Model\Fixtures; +namespace OliverKlee\FeUserExtraFields\Tests\Functional\Domain\Model\Fixtures; use OliverKlee\FeUserExtraFields\Domain\Model\FrontendUser; diff --git a/Tests/Unit/Domain/Model/Fixtures/XclassFrontendUserGroup.php b/Tests/Functional/Domain/Model/Fixtures/XclassFrontendUserGroup.php similarity index 67% rename from Tests/Unit/Domain/Model/Fixtures/XclassFrontendUserGroup.php rename to Tests/Functional/Domain/Model/Fixtures/XclassFrontendUserGroup.php index e126950..84bf515 100644 --- a/Tests/Unit/Domain/Model/Fixtures/XclassFrontendUserGroup.php +++ b/Tests/Functional/Domain/Model/Fixtures/XclassFrontendUserGroup.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace OliverKlee\FeUserExtraFields\Tests\Unit\Domain\Model\Fixtures; +namespace OliverKlee\FeUserExtraFields\Tests\Functional\Domain\Model\Fixtures; use OliverKlee\FeUserExtraFields\Domain\Model\FrontendUserGroup; diff --git a/Tests/Functional/Domain/Model/FrontendUserGroupTest.php b/Tests/Functional/Domain/Model/FrontendUserGroupTest.php new file mode 100644 index 0000000..00aa83e --- /dev/null +++ b/Tests/Functional/Domain/Model/FrontendUserGroupTest.php @@ -0,0 +1,35 @@ + XclassFrontendUserGroup::class]; + + $instance = GeneralUtility::makeInstance(FrontendUserGroup::class); + + self::assertInstanceOf(XclassFrontendUserGroup::class, $instance); + } +} diff --git a/Tests/Functional/Domain/Model/FrontendUserTest.php b/Tests/Functional/Domain/Model/FrontendUserTest.php new file mode 100644 index 0000000..c525781 --- /dev/null +++ b/Tests/Functional/Domain/Model/FrontendUserTest.php @@ -0,0 +1,35 @@ + XclassFrontendUser::class]; + + $instance = GeneralUtility::makeInstance(FrontendUser::class); + + self::assertInstanceOf(XclassFrontendUser::class, $instance); + } +} diff --git a/Tests/Unit/Domain/Model/FrontendUserGroupTest.php b/Tests/Unit/Domain/Model/FrontendUserGroupTest.php index 5c8260d..0df5a1d 100644 --- a/Tests/Unit/Domain/Model/FrontendUserGroupTest.php +++ b/Tests/Unit/Domain/Model/FrontendUserGroupTest.php @@ -5,8 +5,6 @@ namespace OliverKlee\FeUserExtraFields\Tests\Unit\Domain\Model; use OliverKlee\FeUserExtraFields\Domain\Model\FrontendUserGroup; -use OliverKlee\FeUserExtraFields\Tests\Unit\Domain\Model\Fixtures\XclassFrontendUserGroup; -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; use TYPO3\TestingFramework\Core\Unit\UnitTestCase; @@ -21,19 +19,10 @@ final class FrontendUserGroupTest extends UnitTestCase protected function setUp(): void { parent::setUp(); - GeneralUtility::flushInternalRuntimeCaches(); $this->subject = new FrontendUserGroup(); } - protected function tearDown(): void - { - // @phpstan-ignore offsetAccess.nonOffsetAccessible, offsetAccess.nonOffsetAccessible - unset($GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']); - GeneralUtility::flushInternalRuntimeCaches(); - parent::tearDown(); - } - /** * @test */ @@ -42,21 +31,6 @@ public function isAbstractEntity(): void self::assertInstanceOf(AbstractEntity::class, $this->subject); } - /** - * @test - */ - public function canBeSubclassed(): void - { - // @phpstan-ignore offsetAccess.nonOffsetAccessible, offsetAccess.nonOffsetAccessible - $xclassConfiguration = &$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']; - self::assertIsArray($xclassConfiguration); - $xclassConfiguration[FrontendUserGroup::class] = ['className' => XclassFrontendUserGroup::class]; - - $instance = GeneralUtility::makeInstance(FrontendUserGroup::class); - - self::assertInstanceOf(XclassFrontendUserGroup::class, $instance); - } - /** * @test */ diff --git a/Tests/Unit/Domain/Model/FrontendUserTest.php b/Tests/Unit/Domain/Model/FrontendUserTest.php index 954fdbe..ca32c86 100644 --- a/Tests/Unit/Domain/Model/FrontendUserTest.php +++ b/Tests/Unit/Domain/Model/FrontendUserTest.php @@ -6,8 +6,6 @@ use OliverKlee\FeUserExtraFields\Domain\Model\FrontendUser; use OliverKlee\FeUserExtraFields\Domain\Model\FrontendUserGroup; -use OliverKlee\FeUserExtraFields\Tests\Unit\Domain\Model\Fixtures\XclassFrontendUser; -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\DomainObject\AbstractEntity; use TYPO3\CMS\Extbase\Persistence\ObjectStorage; @@ -23,19 +21,10 @@ final class FrontendUserTest extends UnitTestCase protected function setUp(): void { parent::setUp(); - GeneralUtility::flushInternalRuntimeCaches(); $this->subject = new FrontendUser(); } - protected function tearDown(): void - { - // @phpstan-ignore offsetAccess.nonOffsetAccessible, offsetAccess.nonOffsetAccessible - unset($GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']); - GeneralUtility::flushInternalRuntimeCaches(); - parent::tearDown(); - } - /** * @test */ @@ -44,21 +33,6 @@ public function isAbstractEntity(): void self::assertInstanceOf(AbstractEntity::class, $this->subject); } - /** - * @test - */ - public function canBeSubclassed(): void - { - // @phpstan-ignore offsetAccess.nonOffsetAccessible, offsetAccess.nonOffsetAccessible - $xclassConfiguration = &$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']; - self::assertIsArray($xclassConfiguration); - $xclassConfiguration[FrontendUser::class] = ['className' => XclassFrontendUser::class]; - - $instance = GeneralUtility::makeInstance(FrontendUser::class); - - self::assertInstanceOf(XclassFrontendUser::class, $instance); - } - /** * @test */