OXDEV-9043 Stop using VFS in tests container

OXID-eSales · Jan 14, 2025 · a4c1a92 · a4c1a92
1 parent c921874
commit a4c1a92
Show file tree

Hide file tree

Showing 52 changed files with 141 additions and 320 deletions.
diff --git a/tests/ContainerTrait.php b/tests/ContainerTrait.php
@@ -65,7 +65,6 @@ private function createContainer(): void
     private function compileContainer(): void
     {
         $this->container->compile(true);
-        $this->get('oxid_esales.module.install.service.launched_shop_project_configuration_generator')->generate();
     }
 
     private function loadYamlFixture(string $fixtureDir): void

diff --git a/tests/Integration/Application/Component/BasketComponentSessionTest.php b/tests/Integration/Application/Component/BasketComponentSessionTest.php
@@ -20,23 +20,14 @@ final class BasketComponentSessionTest extends IntegrationTestCase
 {
     private string $articleId = '1000';
 
-    private bool $configBlUseStock;
-
     public function setUp(): void
     {
         parent::setUp();
-        $this->configBlUseStock = Registry::getConfig()->getConfigParam('blUseStock');
         Registry::getConfig()->setConfigParam('blUseStock', false);
         Registry::getSession()->setVariable('aLastcall', []);
         $this->createTestProduct();
     }
 
-    public function tearDown(): void
-    {
-        Registry::getConfig()->setConfigParam('blUseStock', $this->configBlUseStock);
-        parent::tearDown();
-    }
-
     public function testChangingBasketWhenSessionChallengeValidationNotPassed(): void
     {
         $this->actAsSearchEngine(false);

diff --git a/tests/Integration/Application/Controller/Admin/ModuleConfigurationTest.php b/tests/Integration/Application/Controller/Admin/ModuleConfigurationTest.php
@@ -28,8 +28,8 @@ final class ModuleConfigurationTest extends IntegrationTestCase
 
     public function setUp(): void
     {
-        $this->installTestModule();
         parent::setUp();
+        $this->installTestModule();
     }
 
     public function tearDown(): void

diff --git a/tests/Integration/Application/Controller/Admin/ShopConfigurationTest.php b/tests/Integration/Application/Controller/Admin/ShopConfigurationTest.php
@@ -17,30 +17,14 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setting\Setting;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use OxidEsales\EshopCommunity\Tests\FilesystemTrait;
 use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 
 final class ShopConfigurationTest extends IntegrationTestCase
 {
     use ContainerTrait;
-    use FilesystemTrait;
 
     private string $testModuleId = 'testShopModuleId';
 
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->backupVarDirectory();
-    }
-
-    public function tearDown(): void
-    {
-        $this->restoreVarDirectory();
-
-        parent::tearDown();
-    }
-
     public function testSaveConfVars(): void
     {
         $this->prepareTestModuleConfiguration();

diff --git a/tests/Integration/Core/GenericImport/ImportObject/ImportObjectTest.php b/tests/Integration/Core/GenericImport/ImportObject/ImportObjectTest.php
@@ -32,9 +32,9 @@ public function setUp(): void
 
     public function tearDown(): void
     {
-        parent::setUp();
-
         Registry::getConfig()->setAdminMode(false);
+
+        parent::tearDown();
     }
 
     public function testGetFields(): void

diff --git a/tests/Integration/Core/LanguageTest.php b/tests/Integration/Core/LanguageTest.php
@@ -17,46 +17,60 @@
 use Symfony\Contracts\Cache\ItemInterface;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
-class LanguageTest extends IntegrationTestCase
+use function sprintf;
+
+final class LanguageTest extends IntegrationTestCase
 {
-    public function testTranslateCachedString(): void
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        ContainerFacade::get(TagAwareCacheInterface::class)->invalidateTags(['oxid_esales.cache.language']);
+    }
+
+    public function tearDown(): void
     {
-        $stringToTranslate = uniqid();
-        $cache = ContainerFacade::get(TagAwareCacheInterface::class);
+        ContainerFacade::get(TagAwareCacheInterface::class)->invalidateTags(['oxid_esales.cache.language']);
+
+        parent::tearDown();
+    }
+
+    public function testTranslateStringWithMissingTranslation(): void
+    {
+        $translationKey = uniqid('some-key-', true);
+        $language = new Language();
         $logger = $this->createMock(LoggerInterface::class);
         Registry::set('logger', $logger);
 
-        $config = Registry::getConfig();
-
         $logger->expects($this->once())
             ->method('warning')
-            ->with(sprintf('translation for %s not found', $stringToTranslate), $this->anything());
-
-        $language = new Language();
-        $translatedString = $language->translateString($stringToTranslate, $language->getBaseLanguage());
+            ->with(sprintf('translation for %s not found', $translationKey), $this->anything());
 
-        $this->assertEquals($stringToTranslate, $translatedString);
+        $translation = $language->translateString($translationKey, $language->getBaseLanguage());
 
-        $cache->invalidateTags(['oxid_esales.cache.language']);
+        $this->assertEquals($translationKey, $translation);
+    }
 
-        $langCacheName = sprintf(
+    public function testTranslateStringWithTranslationInCache(): void
+    {
+        $translationKey = uniqid('some-key-', true);
+        $cachedTranslation = 'some-translation';
+        $language = new Language();
+        $cacheKey = sprintf(
             'langcache_%d_%s_%d_%s_default',
-            $config->isAdmin(),
+            Registry::getConfig()->isAdmin(),
             $language->getBaseLanguage(),
-            $config->getShopId(),
-            $config->getConfigParam('sTheme')
+            Registry::getConfig()->getShopId(),
+            Registry::getConfig()->getConfigParam('sTheme')
         );
+        ContainerFacade::get(TagAwareCacheInterface::class)
+            ->get($cacheKey, function (ItemInterface $item) use ($translationKey, $cachedTranslation) {
+                $item->tag('oxid_esales.cache.language');
+                return [$translationKey => $cachedTranslation];
+            });
 
-        $cache->get($langCacheName, function (ItemInterface $item) use ($stringToTranslate) {
-            $item->tag('oxid_esales.cache.language');
-            return [$stringToTranslate => 'translated value'];
-        });
-
-        $language = new Language();
-        $translatedString = $language->translateString($stringToTranslate, $language->getBaseLanguage());
-
-        $this->assertEquals('translated value', $translatedString);
+        $translation = $language->translateString($translationKey, $language->getBaseLanguage());
 
-        $cache->invalidateTags(['oxid_esales.cache.language']);
+        $this->assertEquals($cachedTranslation, $translation);
     }
 }
diff --git a/tests/Integration/IntegrationTestCase.php b/tests/Integration/IntegrationTestCase.php
@@ -11,23 +11,27 @@
 
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
 use OxidEsales\EshopCommunity\Tests\DatabaseTrait;
+use OxidEsales\EshopCommunity\Tests\FilesystemTrait;
 use PHPUnit\Framework\TestCase;
 
 class IntegrationTestCase extends TestCase
 {
     use ContainerTrait;
     use DatabaseTrait;
+    use FilesystemTrait;
 
     public function setUp(): void
     {
         parent::setUp();
 
+        $this->backupVarDirectory();
         $this->beginTransaction();
     }
 
     public function tearDown(): void
     {
         $this->rollBackTransaction();
+        $this->restoreVarDirectory();
 
         parent::tearDown();
     }

diff --git a/tests/Integration/Internal/ComposerPlugin/ComponentInstallerTest.php b/tests/Integration/Internal/ComposerPlugin/ComponentInstallerTest.php
@@ -13,34 +13,17 @@
 use Composer\Package\Package;
 use OxidEsales\ComposerPlugin\Installer\Package\ComponentInstaller;
 use OxidEsales\EshopCommunity\Internal\Container\BootstrapContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\Service\ProjectYamlImportServiceInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectRootLocator;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use OxidEsales\EshopCommunity\Tests\FilesystemTrait;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 
-final class ComponentInstallerTest extends TestCase
+final class ComponentInstallerTest extends IntegrationTestCase
 {
     use ContainerTrait;
-    use FilesystemTrait;
 
     private string $servicesFilePath = 'Fixtures/services.yaml';
 
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->backupVarDirectory();
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->restoreVarDirectory();
-    }
-
     public function testInstall(): void
     {
         $installer = $this->createInstaller();

diff --git a/tests/Integration/Internal/ComposerPlugin/ModulePackageInstallerTest.php b/tests/Integration/Internal/ComposerPlugin/ModulePackageInstallerTest.php
@@ -19,32 +19,16 @@
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use OxidEsales\EshopCommunity\Tests\FilesystemTrait;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 
-final class ModulePackageInstallerTest extends TestCase
+final class ModulePackageInstallerTest extends IntegrationTestCase
 {
     use ContainerTrait;
-    use FilesystemTrait;
 
-    private $modulePackagePath = __DIR__ . '/Fixtures/test-module-package-installation';
+    private string $modulePackagePath = __DIR__ . '/Fixtures/test-module-package-installation';
     private string $packageName = 'test-module-package-installation';
     private string $moduleId = 'testModule';
 
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->backupVarDirectory();
-    }
-
-    public function tearDown(): void
-    {
-        $this->restoreVarDirectory();
-
-        parent::tearDown();
-    }
-
     public function testModuleNotInstalledByDefault(): void
     {
         $installer = $this->getPackageInstaller($this->packageName);

diff --git a/tests/Integration/Internal/Framework/DIContainer/Dao/ParameterDaoTest.php b/tests/Integration/Internal/Framework/DIContainer/Dao/ParameterDaoTest.php
@@ -12,28 +12,12 @@
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\Dao\ParameterDaoInterface;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use OxidEsales\EshopCommunity\Tests\FilesystemTrait;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 
-final class ParameterDaoTest extends TestCase
+final class ParameterDaoTest extends IntegrationTestCase
 {
     use ContainerTrait;
-    use FilesystemTrait;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->backupVarDirectory();
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->restoreVarDirectory();
-    }
 
     public function testAddWithMultipleParameters(): void
     {

diff --git a/tests/Integration/Internal/Framework/DIContainer/Dao/ProjectYamlDaoTest.php b/tests/Integration/Internal/Framework/DIContainer/Dao/ProjectYamlDaoTest.php
@@ -43,9 +43,9 @@ public function setup(): void
 
     public function tearDown(): void
     {
-        parent::tearDown();
-
         (new Filesystem())->remove($this->tmpFixture);
+
+        parent::tearDown();
     }
 
     public function testLadProjectConfigFileWillWorkWithEmptyFile(): void

diff --git a/tests/Integration/Internal/Framework/DIContainer/Service/FilesystemContainerCacheTest.php b/tests/Integration/Internal/Framework/DIContainer/Service/FilesystemContainerCacheTest.php
@@ -20,6 +20,8 @@ final class FilesystemContainerCacheTest extends TestCase
     public function tearDown(): void
     {
         $this->get(ContainerCacheInterface::class)->invalidate(2);
+
+        parent::tearDown();
     }
 
     public function testContainerCacheInvalidation(): void

diff --git a/tests/Integration/Internal/Framework/Database/ConnectionFactoryTest.php b/tests/Integration/Internal/Framework/Database/ConnectionFactoryTest.php
@@ -23,8 +23,8 @@ final class ConnectionFactoryTest extends TestCase
 
     public function tearDown(): void
     {
-        parent::tearDown();
         unlink($this->logFile);
+        parent::tearDown();
     }
 
     public function testSqlLoggerWritesExpectedValueToTheLog(): void

diff --git a/tests/Integration/Internal/Framework/FileSystem/FileGenerator/CsvFileGeneratorTest.php b/tests/Integration/Internal/Framework/FileSystem/FileGenerator/CsvFileGeneratorTest.php
@@ -36,9 +36,9 @@ protected function setUp(): void
 
     public function tearDown(): void
     {
-        parent::tearDown();
-
         $this->filesystem->remove($this->filename);
+
+        parent::tearDown();
     }
 
     public function testGenerateIfDataExists(): void

diff --git a/tests/Integration/Internal/Framework/Module/Command/ModuleCommandsTestCase.php b/tests/Integration/Internal/Framework/Module/Command/ModuleCommandsTestCase.php
@@ -12,12 +12,12 @@
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Install\DataObject\OxidEshopPackage;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Install\Service\ModuleInstallerInterface;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Filesystem\Path;
 
-class ModuleCommandsTestCase extends TestCase
+class ModuleCommandsTestCase extends IntegrationTestCase
 {
     protected string $modulesPath = __DIR__ . '/Fixtures/modules/';
 

diff --git a/tests/Integration/Internal/Framework/Module/Configuration/Bridge/ModuleSettingBridgeTest.php b/tests/Integration/Internal/Framework/Module/Configuration/Bridge/ModuleSettingBridgeTest.php
@@ -13,9 +13,9 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Install\Service\ModuleConfigurationInstallerInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 
-final class ModuleSettingBridgeTest extends TestCase
+final class ModuleSettingBridgeTest extends IntegrationTestCase
 {
     use ContainerTrait;
 

diff --git a/...gration/Internal/Framework/Module/Configuration/Bridge/ShopConfigurationDaoBridgeTest.php b/...gration/Internal/Framework/Module/Configuration/Bridge/ShopConfigurationDaoBridgeTest.php
@@ -13,9 +13,9 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ShopConfiguration;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 
-final class ShopConfigurationDaoBridgeTest extends TestCase
+final class ShopConfigurationDaoBridgeTest extends IntegrationTestCase
 {
     use ContainerTrait;
 

diff --git a/...gration/Internal/Framework/Module/Configuration/Dao/Chain/ClassExtensionsChainDaoTest.php b/...gration/Internal/Framework/Module/Configuration/Dao/Chain/ClassExtensionsChainDaoTest.php
@@ -12,9 +12,9 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Dao\Chain\ClassExtensionsChainDaoInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ClassExtensionsChain;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
-use PHPUnit\Framework\TestCase;
+use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
 
-final class ClassExtensionsChainDaoTest extends TestCase
+final class ClassExtensionsChainDaoTest extends IntegrationTestCase
 {
     use ContainerTrait;