Merge branch 'develop' into ACQE-5908_ver2

Author: manjusha729

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

@@ -24,6 +24,8 @@
 use tests\unit\Util\MagentoTestCase;
 use tests\unit\Util\TestDataArrayBuilder;
 use tests\unit\Util\TestLoggingUtil;
+use Magento\FunctionalTestingFramework\Filter\FilterList;
+use Magento\FunctionalTestingFramework\Util\Script\TestDependencyUtil;
 
 class TestObjectHandlerTest extends MagentoTestCase
 {
@@ -447,4 +449,55 @@ function (
         $property->setAccessible(true);
         $property->setValue($resolver, $paths);
     }
+
+    /**
+     * Basic test for exclude group Filter
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testGetFilteredTestNamesWhenExcludeGroupFilterIsApplied()
+    {
+        $fileList = new FilterList(['excludeGroup' => ['test']]);
+        $toh = TestObjectHandler::getInstance()->getAllObjects();
+        $testDependencyUtil = new TestDependencyUtil();
+        $result = $testDependencyUtil->getFilteredTestNames($toh, $fileList->getFilters());
+        $this->assertIsArray($result);
+        $this->assertEquals(count($result), 0);
+    }
+
+    /**
+     * Basic test for include group Filter
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testGetFilteredTestNamesWhenIncludeGroupFilterIsApplied()
+    {
+        $fileList = new FilterList(['includeGroup' => ['test']]);
+        $toh = TestObjectHandler::getInstance()->getAllObjects();
+        $testDependencyUtil = new TestDependencyUtil();
+        $result = $testDependencyUtil->getFilteredTestNames($toh, $fileList->getFilters());
+        $this->assertIsArray($result);
+        $this->assertEquals(count($result), 1);
+        $this->assertEquals($result['testTest'], 'testTest');
+    }
+
+    /**
+     * Basic test when no filter applied
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function testGetFilteredTestNamesWhenNoFilterIsApplied()
+    {
+        $fileList = new FilterList();
+        $toh = TestObjectHandler::getInstance()->getAllObjects();
+        $testDependencyUtil = new TestDependencyUtil();
+        $result = $testDependencyUtil->getFilteredTestNames($toh, $fileList->getFilters());
+        $this->assertIsArray($result);
+        $this->assertEquals(count($result), 1);
+        //returns all test Names
+        $this->assertEquals($result['testTest'], 'testTest');
+    }
 }

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

@@ -157,7 +157,9 @@ public function mergeDependenciesForExtendingTests(
         array $filterList,
         array $extendedTestMapping = []
     ): array {
-        $filteredTestNames = (count($filterList)>0)?$this->getFilteredTestNames():[];
+        $testObjects = TestObjectHandler::getInstance()->getAllObjects();
+        $filters = MftfApplicationConfig::getConfig()->getFilterList()->getFilters();
+        $filteredTestNames = (count($filterList)>0)?$this->getFilteredTestNames($testObjects, $filters):[];
         $temp_array = array_reverse(array_column($testDependencies, "test_name"), true);
         if (!empty($extendedTestMapping)) {
             foreach ($extendedTestMapping as $value) {
@@ -198,12 +200,12 @@ public function mergeDependenciesForExtendingTests(
 
     /**
      * Return array of merge test modules and file path with same test name.
+     * @param array $testObjects
+     * @param array $filters
      * @return array
      */
-    public function getFilteredTestNames()
+    public function getFilteredTestNames(array $testObjects, array $filters) : array
     {
-        $testObjects = TestObjectHandler::getInstance()->getAllObjects();
-        $filters = MftfApplicationConfig::getConfig()->getFilterList()->getFilters();
         foreach ($filters as $filter) {
             $filter->filter($testObjects);
         }