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

- Test/Dom.php now checks for a test to have a before/after attribute, if found it appends the before/after to all child actions for merging down the line.

Author: KevinBKozan

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

@@ -17,6 +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";
 
     /**
      * TestDom constructor.
@@ -63,6 +65,23 @@ public function initDom($xml, $filename = null, $exceptionCollector = null)
                 /** @var \DOMElement $testNode */
                 $testNode->setAttribute(self::TEST_META_FILENAME_ATTRIBUTE, $filename);
                 $this->validateDomStepKeys($testNode, $filename, 'Test', $exceptionCollector);
+                if ($testNode->getAttribute(self::TEST_MERGE_POINTER_AFTER) !== "") {
+                    $this->appendMergePointerToActions(
+                        $testNode,
+                        self::TEST_MERGE_POINTER_AFTER,
+                        $testNode->getAttribute(self::TEST_MERGE_POINTER_AFTER),
+                        $filename,
+                        $exceptionCollector
+                    );
+                } elseif ($testNode->getAttribute(self::TEST_MERGE_POINTER_BEFORE) !== "") {
+                    $this->appendMergePointerToActions(
+                        $testNode,
+                        self::TEST_MERGE_POINTER_BEFORE,
+                        $testNode->getAttribute(self::TEST_MERGE_POINTER_BEFORE),
+                        $filename,
+                        $exceptionCollector
+                    );
+                }
             }
         }
 
@@ -83,6 +102,36 @@ public function merge($xml, $filename = null, $exceptionCollector = null)
         $this->mergeNode($dom->documentElement, '');
     }
 
+    /**
+     * Parses DOM Structure's actions and appends a before/after attribute along with the parent's stepkey reference.
+     *
+     * @param \DOMElement $testNode
+     * @param string $pointerType
+     * @param string $pointerKey
+     * @param string $filename
+     * @param ExceptionCollector $exceptionCollector
+     * @return void
+     */
+    protected function appendMergePointerToActions($testNode, $pointerType, $pointerKey, $filename, $exceptionCollector)
+    {
+        $childNodes = $testNode->childNodes;
+        for ($i = 0; $i < $childNodes->length; $i++) {
+            $currentNode = $childNodes->item($i);
+            if (!is_a($currentNode, \DOMElement::class)) {
+                continue;
+            }
+            if ($currentNode->hasAttribute('stepKey')) {
+                if ($currentNode->hasAttribute($pointerType) && $testNode->hasAttribute($pointerType)) {
+                    $errorMsg = "Actions cannot have a before/after pointer if they are in a test that provides a merge pointer.";
+                    $errorMsg .= "\n\tstepKey: {$currentNode->getAttribute('stepKey')}\tin file: {$filename}";
+                    $exceptionCollector->addError($filename, $errorMsg);
+                    continue;
+                }
+                $currentNode->setAttribute($pointerType, $pointerKey);
+            }
+        }
+    }
+
     /**
      * Parses an individual DOM structure for repeated stepKey attributes
      *

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

@@ -18,7 +18,7 @@ class ActionMergeUtil
 {
     const STEP_MISSING_ERROR_MSG =
         "Merge Error - Step could not be found in either TestXML or DeltaXML.
-        \t%s = '%s'\tTestStep='%s'\tLinkedStep'%s'";
+        \t%s: '%s'\tTestStep: '%s'\tLinkedStep: '%s'";
 
     const WAIT_ATTR = 'timeout';
     const WAIT_ACTION_NAME = 'waitForPageLoad';

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

@@ -21,6 +21,8 @@ class TestObjectExtractor extends BaseObjectExtractor
     const TEST_BEFORE_HOOK = 'before';
     const TEST_AFTER_HOOK = 'after';
     const TEST_FAILED_HOOK = 'failed';
+    const TEST_BEFORE_ATTRIBUTE = 'before';
+    const TEST_AFTER_ATTRIBUTE = 'after';
 
     /**
      * Action Object Extractor object
@@ -85,15 +87,15 @@ public function extractTestData($testData)
         }
 
         // extract before
-        if (array_key_exists(self::TEST_BEFORE_HOOK, $testData)) {
+        if (array_key_exists(self::TEST_BEFORE_HOOK, $testData) && is_array($testData[self::TEST_BEFORE_HOOK])) {
             $testHooks[self::TEST_BEFORE_HOOK] = $this->testHookObjectExtractor->extractHook(
                 $testData[self::NAME],
                 'before',
                 $testData[self::TEST_BEFORE_HOOK]
             );
         }
 
-        if (array_key_exists(self::TEST_AFTER_HOOK, $testData)) {
+        if (array_key_exists(self::TEST_AFTER_HOOK, $testData) && is_array($testData[self::TEST_AFTER_HOOK])) {
             // extract after
             $testHooks[self::TEST_AFTER_HOOK] = $this->testHookObjectExtractor->extractHook(
                 $testData[self::NAME],

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

@@ -70,6 +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:complexType>
     <xs:group name="testTypeTags">
         <xs:choice>