Resolved conflicts

Author: Manjusha.S

dev/tests/verification/Resources/DataActionsTest.txt

@@ -32,6 +32,8 @@ class DataActionsTestCest
 		$I->createEntity("createdInBefore", "hook", "entity", [], []); // stepKey: createdInBefore
 		$I->updateEntity("createdInBefore", "hook", "entity",[]); // stepKey: updateInBefore
 		$I->deleteEntity("createdInBefore", "hook"); // stepKey: deleteInBefore
+		$customerFields['lastname'] = "foo61f90e3156e25";
+		$I->createEntity("customer", "hook", "Simple_Customer_Without_Address", [], $customerFields); // stepKey: customer
 		$I->comment('[END BEFORE HOOK]');
 	}
 

dev/tests/verification/TestModule/Test/DataActionsTest.xml

@@ -13,6 +13,9 @@
             <createData entity="entity" stepKey="createdInBefore"/>
             <updateData entity="entity" createDataKey="createdInBefore" stepKey="updateInBefore"/>
             <deleteData createDataKey="createdInBefore" stepKey="deleteInBefore"/>
+            <createData stepKey="customer" entity="Simple_Customer_Without_Address">
+                <field key="lastname" unique="suffix" >foo</field>
+            </createData>
 
         </before>
         <waitForElementClickable selector=".functionalTestSelector" time="30" stepKey="waitForElementClickable" />

src/Magento/FunctionalTestingFramework/Test/etc/Actions/dataActions.xsd

@@ -125,14 +125,32 @@
         </xs:simpleContent>
     </xs:complexType>
 
+
     <xs:complexType name="additionalFieldType">
-        <xs:annotation>
-            <xs:documentation>field used to override defined fields from metadata or existing data definitions, during operation.</xs:documentation>
-        </xs:annotation>
         <xs:simpleContent>
             <xs:extension base="xs:string">
-                <xs:attribute name="key" use="required"/>
+                <xs:attribute type="xs:string" name="key" use="optional">
+                    <xs:annotation>
+                        <xs:documentation>xp
+                            Key attribute of data/value pair.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+                <xs:attribute type="uniquenessEnumType" name="unique" use="optional">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Add suite or test wide unique sequence as "prefix" or "suffix" to the data value if specified.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
-</xs:schema>
+
+    <xs:simpleType name="uniquenessEnumType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="prefix" />
+            <xs:enumeration value="suffix" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -525,7 +525,11 @@ private function generateMethodAnnotations($annotationType = null, $annotationNa
                 break;
 
             case null:
-                $annotationToAppend = "";
+                $annotationToAppend = sprintf(
+                    "{$indent} * @Parameter(name = \"%s\", value=\"$%s\")\n",
+                    "AcceptanceTester",
+                    "I"
+                );
                 $annotationToAppend .= sprintf("{$indent} * @param %s $%s\n", "AcceptanceTester", "I");
                 $annotationToAppend .= "{$indent} * @return void\n";
                 $annotationToAppend .= "{$indent} * @throws \Exception\n";
@@ -1462,11 +1466,14 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                         $actionObject->getActionOrigin()
                     )[0];
                     $argRef = "\t\t\$";
-
                     $input = $this->resolveAllRuntimeReferences([$input])[0];
+                    if (isset($actionObject->getCustomActionAttributes()['unique'])) {
+                        $input = ($actionObject->getCustomActionAttributes()['unique'] == 'prefix')
+                            ? '"'.uniqid().str_replace('"', '', $input).'"'
+                            : '"'.str_replace('"', '', $input).uniqid().'"';
+                    }
                     $argRef .= str_replace(ucfirst($fieldKey), "", $stepKey) .
                         "Fields['{$fieldKey}'] = ${input};";
-
                     $testSteps .= $argRef;
                     break;
                 case "generateDate":
@@ -1801,7 +1808,7 @@ private function generateHooksPhp($hookObjects)
             $hooks .= $steps;
             if ($type === 'after') {
                 $hooks .= "\t\t" . 'if ($this->isSuccess) {' . "\n";
-                $hooks .= "\t\t\t" . 'unlink(__FILE__);' . "\n";
+//                $hooks .= "\t\t\t" . 'unlink(__FILE__);' . "\n";
                 $hooks .= "\t\t" . '}' . "\n";
             }
             $hooks .= "\t}\n\n";
@@ -1841,7 +1848,7 @@ private function generateTestPhp($test)
             } else {
                 $skipString .= "No issues have been specified.";
             }
-            $steps = "\t\t" . 'unlink(__FILE__);' . "\n";
+//            $steps = "\t\t" . 'unlink(__FILE__);' . "\n";
             $steps .= "\t\t" . '$scenario->skip("' . $skipString . '");' . "\n";
             $dependencies .= ', \Codeception\Scenario $scenario';
         }
@@ -1861,6 +1868,8 @@ private function generateTestPhp($test)
             $testPhp .= "\t}\n";
         }
 
+        echo $testPhp;
+        exit;
         return $testPhp;
     }