MQE-496: Allow passing multiple ActionGroup arguments into parameterized selector.

- persisted Data fixes to Anthoula's patch.

Author: KevinBKozan

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

@@ -172,6 +172,7 @@ private function replaceAttributeArgumentInVariable(
         $variableName = strstr($variable, '.', true);
         // Check if arguments has a mapping for the given variableName
 
+
         if ($variableName === false) {
             $variableName = $variable;
         }
@@ -218,11 +219,12 @@ private function replacePersistedArgument($replacement, $attributeValue, $fullVa
 
         // parameter replacements require changing of (arg.field) to ($arg.field$)
         if ($isParameter) {
-            $newAttributeValue = str_replace($fullVariable, $scope . $fullVariable . $scope, $newAttributeValue);
+            $fullReplacement = str_replace($variable, trim($replacement, '$'), $fullVariable);
+            $newAttributeValue = str_replace($fullVariable, $scope . $fullReplacement . $scope, $newAttributeValue);
         } else {
             $newAttributeValue = str_replace('{{', $scope, str_replace('}}', $scope, $newAttributeValue));
+            $newAttributeValue = str_replace($variable, trim($replacement, '$'), $newAttributeValue);
         }
-        $newAttributeValue = str_replace($variable, trim($replacement, '$'), $newAttributeValue);
 
         return $newAttributeValue;
     }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -913,6 +913,7 @@ private function resolveTestVariable($inputString, $args)
      */
     private function replaceMatchesIntoArg($matches, &$outputArg, $delimiter)
     {
+        $matches = array_unique($matches);
         foreach ($matches as $match) {
             $replacement = null;
             $variable = $this->stripAndSplitReference($match, $delimiter);
@@ -953,22 +954,24 @@ private function processQuoteBreaks($match, $argument, $replacement)
         $quoteBefore = true;
         $quoteAfter = true;
 
-        // Prepare replacement with quote breaks if needed
-        if ($argument[$beforeIndex] != "\"") {
-            $replacement = '" . ' . $replacement;
+        // Determine if there is a Single quote before/after the $match, and if there is only 1 quote before/after.
+        if ($argument[$beforeIndex] != '"' || substr_count($argument, '"', 0, $beforeIndex+1)>1) {
             $quoteBefore = false;
         }
-        if ($argument[$afterIndex] != "\"") {
-            $replacement = $replacement . ' . "';
+        if ($argument[$afterIndex] != '"' || substr_count($argument, '"', $afterIndex)>1) {
             $quoteAfter = false;
         }
-        //Remove quotes at either end of argument if they aren't necessary.
+        //Remove quotes at either end of argument if they aren't necessary. Add quote breaking if needed
         if ($quoteBefore) {
             $outputArg = substr($outputArg, 0, $beforeIndex) . substr($outputArg, $beforeIndex+1);
             $afterIndex--;
+        } else {
+            $replacement = '" . ' . $replacement;
         }
         if ($quoteAfter) {
             $outputArg = substr($outputArg, 0, $afterIndex) . substr($outputArg, $afterIndex+1);
+        } else {
+            $replacement = $replacement . ' . "';
         }
         $outputArg = str_replace($match, $replacement, $outputArg);
         return $outputArg;