MQE-1650: Update MFTF configuration to read Test entities from new location

Author: jilu1

dev/tests/unit/Magento/FunctionalTestFramework/Util/ModulePathExtractorTest.php

@@ -18,13 +18,13 @@ class ModulePathExtractorTest extends MagentoTestCase
      * @var array
      */
     private $mockTestModulePaths = [
-        'Magento_ModuleA' => ['/base/path/app/code/Magento/ModuleA/Test/Mftf'],
-        'VendorB_ModuleB' => ['/base/path/app/code/VendorB/ModuleB/Test/Mftf'],
-        'Magento_ModuleC' => ['/base/path/dev/tests/acceptance/tests/functional/Magento/ModuleCTest'],
-        'VendorD_ModuleD' => ['/base/path/dev/tests/acceptance/tests/functional/VendorD/ModuleDTest'],
-        'SomeModuleE' => ['/base/path/dev/tests/acceptance/tests/functional/FunctionalTest/SomeModuleE'],
-        'Magento_ModuleF' => ['/base/path/vendor/magento/module-modulef/Test/Mftf'],
-        'VendorG_ModuleG' => ['/base/path/vendor/vendorg/module-moduleg-test'],
+        'Magento_ModuleA' => '/base/path/app/code/Magento/ModuleA/Test/Mftf',
+        'VendorB_ModuleB' => '/base/path/app/code/VendorB/ModuleB/Test/Mftf',
+        'Magento_ModuleC' => '/base/path/dev/tests/acceptance/tests/functional/Magento/ModuleCTest',
+        'VendorD_ModuleD' => '/base/path/dev/tests/acceptance/tests/functional/VendorD/ModuleDTest',
+        'SomeModuleE' => '/base/path/dev/tests/acceptance/tests/functional/FunctionalTest/SomeModuleE',
+        'Magento_ModuleF' => '/base/path/vendor/magento/module-modulef/Test/Mftf',
+        'VendorG_ModuleG' => '/base/path/vendor/vendorg/module-moduleg-test',
     ];
 
     /**

src/Magento/FunctionalTestingFramework/Util/ModulePathExtractor.php

@@ -91,8 +91,8 @@ private function extractKeyByPath($path)
         }
         $paths = array_slice($paths, 0, count($paths)-2);
         $shortenedPath = implode(DIRECTORY_SEPARATOR, $paths);
-        foreach ($this->testModulePaths as $key => $pathArr) {
-            if (isset($pathArr[0]) && $pathArr[0] == $shortenedPath) {
+        foreach ($this->testModulePaths as $key => $keyValue) {
+            if ( $keyValue == $shortenedPath) {
                 return $key;
             }
         }

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

@@ -301,7 +301,7 @@ private function flipAndFilterArray($objectArray, $filterArray = null)
                     || (is_array($filterArray) && in_array($modules[0], $filterArray))
                     || isset($this->knownDirectories[$modules[0]])) {
                     if (strpos($modules[0], '_') === false) {
-                        $modules[0] = $this->getPossibleVendorName($path);
+                        $modules[0] = $this->getPossibleVendorName($path) . '_' . $modules[0];
                     }
                     $flippedArray[$modules[0]] = $path;
                 }