MQE-549: [Unit Test] ActionMergeUtil.php

Author: tomreece

dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php

@@ -16,23 +16,6 @@
 
 class ActionMergeUtilTest extends TestCase
 {
-    /**
-     * Static ActionMergeUtil for all tests.
-     *
-     * @var ActionMergeUtil
-     */
-    private static $MERGE_UTIL;
-
-    /**
-     * Set up method for ActionMergeUtil tests.
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        self::$MERGE_UTIL = new ActionMergeUtil("actionMergeUtilTest", "TestCase");
-    }
-
     /**
      * Test to validate actions are properly ordered during a merge.
      *
@@ -85,7 +68,8 @@ public function testResolveActionStepOrdering()
             ActionObject::MERGE_ACTION_ORDER_AFTER
         );
 
-        $orderedActions = self::$MERGE_UTIL->resolveActionSteps($actions);
+        $mergeUtil = new ActionMergeUtil("actionMergeUtilTest", "TestCase");
+        $orderedActions = $mergeUtil->resolveActionSteps($actions);
         $orderedActionKeys = array_keys($orderedActions);
 
         $this->assertEquals($testObjNamePosBeforeFirst, $orderedActionKeys[0]);
@@ -94,26 +78,6 @@ public function testResolveActionStepOrdering()
         $this->assertEquals($testObjNamePosAfterEnd, $orderedActionKeys[$actionsLength + 2]);
     }
 
-    /**
-     * Test to validate action steps properly resolve section element references.
-     *
-     * @return void
-     */
-    public function testResolveActionStepSectionData()
-    {
-        $this->markTestIncomplete('TODO');
-    }
-
-    /**
-     * Test to validate action steps properly resolve page references.
-     *
-     * @return void
-     */
-    public function testResolveActionStepPageData()
-    {
-        $this->markTestIncomplete('TODO');
-    }
-
     /**
      * Test to validate action steps properly resolve entity data references.
      *
@@ -149,4 +113,54 @@ public function testResolveActionStepEntityData()
 
         $this->assertEquals($dataFieldValue, $resolvedActions[$actionName]->getCustomActionAttributes()[$userInputKey]);
     }
+
+    /**
+     * Verify that an XmlException is thrown when an action references a non-existant action.
+     *
+     * @return void
+     */
+    public function testNoActionException()
+    {
+        $actionObjects = [];
+
+        $actionObjects[] = new ActionObject('actionKey1', 'bogusType', []);
+        $actionObjects[] = new ActionObject(
+            'actionKey2',
+            'bogusType',
+            [],
+            'badActionReference',
+            ActionObject::MERGE_ACTION_ORDER_BEFORE
+        );
+
+        $this->expectException("\Magento\FunctionalTestingFramework\Exceptions\XmlException");
+
+        $actionMergeUtil = new ActionMergeUtil("actionMergeUtilTest", "TestCase");
+        $actionMergeUtil->resolveActionSteps($actionObjects);
+    }
+
+    /**
+     * Verify that a <waitForPageLoad> action is added after actions that have a wait (timeout property).
+     *
+     * @return void
+     */
+    public function testInsertWait()
+    {
+        $actionObjectOne = new ActionObject('actionKey1', 'bogusType', []);
+        $actionObjectOne->setTimeout(42);
+        $actionObjects = [$actionObjectOne];
+
+        $actionMergeUtil = new ActionMergeUtil("actionMergeUtilTest", "TestCase");
+        $result = $actionMergeUtil->resolveActionSteps($actionObjects);
+
+        $actual = $result['actionKey1WaitForPageLoad'];
+        $expected = new ActionObject(
+            'actionKey1WaitForPageLoad',
+            'waitForPageLoad',
+            ['timeout' => 42],
+            'actionKey1',
+            0
+        );
+        $this->assertEquals($expected, $actual);
+
+    }
 }

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -169,6 +169,17 @@ public function getTimeout()
         return $this->timeout;
     }
 
+    /**
+     * Set the timeout value.
+     *
+     * @param int $timeout
+     * @return void
+     */
+    public function setTimeout($timeout)
+    {
+        $this->timeout = $timeout;
+    }
+
     /**
      * Populate the resolved custom attributes array with lookup values for the following attributes:
      *   selector
@@ -332,7 +343,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                     // If no Selector is defined, assume element has LocatorFunction
                     $replacement = $obj->getElement($objField)->getSelector() ?:
                         $obj->getElement($objField)->getLocatorFunction();
-                    $this->timeout = $obj->getElement($objField)->getTimeout();
+                    $this->setTimeout($obj->getElement($objField)->getTimeout());
                     break;
                 case (get_class($obj) == EntityDataObject::class):
                     list(,$objField) = $this->stripAndSplitReference($match);