Merge branch 'develop' into MQE-1677

Author: KevinBKozan

dev/tests/unit/Magento/FunctionalTestFramework/Util/TestGeneratorTest.php

@@ -88,6 +88,66 @@ public function testEntityException(): void
  $this->assertArrayHasKey('sampleTest', $testErrors);
  }
 
+ /**
+ * Basic test to check unique id is appended to input as prefix
+ *
+ * @return void
+ * @throws Exception
+ */
+ public function testUniqueIdAppendedToInputStringAsPrefix()
+ {
+ $actionObject = new ActionObject('fakeAction', 'comment', [
+ 'userInput' => '{{someEntity.entity}}'
+ ]);
+
+ $testObject = new TestObject('sampleTest', ['merge123' => $actionObject], [], [], 'filename');
+ $testGeneratorObject = TestGenerator::getInstance('', ['sampleTest' => $testObject]);
+
+ $result = $testGeneratorObject->getUniqueIdForInput('prefix', "foo");
+ 
+ $this->assertMatchesRegularExpression('/[A-Za-z0-9]+foo/', $result);
+ }
+
+ /**
+ * Basic test to check unique id is appended to input as suffix
+ *
+ * @return void
+ * @throws Exception
+ */
+ public function testUniqueIdAppendedToInputStringAsSuffix()
+ {
+ $actionObject = new ActionObject('fakeAction', 'comment', [
+ 'userInput' => '{{someEntity.entity}}'
+ ]);
+
+ $testObject = new TestObject('sampleTest', ['merge123' => $actionObject], [], [], 'filename');
+ $testGeneratorObject = TestGenerator::getInstance('', ['sampleTest' => $testObject]);
+
+ $result = $testGeneratorObject->getUniqueIdForInput('suffix', "foo");
+ 
+ $this->assertMatchesRegularExpression('/foo[A-Za-z0-9]+/', $result);
+ }
+
+ /**
+ * Basic test for wrong output for input
+ *
+ * @return void
+ * @throws Exception
+ */
+ public function testFailedRegexForUniqueAttribute()
+ {
+ $actionObject = new ActionObject('fakeAction', 'comment', [
+ 'userInput' => '{{someEntity.entity}}'
+ ]);
+
+ $testObject = new TestObject('sampleTest', ['merge123' => $actionObject], [], [], 'filename');
+ $testGeneratorObject = TestGenerator::getInstance('', ['sampleTest' => $testObject]);
+
+ $result = $testGeneratorObject->getUniqueIdForInput('suffix', "foo");
+ 
+ $this->assertDoesNotMatchRegularExpression('/bar[A-Za-z0-9]+/', $result);
+ }
+
  /**
  * Tests that skipped tests do not have a fully generated body.
  *

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'] = "foo";
+$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">foo</field>
+ </createData>
 
  </before>
  <waitForElementClickable selector=".functionalTestSelector" time="30" stepKey="waitForElementClickable" />
@@ -23,4 +26,4 @@
  <updateData entity="entity" createDataKey="createdInBefore" stepKey="updatedDataOutOfScope"/>
  <deleteData createDataKey="createdInBefore" stepKey="deleteDataOutOfScope"/>
  </test>
-</tests>
+</tests>

docs/img/issue.png

@@ -39,6 +39,7 @@ class TestObject
  'deleteData' => 200,
  'updateData' => 200,
  'getOTP' => 1000,
+ 'startMessageQueue' => 700,
  ];
 
  const WEBAPI_AUTH_TEST_ACTIONS = [

docs/img/pull-request.png

@@ -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="required">
+ <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>

docs/img/switching-the-base.png

@@ -1462,11 +1462,12 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
  $actionObject->getActionOrigin()
  )[0];
  $argRef = "\t\t\$";
-
  $input = $this->resolveAllRuntimeReferences([$input])[0];
+ $input = (isset($actionObject->getCustomActionAttributes()['unique'])) ?
+ $this->getUniqueIdForInput($actionObject->getCustomActionAttributes()['unique'], $input)
+ : $input;
  $argRef .= str_replace(ucfirst($fieldKey), "", $stepKey) .
  "Fields['{$fieldKey}'] = ${input};";
-
  $testSteps .= $argRef;
  break;
  case "generateDate":
@@ -1513,6 +1514,21 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
  return $testSteps;
  }
 
+ /**
+ * Get unique value appended to input string
+ *
+ * @param string $uniqueValue
+ * @param string $input
+ * @return string
+ */
+ public function getUniqueIdForInput($uniqueValue, $input)
+ {
+ $input = ($uniqueValue == 'prefix')
+ ? '"'.uniqid().str_replace('"', '', $input).'"'
+ : '"'.str_replace('"', '', $input).uniqid().'"';
+ return $input;
+ }
+
  /**
  * Resolves Locator:: in given $attribute if it is found.
  *