MQE-812: Tests/Action Groups should infer order based on the top level argument

- updated ActionGroups to work with this
- need verification tests still

Author: KevinBKozan

src/Magento/FunctionalTestingFramework/Test/Config/ActionGroupDom.php

@@ -30,9 +30,25 @@ public function initDom($xml, $filename = null, $exceptionCollector = null)
                 /** @var \DOMElement $actionGroupNode */
                 $actionGroupNode->setAttribute(self::TEST_META_FILENAME_ATTRIBUTE, $filename);
                 $this->validateDomStepKeys($actionGroupNode, $filename, 'Action Group', $exceptionCollector);
+                if ($actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_AFTER) !== "") {
+                    $this->appendMergePointerToActions(
+                        $actionGroupNode,
+                        self::TEST_MERGE_POINTER_AFTER,
+                        $actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_AFTER),
+                        $filename,
+                        $exceptionCollector
+                    );
+                } elseif ($actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_BEFORE) !== "") {
+                    $this->appendMergePointerToActions(
+                        $actionGroupNode,
+                        self::TEST_MERGE_POINTER_BEFORE,
+                        $actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_BEFORE),
+                        $filename,
+                        $exceptionCollector
+                    );
+                }
             }
         }
-
         return $dom;
     }
 }

src/Magento/FunctionalTestingFramework/Test/Config/Dom.php

@@ -17,8 +17,8 @@ class Dom extends \Magento\FunctionalTestingFramework\Config\Dom
     const TEST_META_FILENAME_ATTRIBUTE = 'filename';
     const TEST_META_NAME_ATTRIBUTE = 'name';
     const TEST_HOOK_NAMES = ["after", "before"];
-    const TEST_MERGE_POINTER_BEFORE = "before";
-    const TEST_MERGE_POINTER_AFTER = "after";
+    const TEST_MERGE_POINTER_BEFORE = "insertBefore";
+    const TEST_MERGE_POINTER_AFTER = "insertAfter";
 
     /**
      * TestDom constructor.

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

@@ -18,6 +18,8 @@ class ActionGroupObjectExtractor extends BaseObjectExtractor
     const DEFAULT_VALUE = 'defaultValue';
     const ACTION_GROUP_ARGUMENTS = 'arguments';
     const FILENAME = 'filename';
+    const ACTION_GROUP_INSERT_BEFORE = "insertBefore";
+    const ACTION_GROUP_INSERT_AFTER = "insertAfter";
 
     /**
      * Action Object Extractor for converting actions into objects
@@ -49,7 +51,9 @@ public function extractActionGroup($actionGroupData)
             self::NODE_NAME,
             self::ACTION_GROUP_ARGUMENTS,
             self::NAME,
-            self::FILENAME
+            self::FILENAME,
+            self::ACTION_GROUP_INSERT_BEFORE,
+            self::ACTION_GROUP_INSERT_AFTER
         );
 
         // TODO filename is now available to the ActionGroupObject, integrate this into debug and error statements

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

@@ -23,6 +23,9 @@ class TestObjectExtractor extends BaseObjectExtractor
     const TEST_FAILED_HOOK = 'failed';
     const TEST_BEFORE_ATTRIBUTE = 'before';
     const TEST_AFTER_ATTRIBUTE = 'after';
+    const TEST_INSERT_BEFORE = 'insertBefore';
+    const TEST_INSERT_AFTER = 'insertAfter';
+    const TEST_FILENAME = 'filename';
 
     /**
      * Action Object Extractor object
@@ -79,7 +82,9 @@ public function extractTestData($testData)
             self::TEST_BEFORE_HOOK,
             self::TEST_AFTER_HOOK,
             self::TEST_FAILED_HOOK,
-            'filename'
+            self::TEST_INSERT_BEFORE,
+            self::TEST_INSERT_AFTER,
+            self::TEST_FILENAME
         );
 
         if (array_key_exists(self::TEST_ANNOTATIONS, $testData)) {

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

@@ -33,6 +33,8 @@
         </xs:choice>
         <xs:attribute type="xs:string" name="name" use="required"/>
         <xs:attribute type="xs:string" name="filename"/>
+        <xs:attribute type="xs:string" name="insertBefore"/>
+        <xs:attribute type="xs:string" name="insertAfter"/>
     </xs:complexType>
     <xs:simpleType name="dataTypeEnum" final="restriction">
         <xs:restriction base="xs:string">

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

@@ -70,8 +70,8 @@
         <xs:attribute type="xs:string" name="name"/>
         <xs:attribute type="xs:boolean" name="remove" default="false"/>
         <xs:attribute type="xs:string" name="filename"/>
-        <xs:attribute type="xs:string" name="before"/>
-        <xs:attribute type="xs:string" name="after"/>
+        <xs:attribute type="xs:string" name="insertBefore"/>
+        <xs:attribute type="xs:string" name="insertAfter"/>
     </xs:complexType>
     <xs:group name="testTypeTags">
         <xs:choice>