OXDEV-7248 Cleanup tests

OXID-eSales · Nov 11, 2024 · 7e7c98f · 7e7c98f
1 parent f0ea5cd
commit 7e7c98f
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 42 deletions.
diff --git a/tests/Integration/Application/Model/DiagnosticsOutputTest.php b/tests/Integration/Application/Model/DiagnosticsOutputTest.php
@@ -9,12 +9,10 @@
 
 namespace OxidEsales\EshopCommunity\Tests\Integration\Application\Model;
 
-use PHPUnit\Framework\Attributes\DataProvider;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\Utils;
 use OxidEsales\EshopCommunity\Application\Model\DiagnosticsOutput;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 use PHPUnit\Framework\TestCase;
 
 final class DiagnosticsOutputTest extends TestCase

diff --git a/...ion/Internal/Framework/Module/Configuration/Dao/ModuleEnvironmentConfigurationDaoTest.php b/...ion/Internal/Framework/Module/Configuration/Dao/ModuleEnvironmentConfigurationDaoTest.php
@@ -9,10 +9,9 @@
 
 namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\Module\Configuration\Dao;
 
-use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
-use OxidEsales\EshopCommunity\Internal\Framework\Storage\FileStorageFactoryInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Dao\ModuleEnvironmentConfigurationDaoInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataMapper\ModuleConfiguration\ModuleSettingsDataMapper;
+use OxidEsales\EshopCommunity\Internal\Framework\Storage\FileStorageFactoryInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
 use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
@@ -25,7 +24,8 @@ final class ModuleEnvironmentConfigurationDaoTest extends TestCase
     public function testGet(): void
     {
         $this->prepareTestEnvironmentShopConfigurationFile();
-        $environmentConfiguration = $this->get(ModuleEnvironmentConfigurationDaoInterface::class)->get('testModuleId', 1);
+        $environmentConfiguration = $this->get(ModuleEnvironmentConfigurationDaoInterface::class)
+            ->get('testModuleId', 1);
         $expectedEnvironmentConfiguration = [
             ModuleSettingsDataMapper::MAPPING_KEY => [
                 'settingToOverwrite' => [
@@ -43,7 +43,8 @@ public function testRemove(): void
 
         $this->get(ModuleEnvironmentConfigurationDaoInterface::class)->remove('testModuleId', 1);
 
-        $environmentConfiguration = $this->get(ModuleEnvironmentConfigurationDaoInterface::class)->get('testModuleId', 1);
+        $environmentConfiguration = $this->get(ModuleEnvironmentConfigurationDaoInterface::class)
+            ->get('testModuleId', 1);
 
         $this->assertEquals([], $environmentConfiguration);
     }

diff --git a/tests/Integration/Internal/Framework/Module/MetaData/DataMapper/MetaDataMapperTest.php b/tests/Integration/Internal/Framework/Module/MetaData/DataMapper/MetaDataMapperTest.php
@@ -7,9 +7,8 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Test\Integration\Internal\Framework\Module\MetaData\DataMapper;
+namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\Module\MetaData\DataMapper;
 
-use PHPUnit\Framework\Attributes\DataProvider;
 use InvalidArgumentException;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\Dao\MetaDataProvider;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\MetaData\DataMapper\MetaDataToModuleConfigurationDataMapperInterface;

diff --git a/tests/Integration/Internal/Framework/Module/Setup/Validator/ServicesYamlValidatorTest.php b/tests/Integration/Internal/Framework/Module/Setup/Validator/ServicesYamlValidatorTest.php
@@ -9,7 +9,6 @@
 
 namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\Module\Setup\Validator;
 
-use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\Dao\ProjectYamlDao;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Path\ModulePathResolverInterface;

diff --git a/tests/Integration/Internal/Module/Migration/ModuleMigrationsTest.php b/tests/Integration/Internal/Module/Migration/ModuleMigrationsTest.php
@@ -9,7 +9,6 @@
 
 namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Module\Migration;
 
-use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use OxidEsales\DoctrineMigrationWrapper\Migrations;
 use OxidEsales\DoctrineMigrationWrapper\MigrationsBuilder;
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;

diff --git a/tests/Integration/Internal/Transition/Adapter/TemplateLogic/ScriptLogicTest.php b/tests/Integration/Internal/Transition/Adapter/TemplateLogic/ScriptLogicTest.php
@@ -51,7 +51,7 @@ public function testIncludeFileNotExists(): void
 
     public function testIncludeFileExists(): void
     {
-        $this->scriptLogic->include('http://someurl/src/js/libs/jquery.min.js', 3);
+        $this->scriptLogic->include('http://someurl/src/js/libs/jquery.min.js');
 
         $this->assertArrayHasKey(3, $this->config->getGlobalParameter('includes'));
         $this->assertContains(
@@ -89,7 +89,12 @@ public function testRenderAddWidget(string $script, string $output): void
         );
         $this->scriptLogic->add($script);
 
-        $this->assertEquals($expected, $this->scriptLogic->render('somewidget', true));
+        $actual = $this->scriptLogic->render('somewidget', true);
+
+        $this->assertEquals(
+            $this->stripFormatting($expected),
+            $this->stripFormatting($actual),
+        );
     }
 
     public static function addWidgetProvider(): array
@@ -115,6 +120,13 @@ public function testRenderIncludeWidget(): void
 </script>
 HTML;
 
-        $this->assertEquals($expected, $this->scriptLogic->render('somewidget', true));
+        $actual = $this->scriptLogic->render('somewidget', true);
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    private function stripFormatting(string $html): string
+    {
+        return str_replace(["\n", ' '], '', $html);
     }
 }
diff --git a/tests/Integration/Internal/Transition/Adapter/TemplateLogic/TruncateLogicTest.php b/tests/Integration/Internal/Transition/Adapter/TemplateLogic/TruncateLogicTest.php
@@ -9,7 +9,6 @@
 
 namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Transition\Adapter\TemplateLogic;
 
-use PHPUnit\Framework\Attributes\DataProvider;
 use OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\TruncateLogic;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -26,9 +25,9 @@ public function setup(): void
     #[DataProvider('truncateProvider')]
     public function testTruncate(string $string, string $expected, array $parameters = []): void
     {
-        $length = isset($parameters['length']) ? $parameters['length'] : 80;
-        $suffix = isset($parameters['suffix']) ? $parameters['suffix'] : '...';
-        $breakWords = isset($parameters['breakWords']) ? $parameters['breakWords'] : false;
+        $length = $parameters['length'] ?? 80;
+        $suffix = $parameters['suffix'] ?? '...';
+        $breakWords = $parameters['breakWords'] ?? false;
 
         $this->assertEquals($expected, $this->truncateLogic->truncate($string, $length, $suffix, $breakWords));
     }
@@ -37,26 +36,29 @@ public static function truncateProvider(): array
     {
         return [
             [
-                "Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dapibus pulvinar sem vitae.",
-                "Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse..."
+                'Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dapibus pulvinar sem vitae.',
+                'Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse...'
             ],
             [
-                "Duis iaculis &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit lacinia at. Suspendisse dapibus pulvinar sem vitae.",
-                "Duis iaculis &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit lacinia at. Suspendisse..."
+                'Duis iaculis &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit lacinia at. ' .
+                'Suspendisse dapibus pulvinar sem vitae.',
+                'Duis iaculis &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit lacinia at. Suspendisse...'
             ],
             [
-                "&#039;Duis&#039; &#039;iaculis&#039; &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit lacinia at. Suspendisse dapibus pulvinar sem vitae.",
-                "&#039;Duis&#039; &#039;iaculis&#039; &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit lacinia at...."
+                '&#039;Duis&#039; &#039;iaculis&#039; &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; ' .
+                'elit lacinia at. Suspendisse dapibus pulvinar sem vitae.',
+                '&#039;Duis&#039; &#039;iaculis&#039; &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; ' .
+                'elit lacinia at....'
             ],
         ];
     }
 
     #[DataProvider('truncateProviderWithLength')]
     public function testTruncateWithLength(string $string, string $expected, array $parameters = []): void
     {
-        $length = isset($parameters['length']) ? $parameters['length'] : 80;
-        $suffix = isset($parameters['suffix']) ? $parameters['suffix'] : '...';
-        $breakWords = isset($parameters['breakWords']) ? $parameters['breakWords'] : false;
+        $length = $parameters['length'] ?? 80;
+        $suffix = $parameters['suffix'] ?? '...';
+        $breakWords = $parameters['breakWords'] ?? false;
 
         $this->assertEquals($expected, $this->truncateLogic->truncate($string, $length, $suffix, $breakWords));
     }
@@ -65,18 +67,18 @@ public static function truncateProviderWithLength(): array
     {
         return [
             [
-                "Duis iaculis pellentesque felis, et pulvinar elit.",
-                "Duis iaculis...",
+                'Duis iaculis pellentesque felis, et pulvinar elit.',
+                'Duis iaculis...',
                 ['length' => 20]
             ],
             [
-                "Duis iaculis &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit.",
-                "Duis iaculis...",
+                'Duis iaculis &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit.',
+                'Duis iaculis...',
                 ['length' => 20]
             ],
             [
-                "&#039;Duis&#039; &#039;iaculis&#039; &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit.",
-                "&#039;Duis&#039; &#039;iaculis&#039;...",
+                '&#039;Duis&#039; &#039;iaculis&#039; &#039;pellentesque&#039; felis, et &quot;pulvinar&quot; elit.',
+                '&#039;Duis&#039; &#039;iaculis&#039;...',
                 ['length' => 20]
             ],
         ];
@@ -85,9 +87,9 @@ public static function truncateProviderWithLength(): array
     #[DataProvider('truncateProviderWithSuffix')]
     public function testTruncateWithSuffix(string $string, string $expected, array $parameters = []): void
     {
-        $length = isset($parameters['length']) ? $parameters['length'] : 80;
-        $suffix = isset($parameters['suffix']) ? $parameters['suffix'] : '...';
-        $breakWords = isset($parameters['breakWords']) ? $parameters['breakWords'] : false;
+        $length = $parameters['length'] ?? 80;
+        $suffix = $parameters['suffix'] ?? '...';
+        $breakWords = $parameters['breakWords'] ?? false;
 
         $this->assertEquals($expected, $this->truncateLogic->truncate($string, $length, $suffix, $breakWords));
     }
@@ -96,8 +98,8 @@ public static function truncateProviderWithSuffix(): array
     {
         return [
             [
-                "Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dapibus pulvinar sem vitae.",
-                "Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse (...)",
+                'Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dapibus pulvinar sem vitae.',
+                'Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse (...)',
                 ['suffix' => ' (...)']
             ],
         ];
@@ -106,9 +108,9 @@ public static function truncateProviderWithSuffix(): array
     #[DataProvider('truncateProviderWithBreakWords')]
     public function testTruncateWithBreakWords(string $string, string $expected, array $parameters = []): void
     {
-        $length = isset($parameters['length']) ? $parameters['length'] : 80;
-        $suffix = isset($parameters['suffix']) ? $parameters['suffix'] : '...';
-        $breakWords = isset($parameters['breakWords']) ? $parameters['breakWords'] : false;
+        $length = $parameters['length'] ?? 80;
+        $suffix = $parameters['suffix'] ?? '...';
+        $breakWords = $parameters['breakWords'] ?? false;
 
         $this->assertEquals($expected, $this->truncateLogic->truncate($string, $length, $suffix, $breakWords));
     }
@@ -117,8 +119,8 @@ public static function truncateProviderWithBreakWords(): array
     {
         return [
             [
-                "Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dapibus pulvinar sem vitae.",
-                "Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dap...",
+                'Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dapibus pulvinar sem vitae.',
+                'Duis iaculis pellentesque felis, et pulvinar elit lacinia at. Suspendisse dap...',
                 ['breakWords' => true]
             ],
         ];