Merge remote-tracking branch 'epam/MAGETWO-54708-PR' into PRS

slavvka · slavvka · commit 5a01fe1c05d3 · 2017-07-06T12:36:12.000+03:00
diff --git a/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php b/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
@@ -114,18 +114,17 @@ public function introduceParamLabels()
      */
     private function generateAttribute($optionCount)
     {
-        $stores = $this->storeManager->getStores();
-        $storeViewsCount = count($stores);
+        $storeIds = array_keys($this->storeManager->getStores(true));
         $options = [];
 
         for ($option = 1; $option <= $optionCount; $option++) {
             $options['order']['option_' . $option] = $option;
-            $options['value']['option_' . $option] = array_fill(0, $storeViewsCount + 1, 'option ' . $option);
+            $options['value']['option_' . $option] = array_fill_keys($storeIds, 'option ' . $option);
             $options['delete']['option_' . $option] = '';
         }
 
         $data = [
-            'frontend_label' => array_fill(0, $storeViewsCount + 1, 'configurable variations'),
+            'frontend_label' => array_fill_keys($storeIds, 'configurable variations'),
             'frontend_input' => 'select',
             'is_required' => '0',
             'option' => $options,
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/AutoIncrement.php b/setup/src/Magento/Setup/Model/FixtureGenerator/AutoIncrement.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Model\FixtureGenerator;
+
+/**
+ * Class provides information about MySQL auto_increment configuration setting.
+ */
+class AutoIncrement
+{
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var int
+     */
+    private $incrementValue;
+
+    /**
+     * @param \Magento\Framework\App\ResourceConnection $resource
+     */
+    public function __construct(\Magento\Framework\App\ResourceConnection $resource)
+    {
+        $this->resource = $resource;
+    }
+
+    /**
+     * Get value of auto_increment_increment variable.
+     *
+     * @return int
+     */
+    public function getIncrement()
+    {
+        if ($this->incrementValue === null) {
+            $increment = $this->resource->getConnection()->fetchRow('SHOW VARIABLES LIKE "auto_increment_increment"');
+            $this->incrementValue = !empty($increment['Value']) ? (int)$increment['Value'] : 1;
+        }
+        return $this->incrementValue;
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductGenerator.php
@@ -27,12 +27,22 @@ class ConfigurableProductGenerator
      */
     private $productGeneratorFactory;
 
+    /**
+     * @var AutoIncrement
+     */
+    private $autoIncrement;
+
     /**
      * @param ProductGeneratorFactory $productGeneratorFactory
+     * @param AutoIncrement $autoIncrement
      */
-    public function __construct(ProductGeneratorFactory $productGeneratorFactory)
-    {
+    public function __construct(
+        ProductGeneratorFactory $productGeneratorFactory,
+        AutoIncrement $autoIncrement
+    ) {
         $this->productGeneratorFactory = $productGeneratorFactory;
+        $this->autoIncrement = $autoIncrement;
+
     }
 
     /**
@@ -101,7 +111,8 @@ public function generate($products, $fixtureMap)
      */
     private function generateSuperAttributeId($superAttributeId, $entityNumber, array $fixture)
     {
-        return $superAttributeId + $entityNumber * $fixture['_attributes_count'] + $fixture['_attributes_count'];
+        return $superAttributeId + ($entityNumber + 1) * $fixture['_attributes_count']
+            * $this->autoIncrement->getIncrement();
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/EavVariationsFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/EavVariationsFixtureTest.php
@@ -15,10 +15,13 @@
 use Magento\Setup\Fixtures\FixtureModel;
 use Magento\Store\Model\StoreManager;
 
+/**
+ * Unit test for \Magento\Setup\Fixtures\EavVariationsFixture.
+ */
 class EavVariationsFixtureTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|FixtureModel
+     * @var FixtureModel|\PHPUnit_Framework_MockObject_MockObject
      */
     private $fixtureModelMock;
 
@@ -28,22 +31,22 @@ class EavVariationsFixtureTest extends \PHPUnit_Framework_TestCase
     private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $storeManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Set|\PHPUnit_Framework_MockObject_MockObject
      */
     private $attributeSetMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $cacheMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
     private $eavConfigMock;
 
@@ -52,14 +55,24 @@ class EavVariationsFixtureTest extends \PHPUnit_Framework_TestCase
      */
     private $attributeFactoryMock;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
-        $this->fixtureModelMock = $this->getMock(FixtureModel::class, [], [], '', false);
-        $this->eavConfigMock = $this->getMock(Config::class, [], [], '', false);
-        $this->storeManagerMock = $this->getMock(StoreManager::class, [], [], '', false);
-        $this->attributeSetMock = $this->getMock(Set::class, [], [], '', false);
-        $this->cacheMock = $this->getMock(CacheInterface::class, [], [], '', false);
-        $this->attributeFactoryMock = $this->getMock(AttributeFactory::class, ['create'], [], '', false);
+        $this->fixtureModelMock = $this->getMockBuilder(FixtureModel::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->eavConfigMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManager::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->attributeSetMock = $this->getMockBuilder(Set::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->attributeFactoryMock = $this->getMockBuilder(AttributeFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
 
         $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
             EavVariationsFixture::class,
@@ -74,24 +87,32 @@ public function setUp()
         );
     }
 
-    public function testDoNotExecuteWhenAttributeAleadyExist()
+    /**
+     * Test for execute method when attribute already exists.
+     *
+     * @return void
+     */
+    public function testDoNotExecuteWhenAttributeAlreadyExist()
     {
-        $this->fixtureModelMock
-            ->expects($this->any())
-            ->method('getValue')
-            ->with('configurable_products', [])
-            ->willReturn(10);
+        $this->fixtureModelMock->expects($this->once())
+            ->method('getValue')->with('configurable_products', [])->willReturn(10);
         $this->eavConfigMock->expects($this->once())->method('getEntityAttributeCodes')
             ->willReturn(['configurable_variation']);
         $this->attributeFactoryMock->expects($this->never())->method('create');
 
         $this->model->execute();
     }
 
+    /**
+     * Test for execute method.
+     *
+     * @return void
+     */
     public function testExecute()
     {
-        $this->eavConfigMock->expects($this->once())->method('getEntityAttributeCodes')
-            ->willReturn(['attr1', 'attr2']);
+        $storeId = 5;
+        $this->eavConfigMock->expects($this->once())
+            ->method('getEntityAttributeCodes')->willReturn(['attr1', 'attr2']);
         $this->fixtureModelMock
             ->expects($this->any())
             ->method('getValue')
@@ -100,42 +121,33 @@ public function testExecute()
                 ['configurable_products_variation', 3, 1],
             ]);
 
-        $storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStores')
-            ->will($this->returnValue([$storeMock]));
-
+        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->storeManagerMock->expects($this->once())->method('getStores')->willReturn([$storeId => $storeMock]);
         $this->attributeSetMock->expects($this->once())->method('load')->willReturnSelf();
-        $this->attributeSetMock->expects($this->once())
-            ->method('getDefaultGroupId')
-            ->will($this->returnValue(2));
+        $this->attributeSetMock->expects($this->once())->method('getDefaultGroupId')->willReturn(2);
 
         $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->setMethods([
                 'setAttributeSetId',
                 'setAttributeGroupId',
                 'save',
-            ])->disableOriginalConstructor()
-            ->getMock();
-        $attributeMock->expects($this->exactly(2))
-            ->method('setAttributeSetId')
-            ->willReturnSelf();
-        $attributeMock->expects($this->once())
-            ->method('setAttributeGroupId')
-            ->willReturnSelf();
+            ])
+            ->disableOriginalConstructor()->getMock();
+        $attributeMock->expects($this->exactly(2))->method('setAttributeSetId')->willReturnSelf();
+        $attributeMock->expects($this->once())->method('setAttributeGroupId')->willReturnSelf();
         $this->attributeFactoryMock->expects($this->once())->method('create')
             ->with(
                 [
                     'data' => [
                         'frontend_label' => [
-                            'configurable variations',
-                            'configurable variations',
+                            $storeId => 'configurable variations',
                         ],
                         'frontend_input' => 'select',
                         'is_required' => '0',
                         'option' => [
                             'order' => ['option_1' => 1],
-                            'value' => ['option_1' => ['option 1', 'option 1']],
+                            'value' => ['option_1' => [$storeId => 'option 1']],
                             'delete' => ['option_1' => ''],
                         ],
                         'default' => ['option_0'],
@@ -172,16 +184,27 @@ public function testExecute()
                     ]
                 ]
             )->willReturn($attributeMock);
-        $this->cacheMock->expects($this->once())->method('remove')->with(Config::ATTRIBUTES_CACHE_ID . Product::ENTITY);
+        $this->cacheMock->expects($this->once())
+            ->method('remove')->with(Config::ATTRIBUTES_CACHE_ID . Product::ENTITY);
 
         $this->model->execute();
     }
 
+    /**
+     * Test for getActionTitle method.
+     *
+     * @return void
+     */
     public function testGetActionTitle()
     {
         $this->assertSame('Generating configurable EAV variations', $this->model->getActionTitle());
     }
 
+    /**
+     * Test for introduceParamLabels method.
+     *
+     * @return void
+     */
     public function testIntroduceParamLabels()
     {
         $this->assertSame([], $this->model->introduceParamLabels());
