MAGETWO-67010: [Performance] Swatches real server side optimization

Author: mslabko

app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php

@@ -12,37 +12,34 @@
 class MediaTest extends \PHPUnit_Framework_TestCase
 {
     /** @var array */
-    protected $mediaGallery;
+    private $mediaGallery;
 
     /** @var \Magento\Swatches\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $swatchHelperMock;
+    private $swatchHelperMock;
 
     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $productModelFactoryMock;
+    private $productModelFactoryMock;
 
     /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
-    protected $productMock;
-
-    /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute|\PHPUnit_Framework_MockObject_MockObject */
-    protected $attributeMock;
+    private $productMock;
 
     /** @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $contextMock;
+    private $contextMock;
 
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
+    private $requestMock;
 
     /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $resultFactory;
+    private $resultFactory;
 
     /** @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject */
-    protected $jsonMock;
+    private $jsonMock;
 
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
-    protected $objectManager;
+    private $objectManager;
 
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager|\Magento\Swatches\Controller\Ajax\Media */
-    protected $controller;
+    private $controller;
 
     protected function setUp()
     {
@@ -64,25 +61,9 @@ protected function setUp()
             false
         );
         $this->productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
-        $this->attributeMock = $this->getMock(
-            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
-            [],
-            [],
-            '',
-            false
-        );
         $this->contextMock = $this->getMock(\Magento\Framework\App\Action\Context::class, [], [], '', false);
 
         $this->requestMock = $this->getMock(\Magento\Framework\App\RequestInterface::class);
-        $this->requestMock->expects($this->any())->method('getParam')->withConsecutive(
-            ['product_id'],
-            ['attributes'],
-            ['additional']
-        )->willReturnOnConsecutiveCalls(
-            59,
-            ['size' => 454],
-            ['color' => 43]
-        );
         $this->contextMock->method('getRequest')->willReturn($this->requestMock);
         $this->resultFactory = $this->getMock(
             \Magento\Framework\Controller\ResultFactory::class,
@@ -108,54 +89,7 @@ protected function setUp()
 
     public function testExecute()
     {
-        $this->attributeMock
-            ->expects($this->any())
-            ->method('offsetGet')
-            ->with('attribute_code')
-            ->willReturn('color');
-
-        $this->productMock
-            ->expects($this->once())
-            ->method('load')
-            ->with(59)
-            ->willReturn($this->productMock);
-
-        $this->productModelFactoryMock
-            ->expects($this->once())
-            ->method('create')
-            ->willReturn($this->productMock);
-
-        $this->swatchHelperMock
-            ->expects($this->once())
-            ->method('getAttributesFromConfigurable')
-            ->with($this->productMock)
-            ->willReturn([$this->attributeMock]);
-
-        $this->swatchHelperMock
-            ->expects($this->once())
-            ->method('loadVariationByFallback')
-            ->with($this->productMock, ['size' => 454, 'color' => 43])
-            ->willReturn($this->productMock);
-
-        $this->swatchHelperMock
-            ->expects($this->once())
-            ->method('getProductMediaGallery')
-            ->with($this->productMock)
-            ->willReturn($this->mediaGallery);
-
-        $this->jsonMock
-            ->expects($this->once())
-            ->method('setData')
-            ->with($this->mediaGallery)
-            ->will($this->returnSelf());
-
-        $result = $this->controller->execute();
-
-        $this->assertInstanceOf(\Magento\Framework\Controller\Result\Json::class, $result);
-    }
-
-    public function testExecuteNullProduct()
-    {
+        $this->requestMock->expects($this->any())->method('getParam')->with('product_id')->willReturn(59);
         $this->productMock
             ->expects($this->once())
             ->method('load')
@@ -167,18 +101,6 @@ public function testExecuteNullProduct()
             ->method('create')
             ->willReturn($this->productMock);
 
-        $this->swatchHelperMock
-            ->expects($this->once())
-            ->method('getAttributesFromConfigurable')
-            ->with($this->productMock)
-            ->willReturn([$this->attributeMock]);
-
-        $this->swatchHelperMock
-            ->expects($this->once())
-            ->method('loadVariationByFallback')
-            ->with($this->productMock, ['size' => 454])
-            ->willReturn(null);
-
         $this->swatchHelperMock
             ->expects($this->once())
             ->method('getProductMediaGallery')