MQE-1068: Require Issue ID for Skipped Test

- Removed IssueId comment generator
- Updated Tests
- Added merge test

Author: aljcalandra

dev/tests/verification/Resources/MergeSkip.txt

@@ -0,0 +1,34 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class MergeSkipCest
+{
+	/**
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function MergeSkip(AcceptanceTester $I, \Codeception\Scenario $scenario)
+	{
+		$scenario->skip("This test is skipped");
+	}
+}

dev/tests/verification/Resources/SkippedTest.txt

@@ -19,7 +19,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("skippedTest")
  * @Description("")
- * @skipIssueId SkippedValue
  */
 class SkippedTestCest
 {

dev/tests/verification/Resources/SkippedTestTwoIssues.txt

@@ -19,8 +19,6 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("skippedMultipleIssuesTest")
  * @Description("")
- * @skipIssueId SkippedValue
- * @skipIssueId SecondSkippedValue
  */
 class SkippedTestTwoIssuesCest
 {

dev/tests/verification/TestModule/Test/MergeFunctionalTest.xml

@@ -55,4 +55,7 @@
         <click stepKey="clickTwo" selector="#mergeTwo"/>
         <click stepKey="clickThree" selector="#mergeThree"/>
     </test>
+    <test name="MergeSkip">
+        <comment userInput="ThisTestShouldBeSkipped" stepKey="skipComment"/>
+    </test>
 </tests>

dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml

@@ -26,4 +26,11 @@
         <click stepKey="step10" selector="#step10MergedInResult"/>
         <actionGroup ref="FunctionalActionGroupWithData" stepKey="step8Merge" after="step7Merge"/>
     </test>
+    <test name="MergeSkip">
+        <annotations>
+            <skip>
+                <issueId value="Issue5"/>
+            </skip>
+        </annotations>
+    </test>
 </tests>

dev/tests/verification/Tests/MergedGenerationTest.php

@@ -62,4 +62,15 @@ public function testMergeMassViaInsertAfter()
     {
         $this->generateAndCompareTest('MergeMassViaInsertAfter');
     }
+
+    /**
+     * Tests generation of a test skipped in merge.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergeSkipGeneration()
+    {
+        $this->generateAndCompareTest('MergeSkip');
+    }
 }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -437,12 +437,6 @@ private function generateClassAnnotations($annotationType, $annotationName)
                     $annotationToAppend .= sprintf(" * @group %s\n", $group);
                 }
                 break;
-
-            case "skip":
-                foreach ($annotationName as $issue) {
-                    $annotationToAppend .= sprintf(" * @skipIssueId %s\n", $issue);
-                }
-                break;
         }
 
         return $annotationToAppend;