MC-30880: Integration Test Extensibility

Author: mykhailomatiola

dev/tests/integration/framework/Magento/TestFramework/SuiteLoader.php

@@ -45,9 +45,9 @@ public function __construct()
     /**
      * @inheritdoc
      */
-    public function load($suiteClassName, $suiteClassFile = '')
+    public function load(string $suiteClassFile): \ReflectionClass
     {
-        $resultClass = $this->suiteLoader->load($suiteClassName, $suiteClassFile);
+        $resultClass = $this->suiteLoader->load($suiteClassFile);
 
         if ($this->testsConfig->hasConfiguration($resultClass->getName())
             && !in_array(SkippableInterface::class, $resultClass->getInterfaceNames(), true)
@@ -61,7 +61,7 @@ public function load($suiteClassName, $suiteClassFile = '')
     /**
      * @inheritdoc
      */
-    public function reload(\ReflectionClass $aClass)
+    public function reload(\ReflectionClass $aClass): \ReflectionClass
     {
         return $aClass;
     }

dev/tests/integration/testsuite/Magento/IntegrationTest.php

@@ -11,7 +11,9 @@
 use Magento\TestFramework\Workaround\Override\Config;
 use Magento\TestFramework\Workaround\Override\WrapperGenerator;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\Util\Configuration;
+use PHPUnit\TextUI\Configuration\Registry;
+use PHPUnit\TextUI\Configuration\TestSuiteCollection;
+use PHPUnit\TextUI\Configuration\TestSuiteMapper;
 
 /**
  * Integration tests wrapper.
@@ -27,24 +29,28 @@ public static function suite($className)
     {
         $generator = new WrapperGenerator();
         $overrideConfig = Config::getInstance();
-        $configuration = Configuration::getInstance(self::getConfigurationFile());
-        $suites = $configuration->getTestSuiteConfiguration();
+        $configuration = Registry::getInstance()->get(self::getConfigurationFile());
+        $suitesConfig = $configuration->testSuite();
         $suite = new TestSuite();
-        /** @var TestSuite $testSuite */
-        foreach ($suites as $testSuite) {
-            if ($testSuite->getName() === 'Magento Integration Tests') {
+        /** @var \PHPUnit\TextUI\Configuration\TestSuite $suiteConfig */
+        foreach ($suitesConfig as $suiteConfig) {
+            if ($suiteConfig->name() === 'Magento Integration Tests') {
                 continue;
             }
-            /** @var TestSuite $test */
-            foreach ($testSuite as $test) {
-                $testName = $test->getName();
+            $suites = (new TestSuiteMapper())->map(TestSuiteCollection::fromArray([$suiteConfig]), '');
+            /** @var TestSuite $testSuite */
+            foreach ($suites as $testSuite) {
+                /** @var TestSuite $test */
+                foreach ($testSuite as $test) {
+                    $testName = $test->getName();
 
-                if ($overrideConfig->hasConfiguration($testName) && !$test instanceof SkippableInterface) {
-                    $reflectionClass = new \ReflectionClass($testName);
-                    $resultTest = $generator->generateTestWrapper($reflectionClass);
-                    $suite->addTest(new TestSuite($resultTest, $testName));
-                } else {
-                    $suite->addTest($test);
+                    if ($overrideConfig->hasConfiguration($testName) && !$test instanceof SkippableInterface) {
+                        $reflectionClass = new \ReflectionClass($testName);
+                        $resultTest = $generator->generateTestWrapper($reflectionClass);
+                        $suite->addTest(new TestSuite($resultTest, $testName));
+                    } else {
+                        $suite->addTest($test);
+                    }
                 }
             }
         }