MQE-1963: Update XSD Schema to verify that file has only single entity

Author: jilu1

docs/commands/mftf.md

@@ -28,7 +28,7 @@ vendor/bin/mftf build:project
 vendor/bin/mftf build:project --upgrade
 ```
 
-Upgrades the existing MFTF tests after the MFTF major upgrade.
+Upgrades the all installed MFTF tests after the MFTF major upgrade.
 
 ### Generate all tests
 
@@ -115,7 +115,7 @@ vendor/bin/mftf build:project [--upgrade] [config_param_options]
 
 | Option            | Description                                                                                                                                                                                   |
 | ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `-u`, `--upgrade` | Upgrades existing MFTF tests according to requirements of the last major release. Specifying this flag upgrades only those tests in the default location. Example: `build:project --upgrade`. |
+| `-u`, `--upgrade` | Upgrades all installed MFTF tests according to requirements of the last major release. Specifying this flag upgrades only those tests in the default location. Example: `build:project --upgrade`. |
 
 You can include options to set configuration parameter values for your environment since the project build process also [sets up the environment][setup].
 
@@ -505,19 +505,26 @@ vendor/bin/mftf static-checks testDependencies actionGroupArguments
 
 ### `upgrade:tests`
 
-Applies all the MFTF major version upgrade scripts to test components in the given path (`test.xml`, `data.xml`, etc).
+When path argument is specified, this command will apply all the MFTF major version upgrade scripts to test components in the given path (`test.xml`, `data.xml`, etc);
+otherwise it will apply all the MFTF major version upgrade scripts to all installed test components.
 
 #### Usage
 
 ```bash
-vendor/bin/mftf upgrade:tests <path>
+vendor/bin/mftf upgrade:tests [<path>]
 ```
 
 `<path>` is the path that contains MFTF test components that need to be upgraded.
 The command searches recursively for any `*.xml` files to upgrade.
 
 #### Examples
 
+To upgrade all installed MFTF tests
+
+```bash
+vendor/bin/mftf upgrade:tests
+```
+
 To upgrade all test components inside modules in the `dev/tests/acceptance/tests/` directory:
 
 ```bash

etc/di.xml

@@ -80,7 +80,7 @@
     </virtualType>
     <virtualType name="Magento\FunctionalTestingFramework\Config\Reader\Page" type="Magento\FunctionalTestingFramework\Config\Reader\MftfFilesystem">
         <arguments>
-            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Module</argument>
+            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Mask</argument>
             <argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
             <argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Page</argument>
             <argument name="domDocumentClass" xsi:type="string">Magento\FunctionalTestingFramework\Page\Config\Dom</argument>

src/Magento/FunctionalTestingFramework/Config/FileResolver/Root.php

@@ -11,7 +11,7 @@
 use Magento\FunctionalTestingFramework\Util\Iterator\File;
 use Magento\FunctionalTestingFramework\Util\Path\FilePathFormatter;
 
-class Root extends Module
+class Root extends Mask
 {
     const ROOT_SUITE_DIR = "tests/_suite";
 
@@ -26,16 +26,29 @@ class Root extends Module
      */
     public function get($filename, $scope)
     {
-        // first pick up the root level test suite dir
-        $paths = glob(
-            FilePathFormatter::format(TESTS_BP) . self::ROOT_SUITE_DIR
-            . DIRECTORY_SEPARATOR . $filename
-        );
+        // First pick up the root level test suite dir
+        $paths = [];
+        $dir = FilePathFormatter::format(TESTS_BP) . self::ROOT_SUITE_DIR;
+        if (is_readable($dir)) {
+            $directoryIterator = new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator(
+                    $dir,
+                    \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS
+                )
+            );
+            $regexpIterator = new \RegexIterator($directoryIterator, $filename);
+            /** @var \SplFileInfo $file */
+            foreach ($regexpIterator as $file) {
+                if ($file->isFile() && $file->isReadable()) {
+                    $paths[] = $file->getRealPath();
+                }
+            }
+        }
 
-        // then merge this path into the module based paths
-        // Since we are sharing this code with Module based resolution we will unncessarily glob against modules in the
+        // Then merge this path into the module based paths
+        // Since we are sharing this code with Module based resolution we will unnecessarily glob against modules in the
         // dev/tests dir tree, however as we plan to migrate to app/code this will be a temporary unneeded check.
-        $paths = array_merge($paths, $this->getPaths($filename, $scope));
+        $paths = array_merge($paths, $this->getFileCollection($filename, $scope));
 
         // create and return the iterator for these file paths
         $iterator = new File($paths);

src/Magento/FunctionalTestingFramework/Console/UpgradeTestsCommand.php

@@ -33,8 +33,11 @@ protected function configure()
     {
         $this->setName('upgrade:tests')
             ->setDescription(
-                'This command will upgrade all installed mftf tests according to new MFTF Major version requirements.'
-            );
+                'This command will upgrade MFTF tests according to new MFTF Major version requirements. '
+                . 'It will upgrade MFTF tests in specific path when "path" argument is specified, otherwise it will '
+                . 'upgrade all MFTF tests installed.'
+            )
+            ->addArgument('path', InputArgument::OPTIONAL, 'path to MFTF tests to upgrade');
         $this->upgradeScriptsList = new UpgradeScriptList();
     }
 

src/Magento/FunctionalTestingFramework/Upgrade/SplitMultipleEntitiesFiles.php

@@ -56,10 +56,14 @@ class SplitMultipleEntitiesFiles implements UpgradeInterface
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $testsUpdated = 0;
-        $allModulePaths = ScriptUtil::getAllModulePaths();
+        $testPaths[] = $input->getArgument('path');
+        if (empty($testPaths[0])) {
+            $testPaths = ScriptUtil::getAllModulePaths();
+        }
+
         foreach ($this->entityCategories as $type => $urn) {
             $xmlFiles = ScriptUtil::buildFileList(
-                $allModulePaths,
+                $testPaths,
                 DIRECTORY_SEPARATOR . $type . DIRECTORY_SEPARATOR
             );
 

src/Magento/FunctionalTestingFramework/Upgrade/UpdateTestSchemaPaths.php

@@ -58,8 +58,12 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         $testsUpdated = 0;
-        $allModulePaths = ScriptUtil::getAllModulePaths();
-        foreach ($allModulePaths as $testsPath) {
+        $testPaths[] = $input->getArgument('path');
+        if (empty($testPaths[0])) {
+            $testPaths = ScriptUtil::getAllModulePaths();
+        }
+
+        foreach ($testPaths as $testsPath) {
             $finder = new Finder();
             $finder->files()->in($testsPath)->name("*.xml");
 

src/Magento/FunctionalTestingFramework/Util/ModulePathExtractor.php

@@ -90,7 +90,7 @@ private function extractKeyByPath($path)
         }
 
         foreach ($this->testModulePaths as $key => $value) {
-            if ($value == $shortenedPath) {
+            if (substr($path, 0, strlen($value)) == $value) {
                 return $key;
             }
         }

src/Magento/FunctionalTestingFramework/Util/Script/ScriptUtil.php

@@ -65,19 +65,27 @@ public static function printErrorsToFile($errors, $filename, $message)
 
     /**
      * Builds list of all XML files in given modulePaths + path given
+     * Return empty array if Finder is not run
+     *
      * @param array  $modulePaths
      * @param string $path
-     * @return Finder
+     * @return Finder|array
      */
     public static function buildFileList($modulePaths, $path)
     {
+        $finderRun = false;
         $finder = new Finder();
         foreach ($modulePaths as $modulePath) {
             if (!realpath($modulePath . $path)) {
                 continue;
             }
             $finder->files()->in($modulePath . $path)->name("*.xml");
+            $finderRun = true;
+        }
+        if ($finderRun) {
+            return $finder->files();
+        } else {
+            return [];
         }
-        return $finder->files();
     }
 }