[TASK] Cleanup tests (#1514)

benjaminkott · Oct 8, 2024 · c106703 · c106703
1 parent 7ae6542
commit c106703
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 134 deletions.
diff --git a/Tests/Functional/Parser/ScssParserTest.php b/Tests/Functional/Parser/ScssParserTest.php
@@ -10,6 +10,8 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Parser;
 
 use BK2K\BootstrapPackage\Service\CompileService;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\ExpectationFailedException;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\EventDispatcher\NoopEventDispatcher;
@@ -55,10 +57,8 @@ protected static function assertFileContains(string $filename, string $needle):
         }
     }
 
-    /**
-     * @test
-     * @dataProvider scssParserCanCompileTestDataProvider
-     */
+    #[DataProvider('scssParserCanCompileTestDataProvider')]
+    #[Test]
     public function scssParserCanCompileTest(string $inputFile): void
     {
         $request = $this->buildRequest();
@@ -83,9 +83,7 @@ public static function scssParserCanCompileTestDataProvider(): array
         ];
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function urlsAreRelativeToTempTest(): void
     {
         $request = $this->buildRequest();
@@ -98,15 +96,13 @@ public function urlsAreRelativeToTempTest(): void
         );
     }
 
-    /**
-     * @test
-     * @dataProvider scssParserCanCompileTestDataProvider
-     */
-    public function sourceMapsAreIncluded(string $file): void
+    #[DataProvider('scssParserCanCompileTestDataProvider')]
+    #[Test]
+    public function sourceMapsAreIncluded(string $inputFile): void
     {
         $request = $this->buildRequest('plugin.tx_bootstrappackage.settings.cssSourceMapping = 1');
         $compileService = GeneralUtility::makeInstance(CompileService::class);
-        $compiledFile = $compileService->getCompiledFile($request, $file);
+        $compiledFile = $compileService->getCompiledFile($request, $inputFile);
         $mapFile = $compiledFile . '.map';
 
         self::assertFileExists(Environment::getPublicPath() . '/' . $mapFile);
@@ -118,7 +114,8 @@ protected function buildRequest(string $typoScriptString = ''): ServerRequest
         $request = new ServerRequest();
         $lineStream = (new LossyTokenizer())->tokenize($typoScriptString);
         $typoScriptAst = (new AstBuilder(new NoopEventDispatcher()))->build($lineStream, new RootNode());
-        $typoScriptAttribute = new FrontendTypoScript(new RootNode(), []);
+        /** @phpstan-ignore-next-line */
+        $typoScriptAttribute = new FrontendTypoScript(new RootNode(), [], [], []);
         $typoScriptAttribute->setSetupTree($typoScriptAst);
         $typoScriptAttribute->setSetupArray($typoScriptAst->toArray());
         $request = $request->withAttribute('frontend.typoscript', $typoScriptAttribute);

diff --git a/Tests/Functional/Updates/AccordionContentElementUpdateTest.php b/Tests/Functional/Updates/AccordionContentElementUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\AccordionContentElementUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class AccordionContentElementUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new AccordionContentElementUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new AccordionContentElementUpdate();

diff --git a/Tests/Functional/Updates/AccordionMediaOrientUpdateTest.php b/Tests/Functional/Updates/AccordionMediaOrientUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\AccordionMediaOrientUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class AccordionMediaOrientUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new AccordionMediaOrientUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new AccordionMediaOrientUpdate();

diff --git a/Tests/Functional/Updates/BackendLayoutUpdateTest.php b/Tests/Functional/Updates/BackendLayoutUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\BackendLayoutUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class BackendLayoutUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new BackendLayoutUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new BackendLayoutUpdate();

diff --git a/Tests/Functional/Updates/BulletContentElementUpdateTest.php b/Tests/Functional/Updates/BulletContentElementUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\BulletContentElementUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class BulletContentElementUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new BulletContentElementUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new BulletContentElementUpdate();

diff --git a/Tests/Functional/Updates/CarouselContentElementUpdateTest.php b/Tests/Functional/Updates/CarouselContentElementUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\CarouselContentElementUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class CarouselContentElementUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new CarouselContentElementUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new CarouselContentElementUpdate();

diff --git a/Tests/Functional/Updates/CarouselItemLayoutUpdateTest.php b/Tests/Functional/Updates/CarouselItemLayoutUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\CarouselItemLayoutUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class CarouselItemLayoutUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new CarouselItemLayoutUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new CarouselItemLayoutUpdate();

diff --git a/Tests/Functional/Updates/CarouselItemTypeUpdateTest.php b/Tests/Functional/Updates/CarouselItemTypeUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\CarouselItemTypeUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class CarouselItemTypeUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new CarouselItemTypeUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new CarouselItemTypeUpdate();

diff --git a/Tests/Functional/Updates/ExternalMediaContentElementUpdateTest.php b/Tests/Functional/Updates/ExternalMediaContentElementUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\ExternalMediaContentElementUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class ExternalMediaContentElementUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new ExternalMediaContentElementUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new ExternalMediaContentElementUpdate();

diff --git a/Tests/Functional/Updates/FrameClassToBackgroundUpdateTest.php b/Tests/Functional/Updates/FrameClassToBackgroundUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\FrameClassToBackgroundUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class FrameClassToBackgroundUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new FrameClassToBackgroundUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new FrameClassToBackgroundUpdate();

diff --git a/Tests/Functional/Updates/FrameClassToOptionsUpdateTest.php b/Tests/Functional/Updates/FrameClassToOptionsUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\FrameClassToOptionsUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 
 /**
@@ -28,18 +29,14 @@ final class FrameClassToOptionsUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new FrameClassToOptionsUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $subject = new FrameClassToOptionsUpdate();

diff --git a/Tests/Functional/Updates/FrameClassUpdateTest.php b/Tests/Functional/Updates/FrameClassUpdateTest.php
@@ -12,6 +12,7 @@
 namespace BK2K\BootstrapPackage\Tests\Functional\Updates;
 
 use BK2K\BootstrapPackage\Updates\FrameClassUpdate;
+use PHPUnit\Framework\Attributes\Test;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -30,18 +31,14 @@ final class FrameClassUpdateTest extends FunctionalTestCase
         'typo3conf/ext/bootstrap_package'
     ];
 
-    /**
-     * @test
-     */
+    #[Test]
     public function noUpdateNecessaryTest(): void
     {
         $subject = new FrameClassUpdate();
         self::assertFalse($subject->updateNecessary());
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function updateTest(): void
     {
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tt_content');