ACPT-1572: Slow saving of stores/websites

- Fix tests;

Author: adifucan

app/code/Magento/Store/Test/Unit/Model/GroupTest.php

@@ -7,151 +7,28 @@
 
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Config\Model\ResourceModel\Config\Data;
-use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface;
-use Magento\Framework\Model\Context;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
-use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\Group;
-use Magento\Store\Model\ResourceModel\Store\CollectionFactory;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\Validation\StoreValidator;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
 class GroupTest extends TestCase
 {
     /**
-     * @var Group|MockObject
-     */
-    private $model;
-
-    /**
-     * @var Context|MockObject
-     */
-    private $context;
-
-    /**
-     * @var Registry|MockObject
-     */
-    private $registry;
-
-    /**
-     * @var ExtensionAttributesFactory|MockObject
-     */
-    private $extensionFactory;
-
-    /**
-     * @var AttributeValueFactory|MockObject
-     */
-    private $customAttributeFactory;
-
-    /**
-     * @var Data|MockObject
-     */
-    private $configDataResource;
-
-    /**
-     * @var CollectionFactory|MockObject
-     */
-    private $storeListFactory;
-
-    /**
-     * @var StoreManagerInterface|MockObject
+     * @var Group
      */
-    private $storeManager;
+    protected $model;
 
     /**
-     * @var AbstractResource|MockObject
+     * @var ObjectManager
      */
-    private $resource;
-
-    /**
-     * @var AbstractDb|MockObject
-     */
-    private $resourceCollection;
-
-    /**
-     * @var ManagerInterface|MockObject
-     */
-    private $eventManager;
-
-    /**
-     * @var PoisonPillPutInterface|MockObject
-     */
-    private $pillPut;
-
-    /**
-     * @var StoreValidator|MockObject
-     */
-    private $modelValidator;
+    protected $objectManagerHelper;
 
     protected function setUp(): void
     {
-        $this->context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->registry = $this->getMockBuilder(Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->extensionFactory = $this->getMockBuilder(ExtensionAttributesFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customAttributeFactory = $this->getMockBuilder(AttributeValueFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->configDataResource = $this->getMockBuilder(Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->storeListFactory = $this->getMockBuilder(CollectionFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
-
-        $this->resource = $this->getMockBuilder(AbstractResource::class)
-            ->addMethods(['getIdFieldName'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->resourceCollection = $this->getMockBuilder(AbstractDb::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->eventManager = $this->getMockForAbstractClass(ManagerInterface::class);
-
-        $this->pillPut = $this->getMockForAbstractClass(PoisonPillPutInterface::class);
-
-        $this->modelValidator = $this->getMockBuilder(StoreValidator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->objectManagerHelper = new ObjectManager($this);
 
-        $this->model = new Group(
-            $this->context,
-            $this->registry,
-            $this->extensionFactory,
-            $this->customAttributeFactory,
-            $this->configDataResource,
-            $this->storeListFactory,
-            $this->storeManager,
-            $this->resource,
-            $this->resourceCollection,
-            [],
-            $this->eventManager,
-            $this->pillPut,
-            $this->modelValidator
+        $this->model = $this->objectManagerHelper->getObject(
+            Group::class
         );
     }
 

dev/tests/integration/testsuite/Magento/Store/Model/WebsiteTest.php

@@ -20,7 +20,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var Website
+     * @var \Magento\Store\Model\Website
      */
     protected $_model;
 
@@ -32,8 +32,8 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->_model = $this->objectManager->get(Website::class);
-        $this->typeList = $this->objectManager->get(TypeListInterface::class);
+        $this->typeList = $this->objectManager->create(TypeListInterface::class);
+        $this->_model = $this->objectManager->create(\Magento\Store\Model\Website::class);
         $this->_model->load(1);
     }
 
@@ -66,9 +66,7 @@ public function testLoadByCode()
     public function testSetGroupsAndStores()
     {
         /* Groups */
-        $expectedGroup = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Store\Model\Group::class
-        );
+        $expectedGroup = $this->objectManager->create(\Magento\Store\Model\Group::class);
         $expectedGroup->setId(123);
         $this->_model->setDefaultGroupId($expectedGroup->getId());
         $this->_model->setGroups([$expectedGroup]);
@@ -77,9 +75,7 @@ public function testSetGroupsAndStores()
         $this->assertSame($expectedGroup, reset($groups));
 
         /* Stores */
-        $expectedStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Store\Model\Store::class
-        );
+        $expectedStore = $this->objectManager->create(\Magento\Store\Model\Store::class);
         $expectedStore->setId(456);
         $expectedGroup->setDefaultStoreId($expectedStore->getId());
         $this->_model->setStores([$expectedStore]);
@@ -220,7 +216,7 @@ public function testCacheInvalidationOnWebsiteUpdateAndDeletion()
             'should be clean before website update.'
         );
 
-        $website = $this->objectManager->create(Website::class);
+        $website = $this->objectManager->create(\Magento\Store\Model\Website::class);
         $website->load('test', 'code');
         $website->setName('Test Website 1');
         $website->save();