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

Author: jilu1

src/Magento/FunctionalTestingFramework/Composer/Handlers/AbstractComposerHandler.php

@@ -113,8 +113,10 @@ protected function parseSuggestsForMagentoModuleNames($suggests)
             $parts = explode(',', $suggest);
             $data = [];
             foreach ($parts as $part) {
-                list($name, $value) = explode(':', $part, 2);
-                $data[strtolower(trim($name))] = trim($value);
+                if (strpos($part, ':') !== false) {
+                    list($name, $value) = explode(':', $part, 2);
+                    $data[strtolower(trim($name))] = trim($value);
+                }
             }
 
             if (isset($data[self::SUGGEST_TYPE])

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

@@ -275,13 +275,12 @@ public function getModulesPath($flat = true)
         $allModulePaths = $this->normalizeModuleNames($allModulePaths);
 
         if (MftfApplicationConfig::getConfig()->forceGenerateEnabled()) {
-            $allModulePaths = $this->flipAndFlattenArray($allModulePaths);
+            $allModulePaths = $this->flipAndFilterArray($allModulePaths);
             $this->enabledModulePaths = $this->applyCustomModuleMethods($allModulePaths);
             return $this->enabledModulePaths;
         }
 
         $enabledModules = array_merge($this->getEnabledModules(), $this->getModuleWhitelist());
-        //$enabledDirectoryPaths = $this->getEnabledDirectoryPaths($enabledModules, $allModulePaths);
         $enabledDirectoryPaths = $this->flipAndFilterArray($allModulePaths, $enabledModules);
 
         $this->enabledModulePaths = $this->applyCustomModuleMethods($enabledDirectoryPaths);
@@ -425,7 +424,7 @@ private function globRelevantPaths($testPath, $pattern)
             && !empty($modulePaths)
         ) {
             $deprecatedPath = self::DEPRECATED_DEV_TESTS;
-            $suggestedPath = self::DEV_TESTS . DIRECTORY_SEPARATOR . 'Vendor';
+            $suggestedPath = self::DEV_TESTS . DIRECTORY_SEPARATOR . 'Magento';
             LoggingUtil::getInstance()->getLogger(ModuleResolver::class)->warning(
                 "DEPRECATION: $deprecatedPath is deprecated! Please move mftf test modules to $suggestedPath"
             );
@@ -600,31 +599,6 @@ private function flattenAllModulePaths($modulePaths)
         return $resultArray;
     }
 
-    /**
-     * Runs through enabled modules and maps them known module paths by name.
-     * @param array $enabledModules
-     * @param array $allModulePaths
-     * @return array
-     */
-    private function getEnabledDirectoryPaths($enabledModules, $allModulePaths)
-    {
-        $enabledDirectoryPaths = [];
-        foreach ($enabledModules as $magentoModuleName) {
-            if (!isset($this->knownDirectories[$magentoModuleName]) && !isset($allModulePaths[$magentoModuleName])) {
-                continue;
-            } elseif (isset($this->knownDirectories[$magentoModuleName])
-                && !isset($allModulePaths[$magentoModuleName])) {
-                LoggingUtil::getInstance()->getLogger(ModuleResolver::class)->warn(
-                    "Known directory could not match to an existing path.",
-                    ['knownDirectory' => $magentoModuleName]
-                );
-            } else {
-                $enabledDirectoryPaths[$magentoModuleName] = $allModulePaths[$magentoModuleName];
-            }
-        }
-        return $enabledDirectoryPaths;
-    }
-
     /**
      * Executes a REST call to the supplied Magento Base Url for version information to display during generation
      *