MQE-463: Bad output with parameterized persisted unique data when using selector1 and selector2 attributes

- Added addUniquenessFunctionCall to selector1/2 attributes.

Author: KevinBKozan

dev/tests/verification/Resources/PersistedReplacementCest.txt

@@ -65,5 +65,7 @@ class PersistedReplacementCest
 		$I->click("#element ." . $uniqueData->getCreatedDataByName('firstname'));
 		$I->click("#" . $uniqueData->getCreatedDataByName('firstname') . " .success");
 		$I->click("#" . $uniqueData->getCreatedDataByName('firstname'));
+		$I->dragAndDrop($uniqueData->getCreatedDataByName('firstname'), $uniqueData->getCreatedDataByName('firstname'));
+		$I->dragAndDrop("#element ." . $uniqueData->getCreatedDataByName('firstname'), "#" . $uniqueData->getCreatedDataByName('firstname') . " .success");
 	}
 }

dev/tests/verification/TestModule/Cest/persistedReplacementCest.xml

@@ -57,6 +57,11 @@
             <click selector="{{SampleSection.oneParamElement($uniqueData.firstname$)}}" mergeKey="h3"/>
             <click selector="{{SampleSection.twoParamElement($uniqueData.firstname$,'success')}}" mergeKey="h4"/>
             <click selector="#$uniqueData.firstname$" mergeKey="h5"/>
+
+            <!-- selector1/2 replacement -->
+            <dragAndDrop selector1="$uniqueData.firstname$" selector2="$uniqueData.firstname$" mergeKey="j1"/>
+            <dragAndDrop selector1="{{SampleSection.oneParamElement($uniqueData.firstname$)}}" selector2="{{SampleSection.twoParamElement($uniqueData.firstname$,'success')}}" mergeKey="j2"/>
+
         </test>
     </cest>
 </config>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -391,11 +391,11 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
             }
 
             if (isset($customActionAttributes['selector1'])) {
-                $selector1 = $this->wrapWithDoubleQuotes($customActionAttributes['selector1']);
+                $selector1 = $this->addUniquenessFunctionCall($customActionAttributes['selector1']);
             }
 
             if (isset($customActionAttributes['selector2'])) {
-                $selector2 = $this->wrapWithDoubleQuotes($customActionAttributes['selector2']);
+                $selector2 = $this->addUniquenessFunctionCall($customActionAttributes['selector2']);
             }
 
             if (isset($customActionAttributes['x'])) {