MQE-561: [ALLURE] Add an enum to the "Severity" annotation xml schema.

- Added enum of Magento severity values to mergedtestschema.xsd
- Added conditional to AnnotationExtractor.php to check if anotation is "Severity"
- Added method transformAllureSeveritytoMagento to AnnotationExtractor.php to transform Magento severity to Allure severity

Author: magterskine

src/Magento/FunctionalTestingFramework/Test/Util/AnnotationExtractor.php

@@ -12,6 +12,13 @@
 class AnnotationExtractor extends BaseObjectExtractor
 {
     const ANNOTATION_VALUE = 'value';
+    const MAGENTO_TO_ALLURE_SEVERITY_MAP = [
+        "BLOCKER" => "BLOCKER",
+        "CRITICAL" => "MAJOR",
+        "MAJOR" => "NORMAL",
+        "AVERAGE" => "MINOR",
+        "MINOR" => "TRIVIAL"
+    ];
 
     /**
      * AnnotationExtractor constructor.
@@ -30,19 +37,44 @@ public function __construct()
      */
     public function extractAnnotations($testAnnotations)
     {
+
         $annotationObjects = [];
         $annotations = $this->stripDescriptorTags($testAnnotations, self::NODE_NAME);
 
         // parse the Test annotations
+
         foreach ($annotations as $annotationKey => $annotationData) {
             $annotationValues = [];
+            // Only transform severity annotation
+            if ($annotationKey == "Severity") {
+                $annotationObjects[$annotationKey] = $this->transformAllureSeverityToMagento($annotationData);
+                continue;
+            }
+
             foreach ($annotationData as $annotationValue) {
                 $annotationValues[] = $annotationValue[self::ANNOTATION_VALUE];
             }
-
             $annotationObjects[$annotationKey] = $annotationValues;
         }
 
         return $annotationObjects;
     }
+
+    /**
+     * This method transforms Magento severity values from Severity annotation
+     * Returns Allure annotation value
+     *
+     * @param array $annotationData
+     * @return array
+     */
+    public function transformAllureSeverityToMagento($annotationData)
+    {
+        $annotationValue = strtoupper($annotationData[0]);
+        //Mapping Magento severity to Allure Severity
+        //Attempts to resolve annotationValue reference against MAGENTO_TO_ALLURE_SEVERITY_MAP -
+        // if not found returns without modification
+        $allureAnnotation[] = self::MAGENTO_TO_ALLURE_SEVERITY_MAP[$annotationValue] ?? $annotationValue;
+
+        return $allureAnnotation;
+    }
 }

src/Magento/FunctionalTestingFramework/Test/etc/mergedTestSchema.xsd

@@ -25,20 +25,36 @@
             <xs:element type="annotationType" name="stories" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="annotationType" name="title" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="annotationType" name="description" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element type="annotationType" name="severity" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element type="severityType" name="severity" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="annotationType" name="testCaseId" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="annotationType" name="useCaseId" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="annotationType" name="group" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="annotationType" name="return" minOccurs="0" maxOccurs="unbounded"/>
         </xs:choice>
     </xs:complexType>
+    <xs:simpleType name="severityEnum" final="restriction">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="MINOR"/>
+            <xs:enumeration value="AVERAGE"/>
+            <xs:enumeration value="MAJOR"/>
+            <xs:enumeration value="BLOCKER"/>
+            <xs:enumeration value="CRITICAL"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:complexType name="annotationType">
         <xs:simpleContent>
             <xs:extension base="xs:string">
                 <xs:attribute type="xs:string" name="value" use="required"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:complexType name="severityType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute type="severityEnum" name="value" use="required"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
     <xs:complexType name="hookType">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
             <xs:group ref="testTypeTags"/>