MAGETWO-40177: Prepare pull request

-- fix static tests, fix unit tests

Author: Valeriy Nayda

app/code/Magento/Catalog/Model/Plugin/PageCache/Product/Action.php renamed to app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php

@@ -3,14 +3,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Catalog\Model\Plugin\PageCache\Product;
+namespace Magento\Catalog\Plugin\Model\Product\Action;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Action;
 use Magento\Indexer\Model\CacheContext;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 
-class Action
+class UpdateAttributesFlushCache
 {
     /**
      * @var CacheContext
@@ -35,17 +35,17 @@ public function __construct(
     }
 
     /**
-     * @param Product\Action $subject
+     * @param Action $subject
      * @param \Closure $proceed
      * @param array $productIds
      * @param array $attrData
      * @param int $storeId
-     * @return Product\Action
+     * @return Action
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundUpdateAttributes(
-        Product\Action $subject,
+        Action $subject,
         \Closure $proceed,
         $productIds,
         $attrData,

app/code/Magento/Catalog/Test/Unit/Model/Plugin/PageCache/Product/ActionTest.php renamed to app/code/Magento/Catalog/Test/Unit/Plugin/Model/Product/Action/UpdateAttributesFlushCacheTest.php

@@ -3,11 +3,11 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Test\Unit\Model\Plugin\PageCache\Product;
+namespace Magento\Catalog\Test\Unit\Plugin\Model\Product\Action;
 
 use Magento\Catalog\Model\Product;
 
-class ActionTest extends \PHPUnit_Framework_TestCase
+class UpdateAttributesFlushCacheTest extends \PHPUnit_Framework_TestCase
 {
     public function testAroundUpdateAttributes()
     {
@@ -23,12 +23,19 @@ public function testAroundUpdateAttributes()
             ->with(Product::CACHE_TAG, $productIds);
 
 
-        $eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+        $eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
         $eventManagerMock->expects($this->once())
             ->method('dispatch')
             ->with('clean_cache_by_tags', ['object' => $cacheContextMock]);
 
-        $model = new \Magento\Catalog\Model\Plugin\PageCache\Product\Action($cacheContextMock, $eventManagerMock);
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $model = $objectManager->getObject(
+            'Magento\Catalog\Plugin\Model\Product\Action\UpdateAttributesFlushCache',
+            [
+                'cacheContext' => $cacheContextMock,
+                'eventManager' => $eventManagerMock,
+            ]
+        );
 
         $closureMock = function () use ($productActionMock) {
             return $productActionMock;

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -77,6 +77,6 @@
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">
-        <plugin name="invalidate_pagecache_after_update_product_attributes" type="Magento\Catalog\Model\Plugin\PageCache\Product\Action" />
+        <plugin name="invalidate_pagecache_after_update_product_attributes" type="Magento\Catalog\Plugin\Model\Product\Action\UpdateAttributesFlushCache"/>
     </type>
 </config>