MQE-1703: Implicit Suite Generation for Tests

Style fixes

Author: soumyau

src/Magento/FunctionalTestingFramework/Console/BaseGenerateCommand.php

@@ -81,24 +81,23 @@ protected function getTestAndSuiteConfiguration(array $tests)
         $testConfiguration['tests'] = null;
         $testConfiguration['suites'] = null;
         $testsReferencedInSuites = SuiteObjectHandler::getInstance()->getAllTestReferences();
-        $resolvedTests = [];
+        $suiteToTestPair = [];
 
         foreach($tests as $test) {
             if (array_key_exists($test, $testsReferencedInSuites)) {
                 $suites = $testsReferencedInSuites[$test];
-                $resolvedTests = array_merge(
-                    $resolvedTests,
-                    array_map(function ($value) use ($test) {
-                        return  $value . ':' . $test;
-                    }, $suites)
-                );
+                foreach ($suites as $suite) {
+                    $suiteToTestPair[] = "$suite:$test";
+                }
             }
             // configuration for tests
-            else $testConfiguration['tests'][] = $test;
+            else {
+                $testConfiguration['tests'][] = $test;
+            }
         }
         // configuration for suites
-        foreach ($resolvedTests as $test) {
-            list($suite, $test) = explode(":", $test);
+        foreach ($suiteToTestPair as $pair) {
+            list($suite, $test) = explode(":", $pair);
             $testConfiguration['suites'][$suite][] = $test;
         }
         $testConfigurationJson = json_encode($testConfiguration);

src/Magento/FunctionalTestingFramework/Console/RunTestCommand.php

@@ -112,7 +112,8 @@ function ($type, $buffer) use ($output) {
         return $returnCode;
     }
 
-    /** Get an array of tests with resolved suite references from $testConfiguration
+    /**
+     * Get an array of tests with resolved suite references from $testConfiguration
      * eg: if test is referenced in a suite, it'll be stored in format suite:test
      * @param string $testConfigurationJson
      * @return array
@@ -125,12 +126,9 @@ private function resolveSuiteReferences($testConfigurationJson)
         $testArrayBuilder = [];
 
         foreach ($suitesArray as $suite => $tests) {
-            $testArrayBuilder = array_merge(
-                $testArrayBuilder,
-                array_map(function ($test) use ($suite) {
-                    return $suite . ':' . $test;
-                }, $tests)
-            );
+            foreach($tests as $test){
+                $testArrayBuilder[] = "$suite:$test";
+            }
         }
         return array_merge($testArrayBuilder, $testsArray);
     }