Merge branch 'develop' into MQE-1017

Author: aljcalandra

src/Magento/FunctionalTestingFramework/Config/Dom/ArrayNodeConfig.php

@@ -24,6 +24,13 @@ class ArrayNodeConfig
      */
     private $assocArrays = [];
 
+    /**
+     * Flat array of expanded patterns for matching xpath
+     *
+     * @var array
+     */
+    private $flatAssocArray = [];
+
     /**
      * Format: array('/numeric/array/path', ...)
      *
@@ -44,6 +51,7 @@ public function __construct(
     ) {
         $this->nodePathMatcher = $nodePathMatcher;
         $this->assocArrays = $assocArrayAttributes;
+        $this->flatAssocArray = $this->flattenToAssocKeyAttributes($assocArrayAttributes);
         $this->numericArrays = $numericArrays;
     }
 
@@ -71,11 +79,68 @@ public function isNumericArray($nodeXpath)
      */
     public function getAssocArrayKeyAttribute($nodeXpath)
     {
+        if (array_key_exists($nodeXpath, $this->flatAssocArray)) {
+            return $this->flatAssocArray[$nodeXpath];
+        }
+
         foreach ($this->assocArrays as $pathPattern => $keyAttribute) {
             if ($this->nodePathMatcher->match($pathPattern, $nodeXpath)) {
                 return $keyAttribute;
             }
         }
         return null;
     }
+
+    /**
+     * Function which takes a patterned list of xpath matchers and flattens to a single level array for
+     * performance improvement
+     *
+     * @param array $assocArrayAttributes
+     * @return array
+     */
+    private function flattenToAssocKeyAttributes($assocArrayAttributes)
+    {
+        $finalPatterns = [];
+        foreach ($assocArrayAttributes as $pattern => $key) {
+            $vars = explode("/", ltrim($pattern, "/"));
+            $stringPatterns = [""];
+            foreach ($vars as $var) {
+                if (strstr($var, "|")) {
+                    $repOpen = str_replace("(", "", $var);
+                    $repClosed = str_replace(")", "", $repOpen);
+                    $nestedPatterns = explode("|", $repClosed);
+                    $stringPatterns = $this->mergeStrings($stringPatterns, $nestedPatterns);
+                    continue;
+                }
+
+                // append this path to all of the paths that currently exist
+                array_walk($stringPatterns, function (&$value, $key) use ($var) {
+                    $value .= "/" . $var;
+                });
+            }
+
+            $finalPatterns = array_merge($finalPatterns, array_fill_keys($stringPatterns, $key));
+        }
+
+        return $finalPatterns;
+    }
+
+    /**
+     * Takes 2 arrays and appends all string in the second array to each entry in the first.
+     *
+     * @param string[] $parentStrings
+     * @param string[] $childStrings
+     * @return array
+     */
+    private function mergeStrings($parentStrings, $childStrings)
+    {
+        $result = [];
+        foreach ($parentStrings as $pString) {
+            foreach ($childStrings as $cString) {
+                $result[] = $pString . "/" . $cString;
+            }
+        }
+
+        return $result;
+    }
 }

src/Magento/FunctionalTestingFramework/Console/GenerateTestsCommand.php

@@ -79,7 +79,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $testManifest->createTestGroups($time);
         }
 
-        SuiteGenerator::getInstance()->generateAllSuites($testManifest);
+        if (empty($tests)) {
+            SuiteGenerator::getInstance()->generateAllSuites($testManifest);
+        }
+
         $testManifest->generate();
 
        $output->writeln("Generate Tests Command Run");

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php

@@ -128,7 +128,7 @@ private function processParserOutput($parserOutput)
                 throw new XmlException(sprintf(self::DATA_NAME_ERROR_MSG, $name));
             }
 
-            $type = $rawEntity[self::_TYPE];
+            $type = $rawEntity[self::_TYPE] ?? null;
             $data = [];
             $linkedEntities = [];
             $uniquenessData = [];