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

KevinBKozan · imeron2433 · commit 8660040619b2 · 2018-02-23T16:21:39.000-06:00
- annotationKey Severity =&gt; severity
- changed transformAllure to take in string
- verification test fixes.
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt
@@ -63,7 +63,7 @@ class ActionGroupWithDataOverrideTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt
@@ -63,7 +63,7 @@ class ActionGroupWithDataTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt
@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
 {
 	/**
-	 * @Severity(level = SeverityLevel::SEVERE)
+	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt
@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
 {
 	/**
-	 * @Severity(level = SeverityLevel::SEVERE)
+	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt b/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt
@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithNoArgumentsCest
 {
 	/**
-	 * @Severity(level = SeverityLevel::SEVERE)
+	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt
@@ -63,7 +63,7 @@ class ActionGroupWithNoDefaultTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt
@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithPassedArgumentAndStringSelectorParamCest
 {
 	/**
-	 * @Severity(level = SeverityLevel::SEVERE)
+	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt
@@ -63,7 +63,7 @@ class ActionGroupWithPersistedDataCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt
@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest
 {
 	/**
-	 * @Severity(level = SeverityLevel::SEVERE)
+	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt
@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest
 {
 	/**
-	 * @Severity(level = SeverityLevel::SEVERE)
+	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt
@@ -63,7 +63,7 @@ class ActionGroupWithTopLevelPersistedDataCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt
@@ -63,7 +63,7 @@ class ArgumentWithSameNameAsElementCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/BasicActionGroupTest.txt b/dev/tests/verification/Resources/BasicActionGroupTest.txt
@@ -43,7 +43,7 @@ class BasicActionGroupTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/BasicFunctionalTest.txt b/dev/tests/verification/Resources/BasicFunctionalTest.txt
@@ -52,7 +52,7 @@ class BasicFunctionalTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/BasicMergeTest.txt b/dev/tests/verification/Resources/BasicMergeTest.txt
@@ -54,7 +54,7 @@ class BasicMergeTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/MergedActionGroupTest.txt b/dev/tests/verification/Resources/MergedActionGroupTest.txt
@@ -63,7 +63,7 @@ class MergedActionGroupTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/MergedReferencesTest.txt b/dev/tests/verification/Resources/MergedReferencesTest.txt
@@ -52,7 +52,7 @@ class MergedReferencesTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt
@@ -63,7 +63,7 @@ class MultipleActionGroupsTestCest
 	}
 
 	/**
-	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Severity(level = SeverityLevel::MAJOR)
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/dev/tests/verification/TestModule/Test/ActionGroupTest.xml b/dev/tests/verification/TestModule/Test/ActionGroupTest.xml
@@ -9,15 +9,15 @@
         xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="ActionGroupWithNoArguments">
         <annotations>
-            <severity value="SEVERE"/>
+            <severity value="BLOCKER"/>
             <title value="Action Group With No Argument"/>
         </annotations>
         <actionGroup ref="actionGroupWithoutArguments" stepKey="actionGroup"/>
     </test>
 
     <test name="ActionGroupWithDefaultArgumentAndStringSelectorParam">
         <annotations>
-            <severity value="SEVERE"/>
+            <severity value="BLOCKER"/>
             <title value="Action Group With Default Argument Value and Hardcoded Value in Param"/>
         </annotations>
 
@@ -26,7 +26,7 @@
 
     <test name="ActionGroupWithPassedArgumentAndStringSelectorParam">
         <annotations>
-            <severity value="SEVERE"/>
+            <severity value="BLOCKER"/>
             <title value="Action Group With Passed Argument Value and Hardcoded Value in Param"/>
         </annotations>
 
@@ -37,7 +37,7 @@
 
     <test name="ActionGroupWithSingleParameterSelectorFromDefaultArgument">
         <annotations>
-            <severity value="SEVERE"/>
+            <severity value="BLOCKER"/>
             <title value="Action Group With Default Argument Value and Argument Value in Param"/>
         </annotations>
 
@@ -46,7 +46,7 @@
 
     <test name="ActionGroupWithSingleParameterSelectorFromPassedArgument">
         <annotations>
-            <severity value="SEVERE"/>
+            <severity value="BLOCKER"/>
             <title value="Action Group With Passed Argument Value and Argument Value in Param"/>
         </annotations>
 
@@ -57,7 +57,7 @@
 
     <test name="ActionGroupWithMultipleParameterSelectorsFromDefaultArgument">
         <annotations>
-            <severity value="SEVERE"/>
+            <severity value="BLOCKER"/>
             <title value="Action Group With Passed Argument Value and Multiple Argument Values in Param"/>
         </annotations>
 
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/AnnotationExtractor.php b/src/Magento/FunctionalTestingFramework/Test/Util/AnnotationExtractor.php
@@ -46,8 +46,10 @@ public function extractAnnotations($testAnnotations)
         foreach ($annotations as $annotationKey => $annotationData) {
             $annotationValues = [];
             // Only transform severity annotation
-            if ($annotationKey == "Severity") {
-                $annotationObjects[$annotationKey] = $this->transformAllureSeverityToMagento($annotationData);
+            if ($annotationKey == "severity") {
+                $annotationObjects[$annotationKey] = $this->transformAllureSeverityToMagento(
+                    $annotationData[0]['value']
+                );
                 continue;
             }
 
@@ -64,12 +66,12 @@ public function extractAnnotations($testAnnotations)
      * This method transforms Magento severity values from Severity annotation
      * Returns Allure annotation value
      *
-     * @param array $annotationData
+     * @param string $annotationData
      * @return array
      */
     public function transformAllureSeverityToMagento($annotationData)
     {
-        $annotationValue = strtoupper($annotationData[0]);
+        $annotationValue = strtoupper($annotationData);
         //Mapping Magento severity to Allure Severity
         //Attempts to resolve annotationValue reference against MAGENTO_TO_ALLURE_SEVERITY_MAP -
         // if not found returns without modification

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class ActionGroupWithDataOverrideTestCest`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`66`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`67`	`67`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`68`	`68`	`* @param AcceptanceTester $I`
`69`	`69`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;`
`21`	`21`	`class ActionGroupWithDefaultArgumentAndStringSelectorParamCest`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`		`- * @Severity(level = SeverityLevel::SEVERE)`
	`24`	`+ * @Severity(level = SeverityLevel::BLOCKER)`
`25`	`25`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`26`	`26`	`* @param AcceptanceTester $I`
`27`	`27`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class ArgumentWithSameNameAsElementCest`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`66`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`67`	`67`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`68`	`68`	`* @param AcceptanceTester $I`
`69`	`69`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class BasicActionGroupTestCest`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`46`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`47`	`47`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`48`	`48`	`* @param AcceptanceTester $I`
`49`	`49`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class BasicFunctionalTestCest`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`55`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`56`	`56`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`57`	`57`	`* @param AcceptanceTester $I`
`58`	`58`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class BasicMergeTestCest`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
`57`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`57`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`58`	`58`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`59`	`59`	`* @param AcceptanceTester $I`
`60`	`60`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class MergedActionGroupTestCest`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`66`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`67`	`67`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`68`	`68`	`* @param AcceptanceTester $I`
`69`	`69`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class MergedReferencesTestCest`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`55`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`56`	`56`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`57`	`57`	`* @param AcceptanceTester $I`
`58`	`58`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class MultipleActionGroupsTestCest`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * @Severity(level = SeverityLevel::CRITICAL)`
	`66`	`+ * @Severity(level = SeverityLevel::MAJOR)`
`67`	`67`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`68`	`68`	`* @param AcceptanceTester $I`
`69`	`69`	`* @return void`