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

- improvement in ComposerJsonFinder

Author: jilu1

src/Magento/FunctionalTestingFramework/Composer/Util/ComposerJsonFinder.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\FunctionalTestingFramework\Composer\Util;
 
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
+
 /**
  * Class ComposerJsonFinder searches composer json file for possible test module code paths
  */
@@ -33,4 +35,34 @@ public function findAllComposerJsonFiles($directory)
             return $jsonFileList;
         }
     }
+
+    /**
+     * Find absolute paths of all composer json files in a given directory at certain depths
+     *
+     * @param string  $directory
+     * @param integer $depth
+     * @return array
+     */
+    public function finComposerJsonFilesAtDepth($directory, $depth)
+    {
+        $directory = realpath($directory);
+        $jsonPattern = DIRECTORY_SEPARATOR . "composer.json";
+        $subDirectoryPattern = DIRECTORY_SEPARATOR . "*";
+
+        $jsonFileList = [];
+        if ($depth > 0) {
+            foreach (glob($directory . $subDirectoryPattern, GLOB_ONLYDIR) as $dir) {
+                $jsonFileList = array_merge_recursive(
+                    $jsonFileList,
+                    self::finComposerJsonFilesAtDepth($dir, $depth-1)
+                );
+            }
+        } elseif ($depth == 0) {
+            $jsonFileList = glob($directory . $jsonPattern);
+            if ($jsonFileList === false) {
+                $jsonFileList = [];
+            }
+        }
+        return $jsonFileList;
+    }
 }

src/Magento/FunctionalTestingFramework/Util/ComposerModuleResolver.php

@@ -107,7 +107,7 @@ private function getTestModules($directory)
         // Find all composer json files under directory
         $modules = [];
         $jsonFinder = new ComposerJsonFinder();
-        $fileList = $jsonFinder->findAllComposerJsonFiles($normalizedDir);
+        $fileList = $jsonFinder->finComposerJsonFilesAtDepth($normalizedDir, 2);
         foreach ($fileList as $file) {
             // Parse composer json for test module name and path information
             $composerInfo = new ComposerPackager(