MQE-516: Duplicated $data.key$ references are not replaced correctly

- replacement now always appends "" . and . "" to replacement, then strips if unecessary.
- edited expected output in verification tests.

Author: KevinBKozan

dev/tests/verification/Resources/ActionGroupFunctionalCest.txt

@@ -110,7 +110,7 @@ class ActionGroupFunctionalCest
 		$I->amOnPage("/" . $createPerson->getCreatedDataByName('firstname') . "/" . $createPerson->getCreatedDataByName('lastname') . ".html");
 		$I->fillField("#foo", $createPerson->getCreatedDataByName('firstname'));
 		$I->fillField("#bar", $createPerson->getCreatedDataByName('lastname'));
-		$I->searchAndMultiSelectOption("#foo", [$createPerson->getCreatedDataByName('firstname') . "", "" . $createPerson->getCreatedDataByName('lastname')]);
+		$I->searchAndMultiSelectOption("#foo", [$createPerson->getCreatedDataByName('firstname'), $createPerson->getCreatedDataByName('lastname')]);
 		$I->see("#element ." . $createPerson->getCreatedDataByName('firstname'));
 	}
 
@@ -124,7 +124,7 @@ class ActionGroupFunctionalCest
 		$I->amOnPage("/" . $this->createPersonParam->getCreatedDataByName('firstname') . "/" . $this->createPersonParam->getCreatedDataByName('lastname') . ".html");
 		$I->fillField("#foo", $this->createPersonParam->getCreatedDataByName('firstname'));
 		$I->fillField("#bar", $this->createPersonParam->getCreatedDataByName('lastname'));
-		$I->searchAndMultiSelectOption("#foo", [$this->createPersonParam->getCreatedDataByName('firstname') . "", "" . $this->createPersonParam->getCreatedDataByName('lastname')]);
+		$I->searchAndMultiSelectOption("#foo", [$this->createPersonParam->getCreatedDataByName('firstname'), $this->createPersonParam->getCreatedDataByName('lastname')]);
 		$I->see("#element ." . $this->createPersonParam->getCreatedDataByName('firstname'));
 	}
 

dev/tests/verification/Resources/ParameterArrayCest.txt

@@ -34,7 +34,7 @@ class ParameterArrayCest
 		$I->searchAndMultiSelectOption("#selector", [msq("simpleParamData")."prename"]);
 		$I->searchAndMultiSelectOption("#selector", ["postname".msq("simpleParamData")]);
 		$I->searchAndMultiSelectOption("#selector", [$simpleDataKey->getCreatedDataByName('name')]);
-		$I->searchAndMultiSelectOption("#selector", ["name", "" . $simpleDataKey->getCreatedDataByName('name')]);
+		$I->searchAndMultiSelectOption("#selector", ["name", $simpleDataKey->getCreatedDataByName('name')]);
 		$I->searchAndMultiSelectOption("#selector", ['someKey' => $simpleDataKey->getCreatedDataByName('name')]);
 		$I->searchAndMultiSelectOption("#selector", ['someKey' => "name"]);
 		$I->searchAndMultiSelectOption("#selector", ['someKey' => msq("simpleParamData")."prename"]);

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1001,31 +1001,12 @@ private function replaceMatchesIntoArg($matches, &$outputArg, $delimiter)
      */
     private function processQuoteBreaks($match, $argument, $replacement)
     {
-        $outputArg = $argument;
-        $beforeIndex = strpos($outputArg, $match) - 1;
-        $afterIndex = $beforeIndex + strlen($match) + 1;
-
-        $quoteBefore = false;
-        // Determine if there is a " before/after the $match, and if there is only one " before/after match.
-        if ($beforeIndex == 0
-            || ($argument[$beforeIndex] == '"' && substr_count($argument, '"', 0, $beforeIndex) < 1)) {
-            $quoteBefore = true;
-        }
-        $quoteAfter = $argument[$afterIndex] == '"' && substr_count($argument, '"', $afterIndex+1) < 1;
+        $outputArg = str_replace($match, '" . ' . $replacement . ' . "', $argument);
 
-        //Remove quotes at either end of argument if they aren't necessary. Add double-quote concatenation 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);
+        //Sanitize string of any unnecessary '"" .' and '. ""'.
+        //Regex means: Search for '"" . ' but not '\"" . '  and ' . ""'.
+        //Matches on '"" . ' and ' . ""', but not on '\"" . ' and ' . "\"'.
+        $outputArg = preg_replace('/(?(?<![\\\\])"" \. )| \. ""/', "", $outputArg);
         return $outputArg;
     }