Merge branch 'MAGETWO-49634' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-49914-2

Author: shiftedreality

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/GrouperTest.php

@@ -13,7 +13,6 @@
 use Magento\Store\Model\Store;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Catalog\Ui\DataProvider\Grouper;
 
 /**
  * Class AbstractDataProviderTest
@@ -51,11 +50,6 @@ abstract class AbstractModifierTest extends \PHPUnit_Framework_TestCase
      */
     protected $arrayManagerMock;
 
-    /**
-     * @var Grouper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $grouperMock;
-
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -77,9 +71,6 @@ protected function setUp()
         $this->arrayManagerMock = $this->getMockBuilder(ArrayManager::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->grouperMock = $this->getMockBuilder(Grouper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->arrayManagerMock->expects($this->any())
             ->method('replace')
@@ -93,12 +84,6 @@ protected function setUp()
         $this->arrayManagerMock->expects($this->any())
             ->method('merge')
             ->willReturnArgument(1);
-        $this->grouperMock->expects($this->any())
-            ->method('groupMetaElements')
-            ->willReturnArgument(0);
-        $this->grouperMock->expects($this->any())
-            ->method('remove')
-            ->willReturnArgument(1);
         $this->arrayManagerMock->expects($this->any())
             ->method('remove')
             ->willReturnArgument(1);

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php

@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AdvancedPricing;
-use Magento\Catalog\Ui\DataProvider\Grouper;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\Data\GroupInterface as CustomerGroupInterface;
 use Magento\Customer\Api\GroupManagementInterface;
@@ -25,11 +24,6 @@
  */
 class AdvancedPricingTest extends AbstractModifierTest
 {
-    /**
-     * @var Grouper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $grouperMock;
-
     /**
      * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -78,9 +72,6 @@ class AdvancedPricingTest extends AbstractModifierTest
     protected function setUp()
     {
         parent::setUp();
-        $this->grouperMock = $this->getMockBuilder(Grouper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
             ->getMockForAbstractClass();
         $this->groupRepositoryMock = $this->getMockBuilder(GroupRepositoryInterface::class)
@@ -117,7 +108,6 @@ protected function createModel()
     {
         return $this->objectManager->getObject(AdvancedPricing::class, [
             'locator' => $this->locatorMock,
-            'grouper' => $this->grouperMock,
             'storeManager' => $this->storeManagerMock,
             'groupRepository' => $this->groupRepositoryMock,
             'groupManagement' => $this->groupManagementMock,

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php

@@ -22,7 +22,6 @@ protected function createModel()
     {
         return $this->objectManager->getObject(General::class, [
             'locator' => $this->locatorMock,
-            'grouper' => $this->grouperMock,
             'arrayManager' => $this->arrayManagerMock,
         ]);
     }