Merge pull request #545 from magento-performance/ACPT-1360

ACPT-1360: Automated test to validate _resetState methods cause same state as initially constructed

Author: andimov

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -61,21 +61,20 @@ public function __construct(
     ) {
         $this->_backupData = $backupData;
         parent::__construct($entityFactory, $filesystem);
-
         $this->_filesystem = $filesystem;
         $this->_backup = $backup;
         $this->_varDirectory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-
         $this->_hideBackupsForApache();
+        $this->initialize();
+    }
 
+    private function initialize() {
         // set collection specific params
         $extensions = $this->_backupData->getExtensions();
-
         foreach ($extensions as $value) {
             $extensions[] = '(' . preg_quote($value, '/') . ')';
         }
         $extensions = implode('|', $extensions);
-
         $this->_varDirectory->create($this->_path);
         $path = rtrim($this->_varDirectory->getAbsolutePath($this->_path), '/') . '/';
         $this->setOrder(
@@ -90,6 +89,15 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->initialize();
+    }
+
     /**
      * Create .htaccess file and deny backups directory access from web
      *

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -252,6 +252,6 @@ private function getBundleOptions(Product $saleableItem)
      */
     public function _resetState(): void
     {
-        $this->priceList = [];
+        $this->priceList = null;
     }
 }

app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php

@@ -157,6 +157,6 @@ private function getAttributes(): array
      */
     public function _resetState(): void
     {
-        $this->attributes = [];
+        $this->attributes = null;
     }
 }

app/code/Magento/Catalog/Model/Product.php

@@ -2840,7 +2840,7 @@ public function _resetState(): void
     {
         $this->_customOptions = [];
         $this->_errors = [];
-        $this->_canAffectOptions = [];
+        $this->_canAffectOptions = false;
         $this->_productIdCached = null;
     }
 }

app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

@@ -81,8 +81,8 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_storeId = null;
+        parent::_resetState();
     }
 
     /**

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -397,7 +397,6 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_flatEnabled = [];
         $this->_addUrlRewrite = false;
         $this->_urlRewriteCategory = '';
@@ -419,7 +418,7 @@ public function _resetState(): void
         $this->linkField = null;
         $this->backend = null;
         $this->emptyItem = null;
-        $this->_construct();
+        parent::_resetState();
     }
 
     /**

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -224,13 +224,13 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->queryText = null;
         $this->search = null;
         $this->searchCriteriaBuilder = null;
         $this->searchResult = null;
         $this->filterBuilder = null;
         $this->searchOrders = null;
+        parent::_resetState();
     }
 
     /**

app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php

@@ -34,6 +34,12 @@ class Collection extends BlockCollection implements SearchResultInterface
      */
     protected $aggregations;
 
+    /** @var string */
+    private $model;
+
+    /** @var string */
+    private $resourceModel;
+
     /**
      * @param EntityFactoryInterface $entityFactory
      * @param LoggerInterface $logger
@@ -68,6 +74,8 @@ public function __construct(
         AbstractDb $resource = null,
         TimezoneInterface $timeZone = null
     ) {
+        $this->resourceModel = $resourceModel;
+        $this->model = $model;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -80,11 +88,20 @@ public function __construct(
         );
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
-        $this->_init($model, $resourceModel);
+        $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
         $this->timeZone = $timeZone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_init($this->model, $this->resourceModel);
+    }
+
     /**
      * @inheritDoc
      */

app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php

@@ -34,6 +34,12 @@ class Collection extends PageCollection implements SearchResultInterface
      */
     protected $aggregations;
 
+    /** @var mixed */
+    private $model;
+
+    /** @var string */
+    private $resourceModel;
+
     /**
      * @param EntityFactoryInterface $entityFactory
      * @param LoggerInterface $logger
@@ -68,6 +74,8 @@ public function __construct(
         AbstractDb $resource = null,
         TimezoneInterface $timeZone = null
     ) {
+        $this->resourceModel = $resourceModel;
+        $this->model = $model;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -80,11 +88,20 @@ public function __construct(
         );
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
-        $this->_init($model, $resourceModel);
+        $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
         $this->timeZone = $timeZone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_init($this->model, $this->resourceModel);
+    }
+
     /**
      * @inheritDoc
      */

app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php

@@ -45,7 +45,7 @@ class VariationHandler implements ResetAfterRequestInterface
     protected $productFactory;
 
     /**
-     * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]
+     * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute[]|null
      */
     private $attributes;
 
@@ -309,6 +309,6 @@ function ($image) {
      */
     public function _resetState(): void
     {
-        $this->attributes = [];
+        $this->attributes = null;
     }
 }