[CLEANUP] Move some fixtures to better locations (#1696)

oliverklee · web-flow · commit 5e4d005f4fae · 2023-12-29T14:04:40.000Z
Fixtures should be located close to the testcase, and they should not be reused across multiple testcases. Also drop an unused fixture file. Fixes #1691
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Changed
 - Convert the DB fixtures from XML to CSV
-  (#1689,#1690, #1692, #1693, #1694, #1695)
+  (#1689,#1690, #1692, #1693, #1694, #1695, #1696)
 - Use the `Context` for getting the current timestamp (#1682, #1684)
 - Use more native type declarations (#1664, #1665)
 - Upgrade to PHPUnit 9 (#1634)
diff --git a/Tests/Functional/Configuration/AbstractConfigurationCheckTest.php b/Tests/Functional/Configuration/AbstractConfigurationCheckTest.php
@@ -21,7 +21,7 @@ final class AbstractConfigurationCheckTest extends FunctionalTestCase
     public function checkTemplateFileForExistingTemplateFileGeneratesNoWarnings(): void
     {
         $configuration = new DummyConfiguration(
-            ['templateFile' => 'EXT:oelib/Tests/Functional/Fixtures/Template.html']
+            ['templateFile' => 'EXT:oelib/Tests/Functional/Configuration/Fixtures/Template.html']
         );
         $subject = new TestingConfigurationCheck($configuration, 'plugin.tx_oelib');
         $subject->setCheckMethod('checkTemplateFile');
@@ -70,7 +70,9 @@ public function checkTemplateFileForInexistentFileNameGeneratesWarning(): void
      */
     public function checkFileExistsForExistingFileGeneratesNoWarnings(): void
     {
-        $configuration = new DummyConfiguration(['file' => 'EXT:oelib/Tests/Functional/Fixtures/Template.html']);
+        $configuration = new DummyConfiguration(
+            ['file' => 'EXT:oelib/Tests/Functional/Configuration/Fixtures/Template.html']
+        );
         $subject = new TestingConfigurationCheck($configuration, 'plugin.tx_oelib');
         $subject->setCheckMethod('checkFileExists');
 
diff --git a/Tests/Functional/Configuration/Fixtures/Template.html b/Tests/Functional/Configuration/Fixtures/Template.html
diff --git a/Tests/Functional/Fixtures/Languages.xml b/Tests/Functional/Fixtures/Languages.xml
diff --git a/Tests/Functional/Mapper/CountryMapperTest.php b/Tests/Functional/Mapper/CountryMapperTest.php
@@ -33,7 +33,7 @@ private function importStaticData(): void
     {
         $connection = $this->getConnectionPool()->getConnectionForTable('static_countries');
         if ($connection->count('*', 'static_countries', []) === 0) {
-            $this->importCSVDataSet(__DIR__ . '/../Fixtures/Countries.csv');
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/Countries.csv');
         }
     }
 
diff --git a/Tests/Functional/Mapper/CurrencyMapperTest.php b/Tests/Functional/Mapper/CurrencyMapperTest.php
@@ -34,7 +34,7 @@ private function importStaticData(): void
     {
         $connection = $this->getConnectionPool()->getConnectionForTable('static_currencies');
         if ($connection->count('*', 'static_currencies', []) === 0) {
-            $this->importCSVDataSet(__DIR__ . '/../Fixtures/Currencies.csv');
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/Currencies.csv');
         }
     }
 
diff --git a/Tests/Functional/Mapper/Fixtures/Countries.csv b/Tests/Functional/Mapper/Fixtures/Countries.csv
diff --git a/Tests/Functional/Mapper/Fixtures/Currencies.csv b/Tests/Functional/Mapper/Fixtures/Currencies.csv
diff --git a/Tests/Functional/Mapper/Fixtures/Languages.csv b/Tests/Functional/Mapper/Fixtures/Languages.csv
diff --git a/Tests/Functional/Mapper/LanguageMapperTest.php b/Tests/Functional/Mapper/LanguageMapperTest.php
@@ -32,7 +32,7 @@ private function importStaticData(): void
     {
         $connection = $this->getConnectionPool()->getConnectionForTable('static_languages');
         if ($connection->count('*', 'static_languages', []) === 0) {
-            $this->importCSVDataSet(__DIR__ . '/../Fixtures/Languages.csv');
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/Languages.csv');
         }
     }
 
diff --git a/Tests/Functional/Templating/Fixtures/Template.html b/Tests/Functional/Templating/Fixtures/Template.html
@@ -0,0 +1 @@
+Hello world!
diff --git a/Tests/Functional/Templating/TemplateRegistryTest.php b/Tests/Functional/Templating/TemplateRegistryTest.php
@@ -26,7 +26,7 @@ public function getForExistingTemplateFileNameReturnsTemplate(): void
     {
         self::assertInstanceOf(
             Template::class,
-            TemplateRegistry::get('EXT:oelib/Tests/Functional/Fixtures/Template.html')
+            TemplateRegistry::get('EXT:oelib/Tests/Functional/Templating/Fixtures/Template.html')
         );
     }
 
@@ -36,8 +36,8 @@ public function getForExistingTemplateFileNameReturnsTemplate(): void
     public function getForExistingTemplateFileNameCalledTwoTimesReturnsNewInstance(): void
     {
         self::assertNotSame(
-            TemplateRegistry::get('EXT:oelib/Tests/Functional/Fixtures/Template.html'),
-            TemplateRegistry::get('EXT:oelib/Tests/Functional/Fixtures/Template.html')
+            TemplateRegistry::get('EXT:oelib/Tests/Functional/Templating/Fixtures/Template.html'),
+            TemplateRegistry::get('EXT:oelib/Tests/Functional/Templating/Fixtures/Template.html')
         );
     }
 
@@ -46,7 +46,7 @@ public function getForExistingTemplateFileNameCalledTwoTimesReturnsNewInstance()
      */
     public function getForExistingTemplateFileNameReturnsProcessedTemplate(): void
     {
-        $template = TemplateRegistry::get('EXT:oelib/Tests/Functional/Fixtures/Template.html');
+        $template = TemplateRegistry::get('EXT:oelib/Tests/Functional/Templating/Fixtures/Template.html');
 
         self::assertSame(
             "Hello world!\n",
diff --git a/Tests/Functional/Templating/TemplateTest.php b/Tests/Functional/Templating/TemplateTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
      */
     public function processTemplateFromFileProcessesTemplateFromFile(): void
     {
-        $this->subject->processTemplateFromFile('EXT:oelib/Tests/Functional/Fixtures/Template.html');
+        $this->subject->processTemplateFromFile('EXT:oelib/Tests/Functional/Templating/Fixtures/Template.html');
 
         self::assertSame("Hello world!\n", $this->subject->render());
     }
diff --git a/Tests/Functional/ViewHelpers/Fixtures/Currencies.csv b/Tests/Functional/ViewHelpers/Fixtures/Currencies.csv
@@ -0,0 +1,8 @@
+"static_currencies"
+,"uid","cu_iso_3","cu_iso_nr","cu_name_en","cu_symbol_left","cu_thousands_point","cu_decimal_digits","cu_sub_divisor","cu_decimal_point","cu_symbol_right"
+,33,"CLP",152,"Chilean Peso","$",".",0,1,"",""
+,40,"CZK",203,"Czech koruna","",".",2,100,",","Kč"
+,49,"EUR",978,"Euro","€",".",2,100,",",""
+,81,"KWD",414,"Kuwaiti dinar","KD",".",3,1000,",",""
+,155,"USD",840,"US dollar","$",",",2,100,".",""
+,173,"MGA",969,"Malagasy ariary","",".",1,5,",",""
diff --git a/Tests/Functional/ViewHelpers/PriceViewHelperTest.php b/Tests/Functional/ViewHelpers/PriceViewHelperTest.php
@@ -32,7 +32,7 @@ private function importStaticData(): void
     {
         $connection = $this->getConnectionPool()->getConnectionForTable('static_currencies');
         if ($connection->count('*', 'static_currencies', []) === 0) {
-            $this->importCSVDataSet(__DIR__ . '/../Fixtures/Currencies.csv');
+            $this->importCSVDataSet(__DIR__ . '/Fixtures/Currencies.csv');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private function importStaticData(): void`
`33`	`33`	`{`
`34`	`34`	`$connection = $this->getConnectionPool()->getConnectionForTable('static_countries');`
`35`	`35`	`if ($connection->count('*', 'static_countries', []) === 0) {`
`36`		`- $this->importCSVDataSet(__DIR__ . '/../Fixtures/Countries.csv');`
	`36`	`+ $this->importCSVDataSet(__DIR__ . '/Fixtures/Countries.csv');`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private function importStaticData(): void`
`34`	`34`	`{`
`35`	`35`	`$connection = $this->getConnectionPool()->getConnectionForTable('static_currencies');`
`36`	`36`	`if ($connection->count('*', 'static_currencies', []) === 0) {`
`37`		`- $this->importCSVDataSet(__DIR__ . '/../Fixtures/Currencies.csv');`
	`37`	`+ $this->importCSVDataSet(__DIR__ . '/Fixtures/Currencies.csv');`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ private function importStaticData(): void`
`32`	`32`	`{`
`33`	`33`	`$connection = $this->getConnectionPool()->getConnectionForTable('static_languages');`
`34`	`34`	`if ($connection->count('*', 'static_languages', []) === 0) {`
`35`		`- $this->importCSVDataSet(__DIR__ . '/../Fixtures/Languages.csv');`
	`35`	`+ $this->importCSVDataSet(__DIR__ . '/Fixtures/Languages.csv');`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`