Merge remote-tracking branch 'origin/develop' into ACQE-5871

Author: jilu1

src/Magento/FunctionalTestingFramework/Console/GenerateTestsCommand.php

@@ -252,7 +252,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // check test dependencies log command
         if (!empty($log)) {
             if ($log === "testEntityJson") {
-                $this->getTestEntityJson($tests);
+                $this->getTestEntityJson($filterList ??[], $tests);
                 $testDependencyFileLocation = self::TEST_DEPENDENCY_FILE_LOCATION_EMBEDDED;
                 if (isset($_ENV['MAGENTO_BP'])) {
                     $testDependencyFileLocation = self::TEST_DEPENDENCY_FILE_LOCATION_STANDALONE;
@@ -395,21 +395,22 @@ private function parseConfigParallelOptions($time, $groups)
      * @throws TestFrameworkException
      * @throws XmlException|FastFailException
      */
-    private function getTestEntityJson(array $tests = [])
+    private function getTestEntityJson(array $filterList, array $tests = [])
     {
-        $testDependencies = $this->getTestDependencies($tests);
+        $testDependencies = $this->getTestDependencies($filterList, $tests);
         $this->array2Json($testDependencies);
     }
 
     /**
      * Function responsible for getting test dependencies in array
+     * @param array $filterList
      * @param array $tests
      * @return array
      * @throws FastFailException
      * @throws TestFrameworkException
      * @throws XmlException
      */
-    public function getTestDependencies(array $tests = []): array
+    public function getTestDependencies(array $filterList, array $tests = []): array
     {
         $this->scriptUtil = new ScriptUtil();
         $this->testDependencyUtil = new TestDependencyUtil();
@@ -442,7 +443,11 @@ public function getTestDependencies(array $tests = []): array
         }
 
         list($testDependencies, $extendedTestMapping) = $this->findTestDependentModule($testXmlFiles);
-        return $this->testDependencyUtil->mergeDependenciesForExtendingTests($testDependencies, $extendedTestMapping);
+        return $this->testDependencyUtil->mergeDependenciesForExtendingTests(
+            $testDependencies,
+            $filterList,
+            $extendedTestMapping
+        );
     }
 
     /**

src/Magento/FunctionalTestingFramework/Util/Script/TestDependencyUtil.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\FunctionalTestingFramework\Util\Script;
 
+use Magento\FunctionalTestingFramework\Test\Handlers\TestObjectHandler;
+use Magento\FunctionalTestingFramework\Filter\FilterList;
+use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
+
 /**
  * TestDependencyUtil class that contains helper functions for static and upgrade scripts
  *
@@ -144,11 +148,16 @@ public function getModuleName(string $filePath, array $moduleNameToPath): ?strin
     /**
      * Return array of merge test modules and file path with same test name.
      * @param array $testDependencies
+     * @param array $filterList
      * @param array $extendedTestMapping
      * @return array
      */
-    public function mergeDependenciesForExtendingTests(array $testDependencies, array $extendedTestMapping = []): array
-    {
+    public function mergeDependenciesForExtendingTests(
+        array $testDependencies,
+        array $filterList,
+        array $extendedTestMapping = []
+    ): array {
+        $filteredTestNames = (count($filterList)>0)?$this->getFilteredTestNames():[];
         $temp_array = array_reverse(array_column($testDependencies, "test_name"), true);
         if (!empty($extendedTestMapping)) {
             foreach ($extendedTestMapping as $value) {
@@ -165,20 +174,42 @@ public function mergeDependenciesForExtendingTests(array $testDependencies, arra
         }
         $testDependencies = [];
         foreach ($temp_array as $testDependencyArray) {
-            $testDependencies[] = [
-                "file_path" => array_column($testDependencyArray, 'file_path'),
-                "full_name" => $testDependencyArray[0]["full_name"],
-                "test_name" => $testDependencyArray[0]["test_name"],
-                "test_modules" =>array_values(
-                    array_unique(
-                        call_user_func_array(
-                            'array_merge',
-                            array_column($testDependencyArray, 'test_modules')
+            if ((
+                empty($filterList)) ||
+                isset($filteredTestNames[$testDependencyArray[0]["test_name"]])
+            ) {
+                $testDependencies[] = [
+                    "file_path" => array_column($testDependencyArray, 'file_path'),
+                    "full_name" => $testDependencyArray[0]["full_name"],
+                    "test_name" => $testDependencyArray[0]["test_name"],
+                    "test_modules" => array_values(
+                        array_unique(
+                            call_user_func_array(
+                                'array_merge',
+                                array_column($testDependencyArray, 'test_modules')
+                            )
                         )
-                    )
-                ),
-            ];
+                    ),
+                ];
+            }
         }
         return $testDependencies;
     }
+
+    /**
+     * Return array of merge test modules and file path with same test name.
+     * @return array
+     */
+    public function getFilteredTestNames()
+    {
+        $testObjects = TestObjectHandler::getInstance()->getAllObjects();
+        $filters = MftfApplicationConfig::getConfig()->getFilterList()->getFilters();
+        foreach ($filters as $filter) {
+            $filter->filter($testObjects);
+        }
+        $testValues = array_map(function ($testObjects) {
+            return $testObjects->getName();
+        }, $testObjects);
+        return $testValues;
+    }
 }