Skip to content

Commit 6a94c87

Browse files
committed
MQE-980: [Annotations] <features> tag defaults to module
- Dom no longer overwrites filename, instead builds comma separated list to keep track of all test and merge paths - TestObjectExtractor not extracts module form base test path, and overwrites testAnnotations["features"] to only include the single module name. - Unit/Verification updates.
1 parent fb1e4b7 commit 6a94c87

36 files changed

+112
-13
lines changed

dev/tests/unit/Magento/FunctionalTestFramework/Test/Handlers/TestObjectHandlerTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public function testGetTestObject()
8888
$testDataArrayBuilder->testName,
8989
[$expectedTestActionObject],
9090
[
91+
'features' => ['NO MODULE DETECTED'],
9192
'group' => ['test']
9293
],
9394
[
@@ -101,6 +102,15 @@ public function testGetTestObject()
101102
$this->assertEquals($expectedTestObject, $actualTestObject);
102103
}
103104

105+
/**
106+
* Tests basic getting of a test that has a fileName
107+
*/
108+
public function testGetTestWithFileName()
109+
{
110+
$this->markTestIncomplete();
111+
//TODO
112+
}
113+
104114
/**
105115
* Tests the function used to get a series of relevant tests by group.
106116
*

dev/tests/unit/Util/TestDataArrayBuilder.php

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace tests\unit\Util;
88

99
use Magento\FunctionalTestingFramework\Test\Util\ActionObjectExtractor;
10+
use Magento\FunctionalTestingFramework\Test\Util\AnnotationExtractor;
1011
use Magento\FunctionalTestingFramework\Test\Util\TestObjectExtractor;
1112

1213
class TestDataArrayBuilder
@@ -18,6 +19,13 @@ class TestDataArrayBuilder
1819
*/
1920
public $testName = 'testTest';
2021

22+
/**
23+
* Mock file name
24+
*
25+
* @var string
26+
*/
27+
public $filename = null;
28+
2129
/**
2230
* Mock before action name
2331
*
@@ -187,6 +195,23 @@ public function withTestActions($actions = null)
187195
return $this;
188196
}
189197

198+
/**
199+
* Add file name passe in by arg (or default if no arg)
200+
* @param string $filename
201+
* @return $this
202+
*/
203+
public function withFileName($filename = null)
204+
{
205+
if ($filename == null) {
206+
$this->filename =
207+
"/magento2-functional-testing-framework/dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml";
208+
} else {
209+
$this->filename = $filename;
210+
}
211+
212+
return $this;
213+
}
214+
190215
/**
191216
* Output the resulting test data array based on parameters set in the object
192217
*
@@ -201,7 +226,8 @@ public function build()
201226
TestObjectExtractor::TEST_ANNOTATIONS => $this->annotations,
202227
TestObjectExtractor::TEST_BEFORE_HOOK => $this->beforeHook,
203228
TestObjectExtractor::TEST_AFTER_HOOK => $this->afterHook,
204-
TestObjectExtractor::TEST_FAILED_HOOK => $this->failedHook
229+
TestObjectExtractor::TEST_FAILED_HOOK => $this->failedHook,
230+
"filename" => $this->filename
205231
],
206232
$this->testActions
207233
)];

dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
2020
class ActionGroupUsingNestedArgumentCest
2121
{
2222
/**
23+
* @Features({"TestModule"})
2324
* @Parameter(name = "AcceptanceTester", value="$I")
2425
* @param AcceptanceTester $I
2526
* @return void

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ActionGroupWithDataOverrideTestCest
6161

6262
/**
6363
* @Severity(level = SeverityLevel::CRITICAL)
64-
* @Features({"Action Group Functional Cest"})
64+
* @Features({"TestModule"})
6565
* @Stories({"MQE-433"})
6666
* @Parameter(name = "AcceptanceTester", value="$I")
6767
* @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithDataTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ActionGroupWithDataTestCest
6161

6262
/**
6363
* @Severity(level = SeverityLevel::CRITICAL)
64-
* @Features({"Action Group Functional Cest"})
64+
* @Features({"TestModule"})
6565
* @Stories({"MQE-433"})
6666
* @Parameter(name = "AcceptanceTester", value="$I")
6767
* @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
2222
{
2323
/**
2424
* @Severity(level = SeverityLevel::BLOCKER)
25+
* @Features({"TestModule"})
2526
* @Parameter(name = "AcceptanceTester", value="$I")
2627
* @param AcceptanceTester $I
2728
* @return void

dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
2222
{
2323
/**
2424
* @Severity(level = SeverityLevel::BLOCKER)
25+
* @Features({"TestModule"})
2526
* @Parameter(name = "AcceptanceTester", value="$I")
2627
* @param AcceptanceTester $I
2728
* @return void

dev/tests/verification/Resources/ActionGroupWithNoArguments.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ActionGroupWithNoArgumentsCest
2222
{
2323
/**
2424
* @Severity(level = SeverityLevel::BLOCKER)
25+
* @Features({"TestModule"})
2526
* @Parameter(name = "AcceptanceTester", value="$I")
2627
* @param AcceptanceTester $I
2728
* @return void

dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ActionGroupWithNoDefaultTestCest
6161

6262
/**
6363
* @Severity(level = SeverityLevel::CRITICAL)
64-
* @Features({"Action Group Functional Cest"})
64+
* @Features({"TestModule"})
6565
* @Stories({"MQE-433"})
6666
* @Parameter(name = "AcceptanceTester", value="$I")
6767
* @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
2222
{
2323
/**
2424
* @Severity(level = SeverityLevel::BLOCKER)
25+
* @Features({"TestModule"})
2526
* @Parameter(name = "AcceptanceTester", value="$I")
2627
* @param AcceptanceTester $I
2728
* @return void

0 commit comments

Comments
 (0)