Skip to content

MQE-1148: Include Parent In Output Of Duplicate StepKey or Section Element #227

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 1 commit into from
Sep 25, 2018
Merged

MQE-1148: Include Parent In Output Of Duplicate StepKey or Section Element #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .../unit/Magento/FunctionalTestFramework/Util/Validation/DuplicateNodeValidationUtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function testTestActionValidation()
';
$uniqueIdentifier = "stepKey";
$filename = "file";
$testName = "test";

// Perform Test
$dom = new \DOMDocument();
Expand All @@ -40,8 +41,7 @@ public function testTestActionValidation()
$validator->validateChildUniqueness(
$testNode,
$filename,
$uniqueIdentifier,
$exceptionCollector
$testName
);
$this->expectException(\Exception::class);
$exceptionCollector->throwException();
Expand Down
4 changes: 3 additions & 1 deletion src/Magento/FunctionalTestingFramework/DataGenerator/Config/Dom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Dom extends \Magento\FunctionalTestingFramework\Config\MftfDom
{
const DATA_FILE_NAME_ENDING = "Data";
const DATA_META_FILENAME_ATTRIBUTE = "filename";
const DATA_META_NAME_ATTRIBUTE = "name";

/**
* NodeValidationUtil
Expand Down Expand Up @@ -74,7 +75,8 @@ public function initDom($xml, $filename = null)
$entityNode->setAttribute(self::DATA_META_FILENAME_ATTRIBUTE, $filename);
$this->validationUtil->validateChildUniqueness(
$entityNode,
$filename
$filename,
$entityNode->getAttribute(self::DATA_META_NAME_ATTRIBUTE)
);
}
}
Expand Down
13 changes: 9 additions & 4 deletions src/Magento/FunctionalTestingFramework/DataGenerator/Config/OperationDom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class OperationDom extends \Magento\FunctionalTestingFramework\Config\MftfDom
{
const METADATA_FILE_NAME_ENDING = "meta";
const METADATA_META_FILENAME_ATTRIBUTE = "filename";
const METADATA_META_NAME_ATTRIBUTE = "name";

/**
* NodeValidationUtil
Expand Down Expand Up @@ -74,7 +75,8 @@ public function initDom($xml, $filename = null)
$operationNode->setAttribute(self::METADATA_META_FILENAME_ATTRIBUTE, $filename);
$this->validateOperationElements(
$operationNode,
$filename
$filename,
$operationNode->getAttribute(self::METADATA_META_NAME_ATTRIBUTE)
);
}
}
Expand All @@ -86,13 +88,15 @@ public function initDom($xml, $filename = null)
* Recurse through child elements and validate uniqueKeys
* @param \DOMElement $parentNode
* @param string $filename
* @param string $topParent
* @return void
*/
public function validateOperationElements(\DOMElement $parentNode, $filename)
public function validateOperationElements(\DOMElement $parentNode, $filename, $topParent)
{
$this->validationUtil->validateChildUniqueness(
$parentNode,
$filename
$filename,
$topParent
);
$childNodes = $parentNode->childNodes;

Expand All @@ -103,7 +107,8 @@ public function validateOperationElements(\DOMElement $parentNode, $filename)
}
$this->validateOperationElements(
$currentNode,
$filename
$filename,
$topParent
);
}
}
Expand Down
7 changes: 6 additions & 1 deletion src/Magento/FunctionalTestingFramework/Page/Config/Dom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
class Dom extends \Magento\FunctionalTestingFramework\Config\MftfDom
{
const PAGE_META_FILENAME_ATTRIBUTE = "filename";
const PAGE_META_NAME_ATTRIBUTE = "name";

/**
* Module Path extractor
Expand Down Expand Up @@ -79,7 +80,11 @@ public function initDom($xml, $filename = null)
$dom = parent::initDom($xml, $filename);

$pagesNode = $dom->getElementsByTagName('pages')->item(0);
$this->validationUtil->validateChildUniqueness($pagesNode, $filename);
$this->validationUtil->validateChildUniqueness(
$pagesNode,
$filename,
$pagesNode->getAttribute(self::PAGE_META_NAME_ATTRIBUTE)
);
$pageNodes = $dom->getElementsByTagName('page');
$currentModule =
$this->modulePathExtractor->extractModuleName($filename) .
Expand Down
7 changes: 6 additions & 1 deletion src/Magento/FunctionalTestingFramework/Page/Config/SectionDom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
class SectionDom extends \Magento\FunctionalTestingFramework\Config\MftfDom
{
const SECTION_META_FILENAME_ATTRIBUTE = "filename";
const SECTION_META_NAME_ATTRIBUTE = "name";

/**
* NodeValidationUtil
Expand Down Expand Up @@ -71,7 +72,11 @@ public function initDom($xml, $filename = null)
$sectionNodes = $dom->getElementsByTagName('section');
foreach ($sectionNodes as $sectionNode) {
$sectionNode->setAttribute(self::SECTION_META_FILENAME_ATTRIBUTE, $filename);
$this->validationUtil->validateChildUniqueness($sectionNode, $filename);
$this->validationUtil->validateChildUniqueness(
$sectionNode,
$filename,
$sectionNode->getAttribute(self::SECTION_META_NAME_ATTRIBUTE)
);
}
return $dom;
}
Expand Down
18 changes: 3 additions & 15 deletions src/Magento/FunctionalTestingFramework/Test/Config/ActionGroupDom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
class ActionGroupDom extends Dom
{
const ACTION_GROUP_FILE_NAME_ENDING = "ActionGroup.xml";
const ACTION_GROUP_META_NAME_ATTRIBUTE = "name";

/**
* Takes a dom element from xml and appends the filename based on location while also validating the action group
Expand All @@ -35,22 +36,9 @@ public function initDom($xml, $filename = null)
$actionGroupNode->setAttribute(self::TEST_META_FILENAME_ATTRIBUTE, $filename);
$this->validationUtil->validateChildUniqueness(
$actionGroupNode,
$filename
$filename,
$actionGroupNode->getAttribute(self::ACTION_GROUP_META_NAME_ATTRIBUTE)
);
$beforeNode = $actionGroupNode->getElementsByTagName('before')->item(0);
$afterNode = $actionGroupNode->getElementsByTagName('after')->item(0);
if (isset($beforeNode)) {
$this->validationUtil->validateChildUniqueness(
$beforeNode,
$filename
);
}
if (isset($afterNode)) {
$this->validationUtil->validateChildUniqueness(
$afterNode,
$filename
);
}
if ($actionGroupNode->getAttribute(self::TEST_MERGE_POINTER_AFTER) !== "") {
$this->appendMergePointerToActions(
$actionGroupNode,
Expand Down
9 changes: 6 additions & 3 deletions src/Magento/FunctionalTestingFramework/Test/Config/Dom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,24 @@ public function initDom($xml, $filename = null)

$this->validationUtil->validateChildUniqueness(
$testNode,
$filename
$filename,
$testNode->getAttribute(self::TEST_META_NAME_ATTRIBUTE)
);
$beforeNode = $testNode->getElementsByTagName('before')->item(0);
$afterNode = $testNode->getElementsByTagName('after')->item(0);

if (isset($beforeNode)) {
$this->validationUtil->validateChildUniqueness(
$beforeNode,
$filename
$filename,
$testNode->getAttribute(self::TEST_META_NAME_ATTRIBUTE) . "/before"
);
}
if (isset($afterNode)) {
$this->validationUtil->validateChildUniqueness(
$afterNode,
$filename
$filename,
$testNode->getAttribute(self::TEST_META_NAME_ATTRIBUTE) . "/after"
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Magento/FunctionalTestingFramework/Util/Validation/DuplicateNodeValidationUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct($uniqueKey, $exceptionCollector)
* @param string $filename
* @return void
*/
public function validateChildUniqueness(\DOMElement $parentNode, $filename)
public function validateChildUniqueness(\DOMElement $parentNode, $filename, $parentKey)
{
$childNodes = $parentNode->childNodes;
$type = ucfirst($parentNode->tagName);
Expand All @@ -69,7 +69,7 @@ public function validateChildUniqueness(\DOMElement $parentNode, $filename)
$duplicates = array_diff_assoc($keyValues, $withoutDuplicates);
$keyError = "";
foreach ($duplicates as $duplicateKey => $duplicateValue) {
$keyError .= "\t{$this->uniqueKey}: {$duplicateValue} is used more than once.\n";
$keyError .= "\t{$this->uniqueKey}: {$duplicateValue} is used more than once. (Parent: {$parentKey})\n";
}

$errorMsg = "{$type} cannot use {$this->uniqueKey}s more than once.\t\n{$keyError}\tin file: {$filename}";
Expand Down