MQE-2008: Filter test generation and execution by severity

Author: okolesnyk

src/Magento/FunctionalTestingFramework/Filter/Test/Severity.php

@@ -10,6 +10,7 @@
 
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Filter\FilterInterface;
+use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
 
 /**
  * Class Severity
@@ -51,17 +52,17 @@ public function __construct(array $filterValues = [])
     /**
      * Filter tests by severity.
      *
-     * @param array $tests
+     * @param TestObject[] $tests
      * @return void
      */
     public function filter(array &$tests)
     {
+        /** @var TestObject $test */
         foreach ($tests as $testName => $test) {
-            if (is_array($test) && !empty($test['annotations'][self::ANNOTATION_TAG])) {
-                foreach ($test['annotations'][self::ANNOTATION_TAG] as $severity) {
-                    if (!in_array($severity['value'], $this->filterValues, true)) {
-                        unset($tests[$testName]);
-                    }
+            $severities = $test->getAnnotationByName(self::ANNOTATION_TAG);
+            foreach ($severities as $severity) {
+                if (!in_array($severity, $this->filterValues, true)) {
+                    unset($tests[$testName]);
                 }
             }
         }

src/Magento/FunctionalTestingFramework/Suite/Objects/SuiteObject.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\FunctionalTestingFramework\Suite\Objects;
 
+use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
+use Magento\FunctionalTestingFramework\Filter\FilterInterface;
 use Magento\FunctionalTestingFramework\Test\Objects\TestHookObject;
 use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
 use Magento\FunctionalTestingFramework\Util\Logger\LoggingUtil;
@@ -97,12 +99,10 @@ private function resolveTests($includeTests, $excludeTests)
             unset($finalTestList[$testName]);
         }
 
-        if (empty($finalTestList)) {
-            LoggingUtil::getInstance()->getLogger(self::class)->notification(
-                "Current suite configuration for " . $this->name . " contains no tests." . PHP_EOL,
-                [],
-                true
-            );
+        $filters = MftfApplicationConfig::getConfig()->getFilterList()->getFilters();
+        /** @var FilterInterface $filter */
+        foreach ($filters as $filter) {
+            $filter->filter($finalTestList);
         }
 
         return $finalTestList;

src/Magento/FunctionalTestingFramework/Suite/SuiteGenerator.php

@@ -95,6 +95,12 @@ public function generateAllSuites($testManifest)
         $suites = $testManifest->getSuiteConfig();
 
         foreach ($suites as $suiteName => $suiteContent) {
+            if (empty($suiteContent)) {
+                LoggingUtil::getInstance()->getLogger(self::class)->notification(
+                    "Suite '" . $suiteName . "' contains no tests and won't be generated." . PHP_EOL, [], true
+                );
+                continue;
+            }
             $firstElement = array_values($suiteContent)[0];
 
             // if the first element is a string we know that we simply have an array of tests

src/Magento/FunctionalTestingFramework/Test/Handlers/TestObjectHandler.php

@@ -24,6 +24,8 @@
  */
 class TestObjectHandler implements ObjectHandlerInterface
 {
+    const XML_ROOT = 'tests';
+
     /**
      * Test Object Handler
      *

src/Magento/FunctionalTestingFramework/Test/Parsers/TestDataParser.php

@@ -22,11 +22,6 @@ class TestDataParser
      */
     private $testData;
 
-    /**
-     * @var \Magento\FunctionalTestingFramework\Filter\FilterList
-     */
-    private $filterList;
-
     /**
      * TestDataParser constructor.
      *
@@ -38,8 +33,6 @@ public function __construct(DataInterface $testData)
         $this->testData = array_filter($testData->get('tests'), function ($value) {
             return is_array($value);
         });
-
-        $this->filterList = MftfApplicationConfig::getConfig()->getFilterList();
     }
 
     /**
@@ -50,15 +43,6 @@ public function __construct(DataInterface $testData)
      */
     public function readTestData()
     {
-        /** @var FilterInterface $filter */
-        foreach ($this->filterList->getFilters() as $filter) {
-            $filter->filter($this->testData);
-        }
-
-        if (empty($this->testData)) {
-            throw new TestFrameworkException("No tests found.");
-        }
-
         return $this->testData;
     }
 }

src/Magento/FunctionalTestingFramework/Util/Manifest/DefaultTestManifest.php

@@ -86,6 +86,9 @@ public function generate()
     protected function generateSuiteEntries($fileResource)
     {
         foreach ($this->getSuiteConfig() as $suiteName => $tests) {
+            if (count($tests) === 0) {
+                continue;
+            }
             $line = "-g {$suiteName}";
             fwrite($fileResource, $line . PHP_EOL);
         }

src/Magento/FunctionalTestingFramework/Util/Manifest/ParallelTestManifest.php

@@ -132,7 +132,7 @@ private function generateGroupFile($testGroup, $nodeNumber, $suites)
             $fileResource = fopen($this->dirPath . DIRECTORY_SEPARATOR . "group{$nodeNumber}.txt", 'a');
 
             $line = null;
-            if (array_key_exists($entryName, $suites)) {
+            if (!empty($suites[$entryName])) {
                 $line = "-g {$entryName}";
             } else {
                 $line = $this->relativeDirPath . DIRECTORY_SEPARATOR . $entryName . '.php';

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -11,6 +11,7 @@
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;
+use Magento\FunctionalTestingFramework\Filter\FilterInterface;
 use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
 use Magento\FunctionalTestingFramework\Test\Handlers\ActionGroupObjectHandler;
 use Magento\FunctionalTestingFramework\Test\Handlers\TestObjectHandler;
@@ -171,6 +172,9 @@ private function loadAllTestObjects($testsToIgnore)
     {
         if ($this->tests === null || empty($this->tests)) {
             $testObjects = TestObjectHandler::getInstance()->getAllObjects();
+
+
+
             return array_diff_key($testObjects, $testsToIgnore);
         }
 
@@ -288,6 +292,12 @@ private function assembleAllTestPhp($testManifest, array $testsToIgnore)
         /** @var TestObject[] $testObjects */
         $testObjects = $this->loadAllTestObjects($testsToIgnore);
         $cestPhpArray = [];
+        $filters = MftfApplicationConfig::getConfig()->getFilterList()->getFilters();
+        /** @var FilterInterface $filter */
+        foreach ($filters as $filter) {
+            $filter->filter($testObjects);
+        }
+
 
         foreach ($testObjects as $test) {
             // Do not generate test if it is an extended test and parent does not exist