MQE-982: Verification Test around Suite Generation

 - Added SingleRun Manifest Verification
 - Sanitized createGroupDir for multiple entry points

Author: aljcalandra

dev/_suite/functionalSuite.xml

@@ -18,4 +18,15 @@
             <test name="ExcludeTest2"/>
         </exclude>
     </suite>
+    <suite name="functionalSuite2">
+        <include>
+            <group name="include"/>
+            <test name="IncludeTest"/>
+            <module name="TestModule" file="SampleSuite2Test.xml"/>
+        </include>
+        <exclude>
+            <group name="exclude"/>
+            <test name="ExcludeTest2"/>
+        </exclude>
+    </suite>
 </suites>

dev/tests/verification/Tests/SuiteGenerationTest.php

@@ -204,6 +204,54 @@ public function testSuiteGenerationHooks()
 
     }
 
+    /**
+     * Test generation of parallel suite groups
+     */
+    public function testSuiteGenerationSingleRun()
+    {
+        //using functionalSuite2 to avoid directory caching
+        $groupName = 'functionalSuite2';
+
+        $expectedContents = [
+            'additionalTestCest.php',
+            'additionalIncludeTest2Cest.php',
+            'IncludeTest2Cest.php',
+            'IncludeTestCest.php'
+        ];
+
+        //createParallelManifest
+        /** @var ParallelTestManifest $parallelManifest */
+        $singleRunManifest = TestManifestFactory::makeManifest("singleRun", ["functionalSuite2" => []]);
+
+        // Generate the Suite
+        SuiteGenerator::getInstance()->generateAllSuites($singleRunManifest);
+        $singleRunManifest->generate();
+
+        // Validate console message and add group name for later deletion
+        $this->expectOutputRegex('/Suite .* generated to .*/');
+        self::$TEST_GROUPS[] = $groupName;
+
+        // Validate Yaml file updated
+        $yml = Yaml::parse(file_get_contents(self::CONFIG_YML_FILE));
+        $this->assertArrayHasKey($groupName, $yml['groups']);
+
+        $suiteResultBaseDir = self::GENERATE_RESULT_DIR .
+            DIRECTORY_SEPARATOR .
+            $groupName .
+            DIRECTORY_SEPARATOR;
+
+        // Validate tests have been generated
+        $dirContents = array_diff(scandir($suiteResultBaseDir), ['..', '.']);
+
+        foreach ($expectedContents as $expectedFile) {
+            $this->assertTrue(in_array($expectedFile, $dirContents));
+        }
+
+        $expectedManifest = "dev/tests/verification/_generated/default/" . PHP_EOL . "-g functionalSuite2" . PHP_EOL;
+
+        $this->assertEquals($expectedManifest, file_get_contents(self::getManifestFilePath()));
+    }
+
     /**
      * revert any changes made to config.yml
      * remove _generated directory

src/Magento/FunctionalTestingFramework/Util/Filesystem/DirSetupUtil.php

@@ -26,17 +26,19 @@ class DirSetupUtil
      */
     public static function createGroupDir($fullPath)
     {
+        //prevent redundant calls to these directories
+        $sanitizedPath = rtrim($fullPath, DIRECTORY_SEPARATOR);
         // make sure we haven't already cleaned up this directory at any point before deletion
-        if (in_array($fullPath, self::$DIR_CONTEXT)) {
+        if (in_array($sanitizedPath, self::$DIR_CONTEXT)) {
             return;
         }
 
-        if (file_exists($fullPath)) {
-            self::rmDirRecursive($fullPath);
+        if (file_exists($sanitizedPath)) {
+            self::rmDirRecursive($sanitizedPath);
         }
 
-        mkdir($fullPath, 0777, true);
-        self::$DIR_CONTEXT[] = $fullPath;
+        mkdir($sanitizedPath, 0777, true);
+        self::$DIR_CONTEXT[] = $sanitizedPath;
     }
 
     /**