MAGNIMEX-283: static test update

Author: kalashnikau-uladzimir

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -38,7 +38,7 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
     protected $_entityTypeCode;
 
     /**
-     * @var
+     * @var \Magento\Framework\App\Resource
      */
     protected $_resource;
 
@@ -72,6 +72,11 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
         ImportAdvancedPricing::COL_GROUP_PRICE_CUSTOMER_GROUP,
     ];
 
+    /**
+     * Export template
+     *
+     * @var array
+     */
     protected $templateExportData = [
         ImportAdvancedPricing::COL_SKU => '',
         ImportAdvancedPricing::COL_GROUP_PRICE_WEBSITE => '',

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -62,6 +62,13 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
         ValidatorInterface::ERROR_GROUP_PRICE_DATA_INCOMPLETE => 'Group Price data is incomplete',
     ];
 
+    /**
+     * Need to log in import history
+     *
+     * @var bool
+     */
+    protected $logInHistory = true;
+
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceFactory
      */

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -4,6 +4,8 @@
   "require": {
     "php": "~5.5.0|~5.6.0",
     "magento/module-catalog": "0.74.0-beta13",
+    "magento/module-catalog-inventory": "0.74.0-beta13",
+    "magento/module-eav": "0.74.0-beta13",
     "magento/module-import-export": "0.74.0-beta13",
     "magento/module-catalog-import-export": "0.74.0-beta13",
     "magento/module-customer": "0.74.0-beta13",

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -182,6 +182,13 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         '_upsell_' => \Magento\Catalog\Model\Product\Link::LINK_TYPE_UPSELL,
     ];
 
+    /**
+     * Need to log in import history
+     *
+     * @var bool
+     */
+    protected $logInHistory = true;
+
     /**
      * Attribute id for product images storage.
      *

app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php

@@ -164,7 +164,7 @@ public function upsertCategories($categoriesString)
      *
      * @param int $categoryId
      *
-     * @return
+     * @return \Magento\Catalog\Model\Category|null
      */
     public function getCategoryById($categoryId)
     {

app/code/Magento/ImportExport/Model/Import.php

@@ -140,16 +140,6 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_filesystem;
 
-    /**
-     * Entity types supporting import history
-     *
-     * @var array
-     */
-    protected $processedReportsEntities = [
-        \Magento\Catalog\Model\Product::ENTITY,
-        \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing::ENTITY_TYPE_CODE
-    ];
-
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
@@ -684,11 +674,20 @@ public function getUniqueEntityBehaviors()
     public function isReportEntityType($entity = null)
     {
         $result = false;
-        if (!$entity) {
-            $entity = $this->getEntity();
-        }
-        if (in_array($entity, $this->processedReportsEntities)) {
-            $result = true;
+        if ($entity !== null && $this->_getEntityAdapter()->getEntityTypeCode() != $entity) {
+            $entities = $this->_importConfig->getEntities();
+            if (isset($entities[$this->getEntity()])) {
+                try {
+                    $adapter = $this->_entityFactory->create($entities[$entity]['model']);
+                    $result = $adapter->isNeedToLogInHistory();
+                } catch (\Exception $e) {
+                    throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a correct entity model'));
+                }
+            } else {
+                throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a correct entity model'));
+            }
+        } else {
+            $result = $this->_entityAdapter->isNeedToLogInHistory();
         }
         return $result;
     }

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php

@@ -224,6 +224,12 @@ abstract class AbstractEntity
      */
     protected $countItemsDeleted = 0;
 
+    /**
+     * Need to log in import history
+     *
+     * @var bool
+     */
+    protected $logInHistory = false;
 
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
@@ -680,6 +686,16 @@ public function isRowAllowedToImport(array $rowData, $rowNum)
         return $this->validateRow($rowData, $rowNum) && !isset($this->_rowsToSkip[$rowNum]);
     }
 
+    /*
+    * Is import need to log in history.
+    *
+    * @return bool
+    */
+    public function isNeedToLogInHistory()
+    {
+        return $this->logInHistory;
+    }
+
     /**
      * Validate data row.
      *

app/code/Magento/ImportExport/Test/Unit/Model/Import/Entity/AbstractTest.php

@@ -127,6 +127,16 @@ public function testValidateDataAttributeNames()
         $this->_model->validateData();
     }
 
+    /**
+     * Test for method isNeedToLogInHistory()
+     *
+     * @covers \Magento\ImportExport\Model\Import\Entity\AbstractEntity::isNeedToLogInHistory
+     */
+    public function testIsNeedToLogInHistory()
+    {
+        $this->assertEquals(false, $this->_model->isNeedToLogInHistory());
+    }
+
     /**
      * Test for method isAttributeValid()
      *