MQE-1963: Update XSD Schema to verify that file has only single entity

Author: jilu1

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

@@ -14,7 +14,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
  * @group functional
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/MergedActionGroupTest.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupWithDataOverrideTest.xml<br>")
  */
 class ActionGroupWithDataOverrideTestCest
 {

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("[NO TESTCASEID]: A Functional Cest")
  * @group functional
- * @Description("<h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest/MergeMassViaInsertAfter.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest/BasicFunctionalTest.xml<br>")
  */
 class BasicFunctionalTestCest
 {

dev/tests/verification/Resources/MergeMassViaInsertBefore.txt

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest/MergeMassViaInsertAfter.xml<br>verification/TestModule/Test/MergeFunctionalTest/MergeMassViaInsertBefore.xml<br>")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest/MergeMassViaInsertBefore.xml<br>verification/TestModule/Test/MergeFunctionalTest/MergeMassViaInsertBefore.xml<br>")
  */
 class MergeMassViaInsertBeforeCest
 {

dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml renamed to dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest/BasicMergeTest.xml

@@ -5,9 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BasicMergeTest">
         <annotations>
             <group value="mergeTest"/>
@@ -26,11 +25,4 @@
         <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/TestModuleMerged/Test/MergeFunctionalTest/MergeSkip.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="MergeSkip">
+        <annotations>
+            <skip>
+                <issueId value="Issue5"/>
+            </skip>
+        </annotations>
+    </test>
+</tests>

dev/tests/verification/Tests/BasicCestGenerationTest.php

@@ -10,6 +10,7 @@
 class BasicCestGenerationTest extends MftfTestCase
 {
     /**
+     * BasicFunctionalTest:
      * Tests flat generation of a hardcoded test file with no external references.
      *
      * @throws \Exception
@@ -20,6 +21,30 @@ public function testBasicGeneration()
         $this->generateAndCompareTest('BasicFunctionalTest');
     }
 
+    /**
+     * MergeMassViaInsertAfter:
+     * Tests flat generation of a hardcoded test file with no external references.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergeMassViaInsertAfter()
+    {
+        $this->generateAndCompareTest('MergeMassViaInsertAfter');
+    }
+
+    /**
+     * MergeMassViaInsertBefore:
+     * Tests flat generation of a hardcoded test file with no external references.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testMergeMassViaInsertBefore()
+    {
+        $this->generateAndCompareTest('MergeMassViaInsertBefore');
+    }
+
     /**
      * Tests flat generation of a hardcoded test file with no external references and with XML comments in:
      * - root `tests` element