MQE-1782: MFTF run:group can't run test in a suite

- Fixed mixed group/suite usecase
- Added Unit test

Author: KevinBKozan

dev/tests/unit/Magento/FunctionalTestFramework/Console/BaseGenerateCommandTest.php

@@ -129,6 +129,28 @@ public function testTwoTestTwoSuiteOneGroupConfig()
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * Test specific usecase of a test that is in a group with the group being called along with the suite
+     * i.e. run:group Group1 Suite1
+     * @throws \Exception
+     */
+    public function testThreeTestOneSuiteOneGroupMix()
+    {
+        $testOne = new TestObject('Test1', [], [], []);
+        $testTwo = new TestObject('Test2', [], [], []);
+        $testThree = new TestObject('Test3', [], ['group' => ['Group1']], []);
+        $suiteOne = new SuiteObject('Suite1', ['Test1' => $testOne, 'Test2' => $testTwo, 'Test3' => $testThree], [], []);
+
+        $testArray = ['Test1' => $testOne, 'Test2' => $testTwo, 'Test3' => $testThree];
+        $suiteArray = ['Suite1' => $suiteOne];
+
+        $this->mockHandlers($testArray, $suiteArray);
+
+        $actual = json_decode($this->callGroupConfig(['Group1', 'Suite1']), true);
+        $expected = ['tests' => null, 'suites' => ['Suite1' => []]];
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * Mock handlers to skip parsing
      * @param array $testArray

src/Magento/FunctionalTestingFramework/Console/BaseGenerateCommand.php

@@ -148,6 +148,10 @@ protected function getGroupAndSuiteConfiguration(array $groupOrSuiteNames)
 
             foreach ($testsInGroupAndInAnySuite as $testInGroupAndInAnySuite) {
                 $suiteName = $testsInSuites[$testInGroupAndInAnySuite][0];
+                if (isset($result['suites'][$suiteName])) {
+                    // Suite is already being called to run in its entirety, do not filter list
+                    continue;
+                }
                 $result['suites'][$suiteName][] = $testInGroupAndInAnySuite;
             }