MC-33674: Global config applying makes a huge influence on tests performance

Author: ysapiga

dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php

@@ -117,8 +117,8 @@ protected function setScopeConfigValue(
     ): void {
         $config = $this->getMutableScopeConfig();
         if (strpos($configPath, 'default/') === 0) {
-                $configPath = substr($configPath, 8);
-                $config->setValue($configPath, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+            $configPath = substr($configPath, 8);
+            $config->setValue($configPath, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
         } else {
             $config->setValue($configPath, $value, $scopeType, $scopeCode);
         }

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

@@ -49,7 +49,7 @@ public function load(string $suiteClassFile): \ReflectionClass
     {
         $resultClass = $this->suiteLoader->load($suiteClassFile);
 
-        if ($this->testsConfig->hasConfiguration($resultClass->getName())
+        if ($this->testsConfig->hasSkippedTest($resultClass->getName())
             && !in_array(SkippableInterface::class, $resultClass->getInterfaceNames(), true)
         ) {
             $resultClass = new \ReflectionClass($this->generator->generateTestWrapper($resultClass));

dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config.php

@@ -74,9 +74,32 @@ public function getSkipConfiguration(TestCase $test): array
      * @param string $className
      * @return bool
      */
-    public function hasConfiguration(string $className): bool
+    public function hasSkippedTest(string $className): bool
     {
-        return !empty($this->config[$className]) || !empty($this->getGlobalConfig());
+        $classConfig = $this->config[$className] ?? [];
+
+        return $this->isSkippedByConfig($classConfig);
+    }
+
+    /**
+     * Check that class has even one test skipped
+     *
+     * @param array $config
+     * @return bool
+     */
+    private function isSkippedByConfig(array $config): bool
+    {
+        if (isset($config['skip']) && $config['skip']) {
+            return true;
+        }
+
+        foreach ($config as $lowerLevelConfig) {
+            if (is_array($lowerLevelConfig)) {
+                return $this->isSkippedByConfig($lowerLevelConfig);
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -133,22 +156,6 @@ public static function getInstance(): self
         return self::$instance;
     }
 
-    /**
-     * Get config from global node
-     *
-     * @param string|null $fixtureType
-     * @return array
-     */
-    public function getGlobalConfig(?string $fixtureType = null): array
-    {
-        $result = $this->config['global'] ?? [];
-        if ($fixtureType) {
-            $result = $result[$fixtureType] ?? [];
-        }
-
-        return $result;
-    }
-
     /**
      * Get config from class node
      *
@@ -222,6 +229,6 @@ private function prepareSkipConfig(array $config): array
         return [
             'skip' => $config['skip'],
             'skipMessage' => $config['skipMessage'] ?: 'Skipped according to override configurations',
-            ];
+        ];
     }
 }

dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config/Converter.php

@@ -34,7 +34,7 @@ class Converter implements ConverterInterface
     public function convert($source)
     {
         $this->xpath = new \DOMXPath($source);
-        $config = $this->getGlobalConfig($this->xpath);
+        $config = [];
         foreach ($this->xpath->query('//test') as $testOverride) {
             $className = ltrim($testOverride->getAttribute('class'), '\\');
             $config[$className] = $this->getTestConfigByFixtureType($testOverride);
@@ -73,39 +73,6 @@ private function fillSkipSection(\DOMElement $node, array $config): array
         return $config;
     }
 
-    /**
-     * Get global configurations
-     *
-     * @param \DOMXPath $xpath
-     * @return array
-     */
-    private function getGlobalConfig(\DOMXPath $xpath): array
-    {
-        foreach ($xpath->query('//global') as $globalOverride) {
-            $config = $this->fillGlobalConfigByFixtureType($globalOverride);
-        }
-
-        return $config ?? [];
-    }
-
-    /**
-     * Fill global configurations node
-     *
-     * @param \DOMElement $node
-     * @return array
-     */
-    private function fillGlobalConfigByFixtureType(\DOMElement $node): array
-    {
-        $config = [];
-        foreach (self::FIXTURE_TYPES as $fixtureType) {
-            foreach ($node->getElementsByTagName($fixtureType) as $fixture) {
-                $config['global'][$fixtureType][] = $this->fillAttributes($fixture);
-            }
-        }
-
-        return $config;
-    }
-
     /**
      * Fill test config for all fixture types
      *

dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Applier/Base.php

@@ -12,9 +12,6 @@
  */
 abstract class Base implements ApplierInterface
 {
-    /** @var array */
-    private $globalConfig;
-
     /** @var array */
     private $classConfig;
 
@@ -24,27 +21,6 @@ abstract class Base implements ApplierInterface
     /** @var array */
     private $dataSetConfig;
 
-    /**
-     * Get global node config
-     *
-     * @return array
-     */
-    public function getGlobalConfig(): array
-    {
-        return $this->globalConfig;
-    }
-
-    /**
-     * Set global node config
-     *
-     * @param array $globalConfig
-     * @return void
-     */
-    public function setGlobalConfig(array $globalConfig): void
-    {
-        $this->globalConfig = $globalConfig;
-    }
-
     /**
      * Get class node config
      *
@@ -77,7 +53,7 @@ public function getMethodConfig(): array
     }
 
     /**
-     * Set global node config
+     * Set method node config
      *
      * @param array $methodConfig
      * @return void
@@ -116,7 +92,6 @@ public function setDataSetConfig(array $dataSetConfig): void
     protected function getPrioritizedConfig(): array
     {
         return [
-            $this->getGlobalConfig(),
             $this->getClassConfig(),
             $this->getMethodConfig(),
             $this->getDataSetConfig(),

dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Resolver.php

@@ -179,7 +179,6 @@ private function getApplier(TestCase $test, string $fixtureType): ApplierInterfa
         }
         /** @var Base $applier */
         $applier = $this->appliersList[$fixtureType];
-        $applier->setGlobalConfig($this->config->getGlobalConfig($fixtureType));
         $applier->setClassConfig($this->config->getClassConfig($test, $fixtureType));
         $applier->setMethodConfig($this->config->getMethodConfig($test, $fixtureType));
         $applier->setDataSetConfig(

dev/tests/integration/framework/Magento/TestFramework/Workaround/etc/overrides.xsd

@@ -10,7 +10,6 @@
         <xs:complexType>
             <xs:sequence minOccurs="0" maxOccurs="unbounded">
                 <xs:element name="test" type="test" minOccurs="0" maxOccurs="unbounded" />
-                <xs:element name="global" type="global" minOccurs="0" maxOccurs="unbounded" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -78,12 +77,4 @@
         <xs:attribute name="newValue" type="xs:string"/>
         <xs:attribute name="remove" type="xs:boolean"/>
     </xs:complexType>
-    <xs:complexType name="global">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="magentoDataFixture" type="dataFixture" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="magentoDataFixtureBeforeTransaction" type="dataFixture" minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="magentoConfigFixture" type="configFixture"  minOccurs="0" maxOccurs="unbounded" />
-            <xs:element name="magentoAdminConfigFixture" type="adminConfigFixture"  minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-    </xs:complexType>
 </xs:schema>

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Workaround/Override/Fixture/Applier/AdminConfigFixtureTest.php

@@ -21,7 +21,7 @@ class AdminConfigFixtureTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Workaround/Override/Fixture/Applier/ConfigFixtureTest.php

@@ -21,7 +21,7 @@ class ConfigFixtureTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -484,7 +484,6 @@ private function processApply(array $existingFixtures, array $config): array
      */
     private function setConfig(array $config): void
     {
-        $this->object->setGlobalConfig([]);
         $this->object->setClassConfig([]);
         $this->object->setDataSetConfig([]);
         $this->object->setMethodConfig($config);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Workaround/Override/Fixture/Applier/DataFixtureTest.php

@@ -21,7 +21,7 @@ class DataFixtureTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -34,11 +34,8 @@ protected function setUp()
     public function testGetPrioritizedConfig(): void
     {
         $this->object = $this->getMockBuilder(DataFixture::class)
-            ->setMethods(['getGlobalConfig', 'getClassConfig', 'getMethodConfig', 'getDataSetConfig'])
+            ->setMethods(['getClassConfig', 'getMethodConfig', 'getDataSetConfig'])
             ->getMock();
-        $this->object->expects($this->once())
-            ->method('getGlobalConfig')
-            ->willReturn(['global_config']);
         $this->object->expects($this->once())
             ->method('getClassConfig')
             ->willReturn(['class_config']);
@@ -49,7 +46,6 @@ public function testGetPrioritizedConfig(): void
             ->method('getDataSetConfig')
             ->willReturn(['data_set_config']);
         $expectedResult = [
-            ['global_config'],
             ['class_config'],
             ['method_config'],
             ['data_set_config'],
@@ -275,7 +271,6 @@ private function processApply(array $existingFixtures, array $config): array
      */
     private function setConfig(array $config): void
     {
-        $this->object->setGlobalConfig([]);
         $this->object->setClassConfig([]);
         $this->object->setDataSetConfig([]);
         $this->object->setMethodConfig($config);