Skip to content

Commit be4f574

Browse files
committed
MQE-231: Allow data to extend other data
- Added support to overwrite parent type or take parent type if null
1 parent a4e7512 commit be4f574

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dev/tests/verification/TestModule/Data/ExtendedData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<data key="uniqueNamePre" unique="prefix">prename</data>
1414
<data key="uniqueNamePost" unique="suffix">postname</data>
1515
</entity>
16-
<entity name="extendParentData" type="extendParentData" extends="parentData">
16+
<entity name="extendParentData" extends="parentData">
1717
<data key="name">otherName</data>
1818
<data key="nameExtend">extendName</data>
1919
<data key="uniqueNamePost">item</data>

src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataExtensionUtil.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ public function extendEntity($entityObject)
5656
echo("Extending Data: " . $parentEntity->getName() . " => " . $entityObject->getName() . PHP_EOL);
5757
}
5858

59+
//get parent entity type if child does not have a type
60+
$newType = $entityObject->getType() ?? $parentEntity->getType();
61+
5962
// Get all data for both parent and child and merge
6063
$referencedData = $parentEntity->getAllData();
6164
$newData = array_merge($referencedData, $entityObject->getAllData());
@@ -84,7 +87,7 @@ public function extendEntity($entityObject)
8487
// Create new Test object to return
8588
$extendedEntity = new EntityDataObject(
8689
$entityObject->getName(),
87-
$parentEntity->getType(),
90+
$newType,
8891
$newData,
8992
$newLinkedReferences,
9093
$newUniqueReferences,

0 commit comments

Comments
 (0)