MAGNIMEX-6: Importing Advanced Prices

- fix tests.

Author: Siarhei Andreyeu

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

@@ -78,7 +78,8 @@ public function isValid($value)
             ) {
                 $this->_addMessages([self::ERROR_INVALID_TIER_PRICE_GROUP]);
                 return false;
-            } elseif ($value[AdvancedPricing::COL_TIER_PRICE_QTY] <= 0 || $value[AdvancedPricing::COL_TIER_PRICE] <= 0) {
+            } elseif ($value[AdvancedPricing::COL_TIER_PRICE_QTY] <= 0
+                || $value[AdvancedPricing::COL_TIER_PRICE] <= 0) {
                 $this->_addMessages([self::ERROR_INVALID_TIER_PRICE_QTY]);
                 return false;
             }

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

@@ -18,20 +18,20 @@ class Website extends AbstractValidator implements RowValidatorInterface
     protected $storeResolver;
 
     /**
-     * @var \Magento\Store\Model\WebSite
+     * @var \Magento\Store\Model\Website
      */
-    protected $webSiteModel;
+    protected $websiteModel;
 
     /**
      * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
-     * @param \Magento\Store\Model\WebSite $webSiteModel
+     * @param \Magento\Store\Model\Website $websiteModel
      */
     public function __construct(
         \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver,
-        \Magento\Store\Model\WebSite $webSiteModel
+        \Magento\Store\Model\Website $websiteModel
     ) {
         $this->storeResolver = $storeResolver;
-        $this->webSiteModel = $webSiteModel;
+        $this->websiteModel = $websiteModel;
     }
 
     /**
@@ -74,6 +74,6 @@ public function isValid($value)
      */
     public function getAllWebsitesValue()
     {
-        return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->webSiteModel->getBaseCurrency()->getCurrencyCode().']';
+        return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']';
     }
 }

app/code/Magento/AdvancedPricingImportExport/Model/Indexer/Product/Price/Plugin/Import.php

@@ -5,14 +5,18 @@
  */
 namespace Magento\AdvancedPricingImportExport\Model\Indexer\Product\Price\Plugin;
 
+use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
+
 class Import extends \Magento\Catalog\Model\Indexer\Product\Price\Plugin\AbstractPlugin
 {
     /**
      * After import handler
      *
+     * @param AdvancedPricing $subject
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSaveAdvancedPricing()
+    public function afterSaveAdvancedPricing(AdvancedPricing $subject)
     {
         if (!$this->getPriceIndexer()->isScheduled()) {
             $this->invalidateIndexer();
@@ -22,9 +26,11 @@ public function afterSaveAdvancedPricing()
     /**
      * After delete handler
      *
+     * @param AdvancedPricing $subject
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterDeleteAdvancedPricing()
+    public function afterDeleteAdvancedPricing(AdvancedPricing $subject)
     {
         if (!$this->getPriceIndexer()->isScheduled()) {
             $this->invalidateIndexer();

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php

@@ -20,6 +20,11 @@ class ImportTest extends \PHPUnit_Framework_TestCase
      */
     protected $import;
 
+    /**
+     * @var \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $advancedPricing;
+
     public function setUp()
     {
         $this->indexer = $this->getMockForAbstractClass('\Magento\Indexer\Model\IndexerInterface', [], '', false);
@@ -30,6 +35,13 @@ public function setUp()
             '',
             false
         );
+        $this->advancedPricing = $this->getMock(
+            '\Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing',
+            [],
+            [],
+            '',
+            false
+        );
         $this->import->expects($this->any())->method('getPriceIndexer')->willReturn($this->indexer);
     }
 
@@ -38,14 +50,14 @@ public function testAfterSaveAdvancedPricing()
         $this->indexer->expects($this->once())->method('isScheduled')->willReturn(false);
         $this->import->expects($this->once())->method('invalidateIndexer');
 
-        $this->import->afterSaveAdvancedPricing();
+        $this->import->afterSaveAdvancedPricing($this->advancedPricing);
     }
 
     public function testAfterDeleteAdvancedPricing()
     {
         $this->indexer->expects($this->once())->method('isScheduled')->willReturn(false);
         $this->import->expects($this->once())->method('invalidateIndexer');
 
-        $this->import->afterSaveAdvancedPricing();
+        $this->import->afterSaveAdvancedPricing($this->advancedPricing);
     }
 }

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -3,18 +3,16 @@
   "description": "N/A",
   "require": {
     "php": "~5.5.0|~5.6.0",
-    "magento/module-catalog": "0.74.0-beta10",
-    "magento/module-import-export": "0.74.0-beta10",
-    "magento/indexer": "0.74.0-beta10",
-    "magento/module-catalog-import-export": "0.74.0-beta10",
-    "magento/module-customer": "0.74.0-beta10",
-    "magento/module-eav": "0.74.0-beta10",
-    "magento/module-store": "0.74.0-beta10",
-    "magento/framework": "0.74.0-beta10",
+    "magento/module-catalog": "0.74.0-beta12",
+    "magento/module-import-export": "0.74.0-beta12",
+    "magento/module-catalog-import-export": "0.74.0-beta12",
+    "magento/module-customer": "0.74.0-beta12",
+    "magento/module-store": "0.74.0-beta12",
+    "magento/framework": "0.74.0-beta12",
     "magento/magento-composer-installer": "*"
   },
   "type": "magento2-module",
-  "version": "0.74.0-beta10",
+  "version": "0.74.0-beta12",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Export/FilterTest.php

@@ -10,7 +10,7 @@
 /**
  * @SuppressWarnings(PHPMD)
  */
-class Filter extends \PHPUnit_Framework_TestCase
+class FilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject