diff --git a/CHANGELOG.md b/CHANGELOG.md index f6174ba23..26c2bd920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Drop unused Composer scripts and add script descriptions (#2740) - Migrate the tests to the TYPO3 testing framework (#2701, #2702, #2713, #2717, #2731, #2732, #2733, #2734, #2735, #2737, #2739, - #2742, #2754, #2756, #2757, #2760, #2764, #2767) + #2742, #2754, #2756, #2757, #2760, #2764, #2767, #2768) ### Deprecated diff --git a/Tests/LegacyUnit/OldModel/AbstractModelTest.php b/Tests/LegacyFunctional/OldModel/AbstractModelTest.php similarity index 90% rename from Tests/LegacyUnit/OldModel/AbstractModelTest.php rename to Tests/LegacyFunctional/OldModel/AbstractModelTest.php index 856434333..ca6613821 100644 --- a/Tests/LegacyUnit/OldModel/AbstractModelTest.php +++ b/Tests/LegacyFunctional/OldModel/AbstractModelTest.php @@ -2,17 +2,24 @@ declare(strict_types=1); -namespace OliverKlee\Seminars\Tests\LegacyUnit\OldModel; +namespace OliverKlee\Seminars\Tests\LegacyFunctional\OldModel; use OliverKlee\Oelib\Testing\TestingFramework; use OliverKlee\Seminars\Tests\Unit\OldModel\Fixtures\TestingModel; -use PHPUnit\Framework\TestCase; +use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase; /** * @covers \OliverKlee\Seminars\OldModel\AbstractModel */ -final class AbstractModelTest extends TestCase +final class AbstractModelTest extends FunctionalTestCase { + protected $testExtensionsToLoad = [ + 'typo3conf/ext/static_info_tables', + 'typo3conf/ext/feuserextrafields', + 'typo3conf/ext/oelib', + 'typo3conf/ext/seminars', + ]; + /** * @var TestingModel */ @@ -61,7 +68,7 @@ protected function setUp(): void protected function tearDown(): void { - $this->testingFramework->cleanUp(); + $this->testingFramework->cleanUpWithoutDatabase(); parent::tearDown(); } diff --git a/Tests/LegacyUnit/OldModel/LegacyOrganizerTest.php b/Tests/LegacyFunctional/OldModel/LegacyOrganizerTest.php similarity index 91% rename from Tests/LegacyUnit/OldModel/LegacyOrganizerTest.php rename to Tests/LegacyFunctional/OldModel/LegacyOrganizerTest.php index 05ed0d41a..e417653ad 100644 --- a/Tests/LegacyUnit/OldModel/LegacyOrganizerTest.php +++ b/Tests/LegacyFunctional/OldModel/LegacyOrganizerTest.php @@ -2,17 +2,24 @@ declare(strict_types=1); -namespace OliverKlee\Seminars\Tests\LegacyUnit\OldModel; +namespace OliverKlee\Seminars\Tests\LegacyFunctional\OldModel; use OliverKlee\Oelib\Testing\TestingFramework; use OliverKlee\Seminars\OldModel\LegacyOrganizer; -use PHPUnit\Framework\TestCase; +use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase; /** * @covers \OliverKlee\Seminars\OldModel\LegacyOrganizer */ -final class LegacyOrganizerTest extends TestCase +final class LegacyOrganizerTest extends FunctionalTestCase { + protected $testExtensionsToLoad = [ + 'typo3conf/ext/static_info_tables', + 'typo3conf/ext/feuserextrafields', + 'typo3conf/ext/oelib', + 'typo3conf/ext/seminars', + ]; + /** * @var LegacyOrganizer */ @@ -59,7 +66,7 @@ protected function setUp(): void protected function tearDown(): void { - $this->testingFramework->cleanUp(); + $this->testingFramework->cleanUpWithoutDatabase(); parent::tearDown(); } diff --git a/Tests/LegacyUnit/OldModel/LegacyTimeSlotTest.php b/Tests/LegacyFunctional/OldModel/LegacyTimeSlotTest.php similarity index 93% rename from Tests/LegacyUnit/OldModel/LegacyTimeSlotTest.php rename to Tests/LegacyFunctional/OldModel/LegacyTimeSlotTest.php index d2b69241a..8c86c038d 100644 --- a/Tests/LegacyUnit/OldModel/LegacyTimeSlotTest.php +++ b/Tests/LegacyFunctional/OldModel/LegacyTimeSlotTest.php @@ -2,24 +2,31 @@ declare(strict_types=1); -namespace OliverKlee\Seminars\Tests\LegacyUnit\OldModel; +namespace OliverKlee\Seminars\Tests\LegacyFunctional\OldModel; use OliverKlee\Oelib\Configuration\ConfigurationRegistry; use OliverKlee\Oelib\Configuration\DummyConfiguration; use OliverKlee\Oelib\Testing\TestingFramework; use OliverKlee\Seminars\Tests\Support\LanguageHelper; use OliverKlee\Seminars\Tests\Unit\OldModel\Fixtures\TestingLegacyTimeSlot; -use PHPUnit\Framework\TestCase; use TYPO3\CMS\Core\Database\ConnectionPool; use TYPO3\CMS\Core\Utility\GeneralUtility; +use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase; /** * @covers \OliverKlee\Seminars\OldModel\LegacyTimeSlot */ -final class LegacyTimeSlotTest extends TestCase +final class LegacyTimeSlotTest extends FunctionalTestCase { use LanguageHelper; + protected $testExtensionsToLoad = [ + 'typo3conf/ext/static_info_tables', + 'typo3conf/ext/feuserextrafields', + 'typo3conf/ext/oelib', + 'typo3conf/ext/seminars', + ]; + /** * @var TestingLegacyTimeSlot */ @@ -60,7 +67,7 @@ protected function setUp(): void protected function tearDown(): void { - $this->testingFramework->cleanUp(); + $this->testingFramework->cleanUpWithoutDatabase(); parent::tearDown(); }