Merge pull request #294 from magento-qmt/develop

[Mavericks] Implement fallback mechanism to generators

Author: Korshenko, Olexii(okorshenko)

dev/tests/functional/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc38",
+        "magento/mtf": "1.0.0-rc39",
         "php": "~5.5.0|~5.6.0|~7.0.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2"

dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\ModuleResolver;
+
+/**
+ * Module sequence sorter.
+ */
+class SequenceSorter implements SequenceSorterInterface
+{
+    /**
+     * Magento ObjectManager.
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $magentoObjectManager;
+
+    /**
+     * @constructor
+     */
+    public function __construct()
+    {
+        $this->initObjectManager();
+    }
+
+    /**
+     * Initialize Magento ObjectManager.
+     *
+     * @return void
+     */
+    protected function initObjectManager()
+    {
+        if (!$this->magentoObjectManager) {
+            $objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(
+                BP,
+                $_SERVER
+            );
+            $this->magentoObjectManager = $objectManagerFactory->create($_SERVER);
+        }
+    }
+
+    /**
+     * Get Magento module sequence load.
+     *
+     * @return array
+     */
+    protected function getModuleSequence()
+    {
+        return $this->magentoObjectManager->create('\Magento\Framework\Module\ModuleList\Loader')->load();
+    }
+
+    /**
+     * Sort files according to specified sequence.
+     *
+     * @param array $paths
+     * @return array
+     */
+    public function sort(array $paths)
+    {
+        $sortedPaths = [];
+        $modules = array_keys($this->getModuleSequence());
+        foreach ($modules as $module) {
+            foreach ($paths as $key => $path) {
+                $modulePath = realpath(MTF_TESTS_PATH . str_replace('_', '/', $module));
+                if (strpos($path, $modulePath) !== false) {
+                    $sortedPaths[] = $path;
+                    unset($paths[$key]);
+                }
+            }
+        }
+        $sortedPaths = array_merge($sortedPaths, $paths);
+
+        return $sortedPaths;
+    }
+}

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php

@@ -339,14 +339,14 @@ protected function addVariationMatrix(array $variationsMatrix, array $attribute,
         }
 
         foreach ($variationsMatrix as $rowKey => $row) {
-            $rowIsolation = mt_rand(1, 100);
-            $row['name'] .= ' ' . $rowIsolation;
-            $row['sku'] .= '_' . $rowIsolation;
+            $randIsolation = mt_rand(1, 100);
+            $rowName = $row['name'];
+            $rowSku = $row['sku'];
             $index = 1;
             foreach ($attribute['options'] as $optionKey => $option) {
                 $compositeKey = "{$attributeKey}:{$optionKey}";
-                $row['name'] .= ' ' . $index;
-                $row['sku'] .= '_' . $index;
+                $row['name'] = $rowName . ' ' . $randIsolation . ' ' . $index;
+                $row['sku'] = $rowSku . '_' . $randIsolation . '_' . $index;
                 $row['price'] = $option['pricing_value'];
                 $newRowKey = $rowKey ? "{$rowKey} {$compositeKey}" : $compositeKey;
                 $result[$newRowKey] = $row;