MQE-2008: Filter test generation and execution by severity

Author: okolesnyk

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

@@ -11,20 +11,14 @@
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Filter\FilterInterface;
 use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
+use Magento\FunctionalTestingFramework\Test\Util\AnnotationExtractor;
 
 /**
  * Class Severity
  */
 class Severity implements FilterInterface
 {
     const ANNOTATION_TAG = 'severity';
-    const SEVERITY_VALUES = [
-        "BLOCKER",
-        "CRITICAL",
-        "MAJOR",
-        "AVERAGE",
-        "MINOR",
-    ];
 
     /**
      * @var array
@@ -39,14 +33,18 @@ class Severity implements FilterInterface
      */
     public function __construct(array $filterValues = [])
     {
-        if (array_diff($filterValues, self::SEVERITY_VALUES) ==! []) {
-            throw new TestFrameworkException(
-                'Not existing severity specified.' . PHP_EOL
-                . 'Possible values: '. implode(', ', self::SEVERITY_VALUES) . '.' . PHP_EOL
-                . 'Provided values: ' . implode(', ', $filterValues) . '.'  . PHP_EOL
-            );
+        $severityValues = AnnotationExtractor::MAGENTO_TO_ALLURE_SEVERITY_MAP;
+
+        foreach ($filterValues as $filterValue) {
+            if (!isset($severityValues[$filterValue])) {
+                throw new TestFrameworkException(
+                    'Not existing severity specified.' . PHP_EOL
+                    . 'Possible values: '. implode(', ', array_keys($severityValues)) . '.' . PHP_EOL
+                    . 'Provided values: ' . implode(', ', $filterValues) . '.'  . PHP_EOL
+                );
+            }
+            $this->filterValues[] = $severityValues[$filterValue];
         }
-        $this->filterValues = $filterValues;
     }
 
     /**

src/Magento/FunctionalTestingFramework/Suite/SuiteGenerator.php

@@ -97,7 +97,9 @@ public function generateAllSuites($testManifest)
         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
+                    "Suite '" . $suiteName . "' contains no tests and won't be generated." . PHP_EOL,
+                    [],
+                    true
                 );
                 continue;
             }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -172,9 +172,6 @@ private function loadAllTestObjects($testsToIgnore)
     {
         if ($this->tests === null || empty($this->tests)) {
             $testObjects = TestObjectHandler::getInstance()->getAllObjects();
-
-
-
             return array_diff_key($testObjects, $testsToIgnore);
         }
 
@@ -298,7 +295,6 @@ private function assembleAllTestPhp($testManifest, array $testsToIgnore)
             $filter->filter($testObjects);
         }
 
-
         foreach ($testObjects as $test) {
             // Do not generate test if it is an extended test and parent does not exist
             if ($test->isSkipped() && !empty($test->getParentName())) {