OXDEV-9127 Use backported methods for test parameters

Author: hkreuter

tests/Codeception/Acceptance.suite.yml

@@ -4,19 +4,25 @@ path: Acceptance
 modules:
   enabled:
     - Asserts
+    - \OxidEsales\Codeception\Module\ShopSetup:
+        dump: '%DUMP_PATH%'
+        fixtures: '%FIXTURES_PATH%'
+        license: '%license_key%'
+        mysql_config: '%MYSQL_CONFIG_PATH%'
+        db_name: '%DB_NAME%'
     - Db:
           dsn: 'mysql:host=%DB_HOST%;dbname=%DB_NAME%;charset=utf8'
           user: '%DB_USERNAME%'
           password: '%DB_PASSWORD%'
           port: '%DB_PORT%'
           module_dump: '%MODULE_DUMP_PATH%'
+          dump: '%DUMP_PATH%'
           mysql_config: '%MYSQL_CONFIG_PATH%'
           populate: true # run populator before all tests
-          cleanup: false # run populator before each test
-          populator: 'mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $module_dump'
-    - \OxidEsales\Codeception\Module\Database:
-          config_key: 'fq45QS09_fqyx09239QQ'
-          depends: Db
+          cleanup: true # run populator before each test
+          populator: >
+            mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $dump &&
+            mysql --defaults-file=$mysql_config --default-character-set=utf8 $dbname < $module_dump
     - REST:
         url: '%SHOP_URL%'
         depends: PhpBrowser

tests/Codeception/Config/CodeceptionParametersProvider.php

@@ -9,8 +9,7 @@
 
 namespace OxidEsales\GraphQL\Base\Tests\Codeception\Config;
 
-use OxidEsales\Codeception\Module\Database\DatabaseDefaultsFileGenerator;
-use OxidEsales\Facts\Config\ConfigFile;
+use OxidEsales\Codeception\Module\Database;
 use OxidEsales\Facts\Facts;
 use Symfony\Component\Filesystem\Path;
 
@@ -34,25 +33,37 @@ public function getParameters(): array
             'DB_PASSWORD' => $facts->getDatabasePassword(),
             'DB_HOST' => $facts->getDatabaseHost(),
             'DB_PORT' => $facts->getDatabasePort(),
+            'DUMP_PATH' => $this->getTestDataDumpFilePath(),
             'MODULE_DUMP_PATH' => $this->getModuleTestDataDumpFilePath(),
-            'MYSQL_CONFIG_PATH' => $this->getMysqlConfigPath(),
+            'MYSQL_CONFIG_PATH' => $this->generateMysqlStarUpConfigurationFile($facts),
             'PHP_BIN' => $php,
+            'FIXTURES_PATH' => $this->getFixturesFilePath()
         ];
     }
 
-    private function getModuleTestDataDumpFilePath()
+    private function getModuleTestDataDumpFilePath(): string
     {
         return Path::join(__DIR__, '..', 'Support', 'Data', 'dump.sql');
     }
 
-    private function getMysqlConfigPath()
+    private function getFixturesFilePath(): string
     {
-        $facts = new Facts();
-        $configFile = new ConfigFile($facts->getSourcePath() . '/config.inc.php');
+        return Path::join(__DIR__, '..', 'Support', 'Data', 'fixtures.sql');
+    }
 
-        $generator = new DatabaseDefaultsFileGenerator($configFile);
+    private function getTestDataDumpFilePath(): string
+    {
+        return Path::join(__DIR__, '..', 'Support', '_generated', 'shop-dump.sql');
+    }
 
-        return $generator->generate();
+    private function generateMysqlStarUpConfigurationFile(Facts $facts): string
+    {
+        return Database::generateStartupOptionsFile(
+            user: $facts->getDatabaseUserName(),
+            pass: $facts->getDatabasePassword(),
+            host: $facts->getDatabaseHost(),
+            port: $facts->getDatabasePort()
+        );
     }
 }