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.

Author: KevinBKozan

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

@@ -88,6 +88,7 @@ public function testGetTestObject()
             $testDataArrayBuilder->testName,
             [$expectedTestActionObject],
             [
+                'features' => ['NO MODULE DETECTED'],
                 'group' => ['test']
             ],
             [
@@ -101,6 +102,15 @@ public function testGetTestObject()
         $this->assertEquals($expectedTestObject, $actualTestObject);
     }
 
+    /**
+     * Tests basic getting of a test that has a fileName
+     */
+    public function testGetTestWithFileName()
+    {
+        $this->markTestIncomplete();
+        //TODO
+    }
+
     /**
      * Tests the function used to get a series of relevant tests by group.
      *

dev/tests/unit/Util/TestDataArrayBuilder.php

@@ -7,6 +7,7 @@
 namespace tests\unit\Util;
 
 use Magento\FunctionalTestingFramework\Test\Util\ActionObjectExtractor;
+use Magento\FunctionalTestingFramework\Test\Util\AnnotationExtractor;
 use Magento\FunctionalTestingFramework\Test\Util\TestObjectExtractor;
 
 class TestDataArrayBuilder
@@ -18,6 +19,13 @@ class TestDataArrayBuilder
      */
     public $testName = 'testTest';
 
+    /**
+     * Mock file name
+     *
+     * @var string
+     */
+    public $filename = null;
+
     /**
      * Mock before action name
      *
@@ -187,6 +195,23 @@ public function withTestActions($actions = null)
         return $this;
     }
 
+    /**
+     * Add file name passe in by arg (or default if no arg)
+     * @param string $filename
+     * @return $this
+     */
+    public function withFileName($filename = null)
+    {
+        if ($filename == null) {
+            $this->filename =
+                "/magento2-functional-testing-framework/dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml";
+        } else {
+            $this->filename = $filename;
+        }
+
+        return $this;
+    }
+
     /**
      * Output the resulting test data array based on parameters set in the object
      *
@@ -201,7 +226,8 @@ public function build()
                 TestObjectExtractor::TEST_ANNOTATIONS => $this->annotations,
                 TestObjectExtractor::TEST_BEFORE_HOOK => $this->beforeHook,
                 TestObjectExtractor::TEST_AFTER_HOOK => $this->afterHook,
-                TestObjectExtractor::TEST_FAILED_HOOK => $this->failedHook
+                TestObjectExtractor::TEST_FAILED_HOOK => $this->failedHook,
+                "filename" => $this->filename
             ],
             $this->testActions
         )];

dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupUsingNestedArgumentCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

@@ -61,7 +61,7 @@ class ActionGroupWithDataOverrideTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithDataTest.txt

@@ -61,7 +61,7 @@ class ActionGroupWithDataTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

@@ -22,6 +22,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt

@@ -22,6 +22,7 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithNoArguments.txt

@@ -22,6 +22,7 @@ class ActionGroupWithNoArgumentsCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt

@@ -61,7 +61,7 @@ class ActionGroupWithNoDefaultTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt

@@ -22,6 +22,7 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithPersistedData.txt

@@ -61,7 +61,7 @@ class ActionGroupWithPersistedDataCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt

@@ -22,6 +22,7 @@ class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt

@@ -22,6 +22,7 @@ class ActionGroupWithSimpleDataUsageFromPassedArgumentCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt

@@ -22,6 +22,7 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt

@@ -22,6 +22,7 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest
 {
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ActionGroupWithStepKeyReferencesCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt

@@ -61,7 +61,7 @@ class ActionGroupWithTopLevelPersistedDataCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt

@@ -61,7 +61,7 @@ class ArgumentWithSameNameAsElementCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/AssertTest.txt

@@ -37,6 +37,7 @@ class AssertTestCest
 	}
 
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/BasicActionGroupTest.txt

@@ -42,7 +42,7 @@ class BasicActionGroupTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -50,7 +50,7 @@ class BasicFunctionalTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Basic Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-305"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/BasicMergeTest.txt

@@ -52,7 +52,7 @@ class BasicMergeTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Merge Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/CharacterReplacementTest.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class CharacterReplacementTestCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/DataReplacementTest.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class DataReplacementTestCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/HookActionsTest.txt

@@ -76,6 +76,7 @@ class HookActionsTestCest
 	}
 
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/LocatorFunctionTest.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class LocatorFunctionTestCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/MergedActionGroupTest.txt

@@ -61,7 +61,7 @@ class MergedActionGroupTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/MergedReferencesTest.txt

@@ -50,7 +50,7 @@ class MergedReferencesTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Merge Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/MultipleActionGroupsTest.txt

@@ -61,7 +61,7 @@ class MultipleActionGroupsTestCest
 
 	/**
 	 * @Severity(level = SeverityLevel::CRITICAL)
-	 * @Features({"Action Group Functional Cest"})
+	 * @Features({"TestModule"})
 	 * @Stories({"MQE-433"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I

dev/tests/verification/Resources/PageReplacementTest.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class PageReplacementTestCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/ParameterArrayTest.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class ParameterArrayTestCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/PersistedReplacementTest.txt

@@ -37,6 +37,7 @@ class PersistedReplacementTestCest
 	}
 
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt

@@ -49,6 +49,7 @@ class PersistenceCustomFieldsTestCest
 	}
 
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

dev/tests/verification/Resources/SectionReplacementTest.txt

@@ -20,6 +20,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 class SectionReplacementTestCest
 {
 	/**
+	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void

src/Magento/FunctionalTestingFramework/Config/Dom.php

@@ -215,6 +215,14 @@ protected function isTextNode($node)
     protected function mergeAttributes($baseNode, $mergeNode)
     {
         foreach ($mergeNode->attributes as $attribute) {
+            // Do not overwrite filename of base node
+            if ($attribute->name === "filename") {
+                $baseNode->setAttribute(
+                    $this->getAttributeName($attribute),
+                    $baseNode->getAttribute("filename") . "," . $attribute->value
+                );
+                continue;
+            }
             $baseNode->setAttribute($this->getAttributeName($attribute), $attribute->value);
         }
     }