MQE-842: Update feature and story tags to map to test functions when generated

KevinBKozan · web-flow · commit e51d4afe7975 · 2018-03-12T18:12:44.000+02:00
- Stories/Features now generate at function level, not class level.
- updated verification tests
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class ActionGroupWithDataOverrideTestCest
 {
@@ -64,6 +62,8 @@ class ActionGroupWithDataOverrideTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class ActionGroupWithDataTestCest
 {
@@ -64,6 +62,8 @@ class ActionGroupWithDataTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class ActionGroupWithNoDefaultTestCest
 {
@@ -64,6 +62,8 @@ class ActionGroupWithNoDefaultTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class ActionGroupWithPersistedDataCest
 {
@@ -64,6 +62,8 @@ class ActionGroupWithPersistedDataCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class ActionGroupWithTopLevelPersistedDataCest
 {
@@ -64,6 +62,8 @@ class ActionGroupWithTopLevelPersistedDataCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class ArgumentWithSameNameAsElementCest
 {
@@ -64,6 +62,8 @@ class ArgumentWithSameNameAsElementCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class BasicActionGroupTestCest
 {
@@ -44,6 +42,8 @@ class BasicActionGroupTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Basic Functional Cest"})
- * @Stories({"MQE-305"})
  */
 class BasicFunctionalTestCest
 {
@@ -53,6 +51,8 @@ class BasicFunctionalTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Basic Functional Cest"})
+	 * @Stories({"MQE-305"})
 	 * @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
@@ -19,8 +19,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  * @Title("A Functional Cest")
  * @group functional
  * @group mergeTest
- * @Features({"Merge Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class BasicMergeTestCest
 {
@@ -55,6 +53,8 @@ class BasicMergeTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Merge Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class MergedActionGroupTestCest
 {
@@ -64,6 +62,8 @@ class MergedActionGroupTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Merge Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class MergedReferencesTestCest
 {
@@ -53,6 +51,8 @@ class MergedReferencesTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Merge Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @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
@@ -18,8 +18,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("A Functional Cest")
  * @group functional
- * @Features({"Action Group Functional Cest"})
- * @Stories({"MQE-433"})
  */
 class MultipleActionGroupsTestCest
 {
@@ -64,6 +62,8 @@ class MultipleActionGroupsTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"Action Group Functional Cest"})
+	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -295,6 +295,30 @@ private function generateMethodAnnotations($annotationType = null, $annotationNa
         $indent = "\t";
 
         switch ($annotationType) {
+            case "features":
+                $features = "";
+                foreach ($annotationName as $name) {
+                    $features .= sprintf("\"%s\"", $name);
+
+                    if (next($annotationName)) {
+                        $features .= ", ";
+                    }
+                }
+                $annotationToAppend .= sprintf("{$indent} * @Features({%s})\n", $features);
+                break;
+
+            case "stories":
+                $stories = "";
+                foreach ($annotationName as $name) {
+                    $stories .= sprintf("\"%s\"", $name);
+
+                    if (next($annotationName)) {
+                        $stories .= ", ";
+                    }
+                }
+                $annotationToAppend .= sprintf("{$indent} * @Stories({%s})\n", $stories);
+                break;
+
             case "severity":
                 $annotationToAppend = sprintf("{$indent} * @Severity(level = SeverityLevel::%s)\n", $annotationName[0]);
                 break;
@@ -327,29 +351,6 @@ private function generateClassAnnotations($annotationType, $annotationName)
         $annotationToAppend = null;
 
         switch ($annotationType) {
-            case "features":
-                $features = "";
-                foreach ($annotationName as $name) {
-                    $features .= sprintf("\"%s\"", $name);
-
-                    if (next($annotationName)) {
-                        $features .= ", ";
-                    }
-                }
-                $annotationToAppend .= sprintf(" * @Features({%s})\n", $features);
-                break;
-
-            case "stories":
-                $stories = "";
-                foreach ($annotationName as $name) {
-                    $stories .= sprintf("\"%s\"", $name);
-
-                    if (next($annotationName)) {
-                        $stories .= ", ";
-                    }
-                }
-                $annotationToAppend .= sprintf(" * @Stories({%s})\n", $stories);
-                break;
 
             case "title":
                 $annotationToAppend = sprintf(" * @Title(\"%s\")\n", $annotationName[0]);
