Skip to content

MQE-1749: Review Community PR #433 #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 21, 2019
Merged

MQE-1749: Review Community PR #433 #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
669ca53
Add possibility to include multiple non primitive types in an array
ochnygosch Aug 28, 2019
938a6ab
Correct formatting to adhere to psr-2 coding standards
ochnygosch Aug 28, 2019
b3f9db9
Correct formatting to adhere to psr-2 coding standards
ochnygosch Aug 28, 2019
070654d
Add unit test for diveres data array
ochnygosch Oct 1, 2019
491802c
Adhere to code style guide
ochnygosch Oct 1, 2019
6a5f52a
Merge branch 'fDiverseArray' of https://github.com/ochnygosch/magento…
tomreece Oct 18, 2019
cd94d20
MQE-1749: Review Community PR #433
tomreece Oct 18, 2019
b37e2b3
Merge branch 'develop' into ochnygosch-fDiverseArray
tomreece Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 122 additions & 0 deletions .../Magento/FunctionalTestFramework/DataGenerator/Persist/OperationDataArrayResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\OperationDefinitionObjectHandler;
use Magento\FunctionalTestingFramework\DataGenerator\Persist\OperationDataArrayResolver;
use Magento\FunctionalTestingFramework\Util\Iterator\AbstractIterator;
use Magento\FunctionalTestingFramework\Util\MagentoTestCase;
use tests\unit\Util\EntityDataObjectBuilder;
use tests\unit\Util\OperationDefinitionBuilder;
Expand Down Expand Up @@ -355,6 +356,127 @@ public function testNestedMetadataArrayOfValue()
$this->assertEquals(self::NESTED_METADATA_ARRAY_RESULT, $result);
}

public function testNestedMetadataArrayOfDiverseObjects()
{

$entityDataObjBuilder = new EntityDataObjectBuilder();
$parentDataObject = $entityDataObjBuilder
->withName("parentObject")
->withType("parentType")
->withLinkedEntities(['child1Object' => 'childType1','child2Object' => 'childType2'])
->build();

$child1DataObject = $entityDataObjBuilder
->withName('child1Object')
->withType('childType1')
->withDataFields(['city' => 'Testcity','zip' => 12345])
->build();

$child2DataObject = $entityDataObjBuilder
->withName('child2Object')
->withType('childType2')
->withDataFields(['city' => 'Testcity 2','zip' => 54321,'state' => 'Teststate'])
->build();

$mockDOHInstance = AspectMock::double(
DataObjectHandler::class,
[
'getObject' => function ($name) use ($child1DataObject, $child2DataObject) {
switch ($name) {
case 'child1Object':
return $child1DataObject;
case 'child2Object':
return $child2DataObject;
}
}
]
)->make();
AspectMock::double(DataObjectHandler::class, [
'getInstance' => $mockDOHInstance
]);

$operationDefinitionBuilder = new OperationDefinitionBuilder();
$child1OperationDefinition = $operationDefinitionBuilder
->withName('createchildType1')
->withOperation('create')
->withType('childType1')
->withMetadata([
'city' => 'string',
'zip' => 'integer'
])->build();

$child2OperationDefinition = $operationDefinitionBuilder
->withName('createchildType2')
->withOperation('create')
->withType('childType2')
->withMetadata([
'city' => 'string',
'zip' => 'integer',
'state' => 'string'
])->build();

$mockODOHInstance = AspectMock::double(
OperationDefinitionObjectHandler::class,
[
'getObject' => function ($name) use ($child1OperationDefinition, $child2OperationDefinition) {
switch ($name) {
case 'createchildType1':
return $child1OperationDefinition;
case 'createchildType2':
return $child2OperationDefinition;
}
}
]
)->make();
AspectMock::double(
OperationDefinitionObjectHandler::class,
[
'getInstance' => $mockODOHInstance
]
);

$arrayObElementBuilder = new OperationElementBuilder();
$arrayElement = $arrayObElementBuilder
->withKey('address')
->withType(['childType1','childType2'])
->withFields([])
->withElementType(OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY)
//->withNestedElements(['childType1' => $child1Element, 'childType2' => $child2Element])
->build();

$parentOpElementBuilder = new OperationElementBuilder();
$parentElement = $parentOpElementBuilder
->withKey('parentType')
->withType('parentType')
->addElements(['address' => $arrayElement])
->build();

$operationResolver = new OperationDataArrayResolver();
$result = $operationResolver->resolveOperationDataArray($parentDataObject, [$parentElement], 'create', false);

$expectedResult = [
'parentType' => [
'address' => [
[
'city' => 'Testcity',
'zip' => '12345'
],
[
'city' => 'Testcity 2',
'zip' => '54321',
'state' => 'Teststate'
]
],
'name' => 'Hopper',
'gpa' => '3.5678',
'phone' => '5555555',
'isPrimary' => '1'
]
];

$this->assertEquals($expectedResult, $result);
}

/**
* After class functionality
* @return void
Expand Down
27 changes: 26 additions & 1 deletion src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public function __construct($dependentEntities = null)
* @param boolean $fromArray
* @return array
* @throws \Exception
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* I suppressed this warning because I was in a hurry to deliver a community PR. That PR modified this function and
* introduced a new conditional, bumping the complexity to 11.
*/
public function resolveOperationDataArray($entityObject, $operationMetadata, $operation, $fromArray = false)
{
Expand Down Expand Up @@ -109,6 +113,26 @@ public function resolveOperationDataArray($entityObject, $operationMetadata, $op
$operationElementType,
$operationDataArray
);
} elseif (is_array($operationElementType)) {
foreach ($operationElementType as $currentElementType) {
if (in_array($currentElementType, self::PRIMITIVE_TYPES)) {
$this->resolvePrimitiveReferenceElement(
$entityObject,
$operationElement,
$currentElementType,
$operationDataArray
);
} else {
$this->resolveNonPrimitiveReferenceElement(
$entityObject,
$operation,
$fromArray,
$currentElementType,
$operationElement,
$operationDataArray
);
}
}
} else {
$this->resolveNonPrimitiveReferenceElement(
$entityObject,
Expand Down Expand Up @@ -248,7 +272,8 @@ private function resolveNonPrimitiveElement($entityName, $operationElement, $ope
$linkedEntityObj = $this->resolveLinkedEntityObject($entityName);

// in array case
if (!empty($operationElement->getNestedOperationElement($operationElement->getValue()))
if (!is_array($operationElement->getValue())
&& !empty($operationElement->getNestedOperationElement($operationElement->getValue()))
&& $operationElement->getType() == OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY
) {
$operationSubArray = $this->resolveOperationDataArray(
Expand Down
15 changes: 12 additions & 3 deletions src/Magento/FunctionalTestingFramework/DataGenerator/Util/OperationElementExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,18 @@ private function extractOperationField(&$operationElements, $operationFieldArray
private function extractOperationArray(&$operationArrayData, $operationArrayArray)
{
foreach ($operationArrayArray as $operationFieldType) {
$operationElementValue =
$operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
[OperationElementExtractor::OPERATION_OBJECT_ARRAY_VALUE] ?? null;
$operationElementValue = [];
if (isset($operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE])) {
foreach ($operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE] as
$operationFieldValue) {
$operationElementValue[] =
$operationFieldValue[OperationElementExtractor::OPERATION_OBJECT_ARRAY_VALUE] ?? null;
}
}

if (count($operationElementValue) === 1) {
$operationElementValue = array_pop($operationElementValue);
}

$nestedOperationElements = [];
if (array_key_exists(OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME, $operationFieldType)) {
Expand Down