Skip to content

Commit 3384459

Browse files
KevinBKozanKevinBKozan
committed
MQE-740: Duplicates in test hook cause errors when merging
- properly added before/after/&testActions; to di.xml - before and after to (before|after). removed some duplicate lines
1 parent 15c26f9 commit 3384459

File tree

4 files changed

+85
-22
lines changed

4 files changed

+85
-22
lines changed

‎dev/tests/verification/TestModule/Test/XmlDuplicateTest.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,4 +650,26 @@
650650
<waitForText stepKey="waittext1"/>
651651
<waitForText stepKey="waittext12"/>
652652
</test>
653+
654+
<test name="BasicDupedActionTest">
655+
<before>
656+
<createData entity="simpleData" stepKey="cb1">
657+
<requiredEntity createDataKey="simpleData2"/>
658+
</createData>
659+
<amOnPage stepKey="aopb1" url="1"/>
660+
<amOnPage stepKey="aopb2" url="2"/>
661+
</before>
662+
<after>
663+
<createData entity="simpleData" stepKey="ca1">
664+
<requiredEntity createDataKey="simpleData2"/>
665+
</createData>
666+
<amOnPage stepKey="aopf1" url="1"/>
667+
<amOnPage stepKey="aopf2" url="2"/>
668+
</after>
669+
<createData entity="simpleData" stepKey="c1">
670+
<requiredEntity createDataKey="simpleData2"/>
671+
</createData>
672+
<amOnPage stepKey="aop1" url="1"/>
673+
<amOnPage stepKey="aop2" url="2"/>
674+
</test>
653675
</tests>

‎dev/tests/verification/TestModuleMerged/Test/MergeXmlDuplicateTest.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11+
<test name="BasicDupedActionTest">
12+
<before>
13+
<createData entity="simpleData" stepKey="cb3">
14+
<requiredEntity createDataKey="simpleData2"/>
15+
</createData>
16+
<createData entity="simpleData" stepKey="cb4">
17+
<requiredEntity createDataKey="simpleData2"/>
18+
</createData>
19+
<amOnPage stepKey="aopb3" url="3"/>
20+
<amOnPage stepKey="aopb4" url="4"/>
21+
</before>
22+
<after>
23+
<createData entity="simpleData" stepKey="ca3">
24+
<requiredEntity createDataKey="simpleData2"/>
25+
</createData>
26+
<createData entity="simpleData" stepKey="c4">
27+
<requiredEntity createDataKey="simpleData2"/>
28+
</createData>
29+
<amOnPage stepKey="aopf3" url="3"/>
30+
<amOnPage stepKey="aopf4" url="4"/>
31+
</after>
32+
<createData entity="simpleData" stepKey="c3">
33+
<requiredEntity createDataKey="simpleData2"/>
34+
</createData>
35+
<createData entity="simpleData" stepKey="c4">
36+
<requiredEntity createDataKey="simpleData2"/>
37+
</createData>
38+
<amOnPage stepKey="aop3" url="3"/>
39+
<amOnPage stepKey="aop4" url="4"/>
40+
</test>
41+
</tests>

‎dev/tests/verification/Tests/XmlDuplicateGenerationTest.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class XmlDuplicateGerationTest extends TestCase
1414
{
1515
const XML_DUPLICATE_TEST = 'XmlDuplicateTest';
1616
const XML_DUPLICATE_ACTIONGROUP = 'xmlDuplicateActionGroup';
17+
const XML_DUPLICATE_MERGE_TEST = 'BasicDupedActionTest';
1718
const RESOURCES_PATH = __DIR__ . '/../Resources';
1819

1920
/**
@@ -30,4 +31,13 @@ public function testDuplicatesInActionGroup()
3031
$actionGroup = ActionGroupObjectHandler::getInstance()->getObject(self::XML_DUPLICATE_ACTIONGROUP);
3132
$this->addToAssertionCount(1); // No exception thrown thus far, can assert dupes didn't cause an error.
3233
}
34+
35+
/**
36+
* Parser testing, makes sure test action nodes are marked as array.
37+
*/
38+
public function testDuplicatesInMergeTest()
39+
{
40+
$testObject = TestObjectHandler::getInstance()->getObject(self::XML_DUPLICATE_MERGE_TEST);
41+
$this->addToAssertionCount(1); // No exception thrown thus far, can assert dupes didn't cause an error.
42+
}
3343
}

‎etc/di.xml‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,12 @@
210210
<argument name="idAttributes" xsi:type="array">
211211
<item name="/tests/test" xsi:type="string">name</item>
212212
<item name="/tests/test/actionGroup/argument" xsi:type="string">name</item>
213-
<item name="/tests/test/createData/required-entity" xsi:type="string">createDataKey</item>
214-
<item name="/tests/test/updateData/required-entity" xsi:type="string">createDataKey</item>
215-
<item name="/tests/test/getData/required-entity" xsi:type="string">createDataKey</item>
213+
<item name="/tests/test/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
216214
<item name="/tests/test/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
215+
<item name="/tests/test/(before|after)/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
217216
<item name="/tests/test/remove" xsi:type="string">keyForRemoval</item>
218-
<item name="/tests/test/before/remove" xsi:type="string">keyForRemoval</item>
219-
<item name="/tests/test/after/remove" xsi:type="string">keyForRemoval</item>
217+
<item name="/tests/test/(before|after)/remove" xsi:type="string">keyForRemoval</item>
218+
<item name="/tests/test/(before|after)/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
220219
<item name="/tests/test/annotations(/group)+" xsi:type="string">value</item>
221220
</argument>
222221
<argument name="fileName" xsi:type="string">*.xml</argument>
@@ -228,21 +227,12 @@
228227
<arguments>
229228
<argument name="assocArrayAttributes" xsi:type="array">
230229
<item name="/tests/test/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
231-
<item name="/tests/test/before/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
232-
<item name="/tests/test/after/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
230+
<item name="/tests/test/(before|after)/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
233231
<item name="/tests/test/remove" xsi:type="string">keyForRemoval</item>
234-
<item name="/tests/test/before/remove" xsi:type="string">keyForRemoval</item>
235-
<item name="/tests/test/after/remove" xsi:type="string">keyForRemoval</item>
232+
<item name="/tests/test/(before|after)/remove" xsi:type="string">keyForRemoval</item>
236233
<item name="/tests/test" xsi:type="string">name</item>
237-
<item name="/tests/test/createData/requiredEntity" xsi:type="string">createDataKey</item>
238-
<item name="/tests/test/before/createData/requiredEntity" xsi:type="string">createDataKey</item>
239-
<item name="/tests/test/after/createData/requiredEntity" xsi:type="string">createDataKey</item>
240-
<item name="/tests/test/updateData/requiredEntity" xsi:type="string">createDataKey</item>
241-
<item name="/tests/test/before/updateData/requiredEntity" xsi:type="string">createDataKey</item>
242-
<item name="/tests/test/after/updateData/requiredEntity" xsi:type="string">createDataKey</item>
243-
<item name="/tests/test/getData/requiredEntity" xsi:type="string">createDataKey</item>
244-
<item name="/tests/test/before/getData/requiredEntity" xsi:type="string">createDataKey</item>
245-
<item name="/tests/test/after/getData/requiredEntity" xsi:type="string">createDataKey</item>
234+
<item name="/tests/test/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
235+
<item name="/tests/test/(before|after)/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
246236
<item name="/tests/test/actionGroup/argument" xsi:type="string">name</item>
247237
<item name="/tests/test/(before|after)/actionGroup/argument" xsi:type="string">name</item>
248238
</argument>
@@ -295,6 +285,7 @@
295285
<item name="/actionGroups/actionGroup" xsi:type="string">name</item>
296286
<item name="/actionGroups/actionGroup/arguments/argument" xsi:type="string">name</item>
297287
<item name="/actionGroups/actionGroup/(&commonTestActions;)" xsi:type="string">stepKey</item>
288+
<item name="/actionGroups/actionGroup/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
298289
<item name="/actionGroups/actionGroup/remove" xsi:type="string">keyForRemoval</item>
299290
</argument>
300291
<argument name="fileName" xsi:type="string">*ActionGroup.xml</argument>
@@ -309,6 +300,7 @@
309300
<item name="/actionGroups/actionGroup/remove" xsi:type="string">keyForRemoval</item>
310301
<item name="/actionGroups/actionGroup" xsi:type="string">name</item>
311302
<item name="/actionGroups/actionGroup/arguments/argument" xsi:type="string">name</item>
303+
<item name="/actionGroups/actionGroup/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
312304
</argument>
313305
</arguments>
314306
</virtualType>
@@ -370,10 +362,8 @@
370362
<arguments>
371363
<argument name="assocArrayAttributes" xsi:type="array">
372364
<item name="/suites/suite" xsi:type="string">name</item>
373-
<item name="/suites/suite/before/(createData|deleteData)" xsi:type="string">stepKey</item>
374-
<item name="/suites/suite/after/(createData|deleteData)" xsi:type="string">stepKey</item>
375-
<item name="/suites/suite/before/createData/requiredEntity" xsi:type="string">createDataKey</item>
376-
<item name="/suites/suite/after/createData/requiredEntity" xsi:type="string">createDataKey</item>
365+
<item name="/suites/suite/(before|after)/(createData|deleteData)" xsi:type="string">stepKey</item>
366+
<item name="/suites/suite/(before|after)/createData/requiredEntity" xsi:type="string">createDataKey</item>
377367
<item name="/suites/suite/include/group" xsi:type="string">name</item>
378368
<item name="/suites/suite/include/test" xsi:type="string">name</item>
379369
<item name="/suites/suite/include/module" xsi:type="string">name</item>

0 commit comments

Comments
 (0)