Skip to content

Commit 5dc4c0d

Browse files
authored
MQE-1027: Allure report requires a unique story/title for proper reporting
- Added validation of Story/Title combinations for uniqueness
1 parent 2f70705 commit 5dc4c0d

26 files changed

+91
-43
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ coverage/
1414
codeception.yml
1515
dev/tests/functional/MFTF.suite.yml
1616
dev/tests/functional/_output
17+
dev/mftf.log
1718
dev/tests/mftf.log

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class ActionGroupWithDataOverrideTestCest

dev/tests/verification/Resources/ActionGroupWithDataTest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class ActionGroupWithDataTestCest

dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class ActionGroupWithNoDefaultTestCest

dev/tests/verification/Resources/ActionGroupWithPersistedData.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class ActionGroupWithPersistedDataCest

dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class ActionGroupWithTopLevelPersistedDataCest

dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class ArgumentWithSameNameAsElementCest

dev/tests/verification/Resources/BasicActionGroupTest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class BasicActionGroupTestCest

dev/tests/verification/Resources/BasicMergeTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
19+
* @Title("BasicMergeTest")
2020
* @group functional
2121
* @group mergeTest
2222
*/

dev/tests/verification/Resources/ChildExtendedTestAddHooks.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Parent")
19+
* @Title("ChildExtendedTestAddHooks")
2020
* @group Parent
2121
*/
2222
class ChildExtendedTestAddHooksCest

dev/tests/verification/Resources/ChildExtendedTestMerging.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Child")
19+
* @Title("ChildExtendedTestMerging")
2020
* @group Child
2121
*/
2222
class ChildExtendedTestMergingCest

dev/tests/verification/Resources/ChildExtendedTestNoParent.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Child")
19+
* @Title("ChildExtendedTestNoParent")
2020
* @group Child
2121
* @group skip
2222
*/

dev/tests/verification/Resources/ChildExtendedTestRemoveAction.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Child")
19+
* @Title("ChildExtendedTestRemoveAction")
2020
* @group Child
2121
*/
2222
class ChildExtendedTestRemoveActionCest

dev/tests/verification/Resources/ChildExtendedTestRemoveHookAction.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Child")
19+
* @Title("ChildExtendedTestRemoveHookAction")
2020
* @group Child
2121
*/
2222
class ChildExtendedTestRemoveHookActionCest

dev/tests/verification/Resources/ChildExtendedTestReplace.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Child")
19+
* @Title("ChildExtendedTestReplace")
2020
* @group Child
2121
*/
2222
class ChildExtendedTestReplaceCest

dev/tests/verification/Resources/ChildExtendedTestReplaceHook.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Child")
19+
* @Title("ChildExtendedTestReplaceHook")
2020
* @group Child
2121
*/
2222
class ChildExtendedTestReplaceHookCest

dev/tests/verification/Resources/MergedActionGroupTest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class MergedActionGroupTestCest

dev/tests/verification/Resources/MergedReferencesTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
19+
* @Title("MergedReferencesTest")
2020
* @group functional
2121
*/
2222
class MergedReferencesTestCest

dev/tests/verification/Resources/MultipleActionGroupsTest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("A Functional Cest")
2019
* @group functional
2120
*/
2221
class MultipleActionGroupsTestCest

dev/tests/verification/Resources/ParentExtendedTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
1616
use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717

1818
/**
19-
* @Title("Parent")
19+
* @Title("ParentExtendedTest")
2020
* @group Parent
2121
*/
2222
class ParentExtendedTestCest

dev/tests/verification/TestModule/Test/ActionGroupFunctionalTest.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<test name="BasicActionGroupTest">
1212
<annotations>
1313
<severity value="CRITICAL"/>
14-
<title value="A Functional Cest"/>
1514
<group value="functional"/>
1615
<features value="Action Group Functional Cest"/>
1716
<stories value="MQE-433"/>
@@ -27,7 +26,6 @@
2726
<test name="ActionGroupWithDataTest">
2827
<annotations>
2928
<severity value="CRITICAL"/>
30-
<title value="A Functional Cest"/>
3129
<group value="functional"/>
3230
<features value="Action Group Functional Cest"/>
3331
<stories value="MQE-433"/>
@@ -46,7 +44,6 @@
4644
<test name="ActionGroupWithDataOverrideTest">
4745
<annotations>
4846
<severity value="CRITICAL"/>
49-
<title value="A Functional Cest"/>
5047
<group value="functional"/>
5148
<features value="Action Group Functional Cest"/>
5249
<stories value="MQE-433"/>
@@ -67,7 +64,6 @@
6764
<test name="ActionGroupWithNoDefaultTest">
6865
<annotations>
6966
<severity value="CRITICAL"/>
70-
<title value="A Functional Cest"/>
7167
<group value="functional"/>
7268
<features value="Action Group Functional Cest"/>
7369
<stories value="MQE-433"/>
@@ -88,7 +84,6 @@
8884
<test name="ActionGroupWithPersistedData">
8985
<annotations>
9086
<severity value="CRITICAL"/>
91-
<title value="A Functional Cest"/>
9287
<group value="functional"/>
9388
<features value="Action Group Functional Cest"/>
9489
<stories value="MQE-433"/>
@@ -108,7 +103,6 @@
108103
<test name="ActionGroupWithTopLevelPersistedData">
109104
<annotations>
110105
<severity value="CRITICAL"/>
111-
<title value="A Functional Cest"/>
112106
<group value="functional"/>
113107
<features value="Action Group Functional Cest"/>
114108
<stories value="MQE-433"/>
@@ -127,7 +121,6 @@
127121
<test name="MultipleActionGroupsTest">
128122
<annotations>
129123
<severity value="CRITICAL"/>
130-
<title value="A Functional Cest"/>
131124
<group value="functional"/>
132125
<features value="Action Group Functional Cest"/>
133126
<stories value="MQE-433"/>
@@ -149,7 +142,6 @@
149142
<test name="MergedActionGroupTest">
150143
<annotations>
151144
<severity value="CRITICAL"/>
152-
<title value="A Functional Cest"/>
153145
<group value="functional"/>
154146
<features value="Action Group Functional Cest"/>
155147
<stories value="MQE-433"/>
@@ -168,7 +160,6 @@
168160
<test name="ArgumentWithSameNameAsElement">
169161
<annotations>
170162
<severity value="CRITICAL"/>
171-
<title value="A Functional Cest"/>
172163
<group value="functional"/>
173164
<features value="Action Group Functional Cest"/>
174165
<stories value="MQE-433"/>

dev/tests/verification/TestModule/Test/ExtendedFunctionalTest.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<test name="ParentExtendedTest">
1212
<annotations>
1313
<severity value="AVERAGE"/>
14-
<title value="Parent"/>
14+
<title value="ParentExtendedTest"/>
1515
<group value="Parent"/>
1616
<features value="Parent"/>
1717
<stories value="Parent"/>
@@ -28,7 +28,7 @@
2828
<test name="ChildExtendedTestReplace" extends="ParentExtendedTest">
2929
<annotations>
3030
<severity value="MINOR"/>
31-
<title value="Child"/>
31+
<title value="ChildExtendedTestReplace"/>
3232
<group value="Child"/>
3333
<features value="Child"/>
3434
<stories value="Child"/>
@@ -39,7 +39,7 @@
3939
<test name="ChildExtendedTestReplaceHook" extends="ParentExtendedTest">
4040
<annotations>
4141
<severity value="MINOR"/>
42-
<title value="Child"/>
42+
<title value="ChildExtendedTestReplaceHook"/>
4343
<group value="Child"/>
4444
<features value="Child"/>
4545
<stories value="Child"/>
@@ -52,7 +52,7 @@
5252
<test name="ChildExtendedTestMerging" extends="ParentExtendedTest">
5353
<annotations>
5454
<severity value="MINOR"/>
55-
<title value="Child"/>
55+
<title value="ChildExtendedTestMerging"/>
5656
<group value="Child"/>
5757
<features value="Child"/>
5858
<stories value="Child"/>
@@ -69,7 +69,7 @@
6969
<test name="ChildExtendedTestRemoveAction" extends="ParentExtendedTest">
7070
<annotations>
7171
<severity value="CRITICAL"/>
72-
<title value="Child"/>
72+
<title value="ChildExtendedTestRemoveAction"/>
7373
<group value="Child"/>
7474
<features value="Child"/>
7575
<stories value="Child"/>
@@ -80,7 +80,7 @@
8080
<test name="ParentExtendedTestNoHooks">
8181
<annotations>
8282
<severity value="AVERAGE"/>
83-
<title value="Parent"/>
83+
<title value="ParentExtendedTestNoHooks"/>
8484
<group value="Parent"/>
8585
<features value="Parent"/>
8686
<stories value="Parent"/>
@@ -91,7 +91,7 @@
9191
<test name="ChildExtendedTestAddHooks">
9292
<annotations>
9393
<severity value="AVERAGE"/>
94-
<title value="Parent"/>
94+
<title value="ChildExtendedTestAddHooks"/>
9595
<group value="Parent"/>
9696
<features value="Parent"/>
9797
<stories value="Parent"/>
@@ -107,7 +107,7 @@
107107
<test name="ChildExtendedTestRemoveHookAction" extends="ParentExtendedTest">
108108
<annotations>
109109
<severity value="CRITICAL"/>
110-
<title value="Child"/>
110+
<title value="ChildExtendedTestRemoveHookAction"/>
111111
<group value="Child"/>
112112
<features value="Child"/>
113113
<stories value="Child"/>
@@ -120,7 +120,7 @@
120120
<test name="ChildExtendedTestNoParent" extends="ThisTestDoesNotExist">
121121
<annotations>
122122
<severity value="CRITICAL"/>
123-
<title value="Child"/>
123+
<title value="ChildExtendedTestNoParent"/>
124124
<group value="Child"/>
125125
<features value="Child"/>
126126
<stories value="Child"/>

dev/tests/verification/TestModule/Test/MergeFunctionalTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<test name="BasicMergeTest">
1212
<annotations>
1313
<severity value="CRITICAL"/>
14-
<title value="A Functional Cest"/>
14+
<title value="BasicMergeTest"/>
1515
<group value="functional"/>
1616
<features value="Merge Functional Cest"/>
1717
<stories value="MQE-433"/>
@@ -31,7 +31,7 @@
3131
<test name="MergedReferencesTest">
3232
<annotations>
3333
<severity value="CRITICAL"/>
34-
<title value="A Functional Cest"/>
34+
<title value="MergedReferencesTest"/>
3535
<group value="functional"/>
3636
<features value="Merge Functional Cest"/>
3737
<stories value="MQE-433"/>

src/Magento/FunctionalTestingFramework/Test/Handlers/TestObjectHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\FunctionalTestingFramework\Test\Parsers\TestDataParser;
1414
use Magento\FunctionalTestingFramework\Test\Util\ObjectExtensionUtil;
1515
use Magento\FunctionalTestingFramework\Test\Util\TestObjectExtractor;
16+
use Magento\FunctionalTestingFramework\Test\Util\AnnotationExtractor;
1617

1718
/**
1819
* Class TestObjectHandler
@@ -142,6 +143,7 @@ private function initTestData()
142143

143144
$this->tests[$testName] = $testObjectExtractor->extractTestData($testData);
144145
}
146+
$testObjectExtractor->getAnnotationExtractor()->validateStoryTitleUniqueness();
145147
}
146148

147149
/**

0 commit comments

Comments
 (0)